s390/cpufeature: rework to allow different types of cpufeatures
Subsystems (8)
v2 cover s390/cpufeature: rework to allow different types of cpufeatures
Currently the s390 implementaion of cpufeature is limited to elf_hwcap bits. Using these to automatically load modules also exposes this cpufeature to userspace which, sometimes is not intended.
Therefore, rework the s390-cpufeature implementation to allow for various cpu feature indications, which is not only limited to hwcap bits.
Add a new type to allow facilities to be a cpufeature without using hwcap bits that expose this feature to userspace.
Load uvdevice when facility 158 is present.
since v1:
* add r-bs from Claudio
* worked in comments
Heiko Carstens (2):
s390/cpufeature: rework to allow more than only hwcap bits s390/cpufeature: allow for facility bits
Steffen Eiden (1):
s390/uvdevice: autoload module based on CPU facility
arch/s390/crypto/aes_s390.c | 2 +- arch/s390/crypto/chacha-glue.c | 2 +- arch/s390/crypto/crc32-vx.c | 2 +- arch/s390/crypto/des_s390.c | 2 +- arch/s390/crypto/ghash_s390.c | 2 +- arch/s390/crypto/prng.c | 2 +- arch/s390/crypto/sha1_s390.c | 2 +- arch/s390/crypto/sha256_s390.c | 2 +- arch/s390/crypto/sha3_256_s390.c | 2 +- arch/s390/crypto/sha3_512_s390.c | 2 +- arch/s390/crypto/sha512_s390.c | 2 +- arch/s390/include/asm/cpufeature.h | 23 ++++++--------- arch/s390/kernel/Makefile | 2 +- arch/s390/kernel/cpufeature.c | 46 ++++++++++++++++++++++++++++++ arch/s390/kernel/processor.c | 10 ------- drivers/char/hw_random/s390-trng.c | 2 +- drivers/s390/char/uvdevice.c | 5 ++-- drivers/s390/crypto/pkey_api.c | 2 +- 18 files changed, 70 insertions(+), 42 deletions(-) create mode 100644 arch/s390/kernel/cpufeature.c
Signature · 1 line
2.35.3
PATCH v2 1/3 s390/cpufeature: rework to allow more than only hwcap bits
From: Heiko Carstens <[email protected]>
Rework cpufeature implementation to allow for various cpu feature indications, which is not only limited to hwcap bits. This is achieved by adding a sequential list of cpu feature numbers, where each of them is mapped to an entry which indicates what this number is about.
Each entry contains a type member, which indicates what feature name space to look into (e.g. hwcap, or cpu facility). If wanted this allows also to automatically load modules only in e.g. z/VM configurations.
--- arch/s390/crypto/aes_s390.c | 2 +- arch/s390/crypto/chacha-glue.c | 2 +- arch/s390/crypto/crc32-vx.c | 2 +- arch/s390/crypto/des_s390.c | 2 +- arch/s390/crypto/ghash_s390.c | 2 +- arch/s390/crypto/prng.c | 2 +- arch/s390/crypto/sha1_s390.c | 2 +- arch/s390/crypto/sha256_s390.c | 2 +- arch/s390/crypto/sha3_256_s390.c | 2 +- arch/s390/crypto/sha3_512_s390.c | 2 +- arch/s390/crypto/sha512_s390.c | 2 +- arch/s390/include/asm/cpufeature.h | 22 +++++----------- arch/s390/kernel/Makefile | 2 +- arch/s390/kernel/cpufeature.c | 42 ++++++++++++++++++++++++++++++ arch/s390/kernel/processor.c | 10 ------- drivers/char/hw_random/s390-trng.c | 2 +- drivers/s390/crypto/pkey_api.c | 2 +- 17 files changed, 63 insertions(+), 39 deletions(-) create mode 100644 arch/s390/kernel/cpufeature.c
arch/s390/crypto/aes_s390.c +1 -1
@@ -1049,7 +1049,7 @@ static int __init aes_s390_init(void)return ret; } -module_cpu_feature_match (MSA , aes_s390_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , aes_s390_init);module_exit (aes_s390_fini);MODULE_ALIAS_CRYPTO ("aes-all" );
arch/s390/crypto/chacha-glue.c +1 -1
@@ -121,7 +121,7 @@ static void __exit chacha_mod_fini(void)crypto_unregister_skciphers (chacha_algs,ARRAY_SIZE (chacha_algs)); } -module_cpu_feature_match (VXRS , chacha_mod_init); +module_cpu_feature_match (S390_CPU_FEATURE_VXRS , chacha_mod_init);module_exit (chacha_mod_fini);MODULE_DESCRIPTION ("ChaCha20 stream cipher" );
arch/s390/crypto/crc32-vx.c +1 -1
@@ -298,7 +298,7 @@ static void __exit crc_vx_mod_exit(void)crypto_unregister_shashes (crc32_vx_algs,ARRAY_SIZE (crc32_vx_algs)); } -module_cpu_feature_match (VXRS , crc_vx_mod_init); +module_cpu_feature_match (S390_CPU_FEATURE_VXRS , crc_vx_mod_init);module_exit (crc_vx_mod_exit);MODULE_AUTHOR ("Hendrik Brueckner <[email protected]>" );
arch/s390/crypto/des_s390.c +1 -1
@@ -492,7 +492,7 @@ static int __init des_s390_init(void)return ret; } -module_cpu_feature_match (MSA , des_s390_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , des_s390_init);module_exit (des_s390_exit);MODULE_ALIAS_CRYPTO ("des" );
arch/s390/crypto/ghash_s390.c +1 -1
@@ -145,7 +145,7 @@ static void __exit ghash_mod_exit(void)crypto_unregister_shash (&ghash_alg); } -module_cpu_feature_match (MSA , ghash_mod_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , ghash_mod_init);module_exit (ghash_mod_exit);MODULE_ALIAS_CRYPTO ("ghash" );
arch/s390/crypto/prng.c +1 -1
@@ -907,5 +907,5 @@ static void __exit prng_exit(void) } } -module_cpu_feature_match (MSA , prng_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , prng_init);module_exit (prng_exit);
arch/s390/crypto/sha1_s390.c +1 -1
@@ -95,7 +95,7 @@ static void __exit sha1_s390_fini(void)crypto_unregister_shash (&alg); } -module_cpu_feature_match (MSA , sha1_s390_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , sha1_s390_init);module_exit (sha1_s390_fini);MODULE_ALIAS_CRYPTO ("sha1" );
arch/s390/crypto/sha256_s390.c +1 -1
@@ -134,7 +134,7 @@ static void __exit sha256_s390_fini(void)crypto_unregister_shash (&sha256_alg); } -module_cpu_feature_match (MSA , sha256_s390_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , sha256_s390_init);module_exit (sha256_s390_fini);MODULE_ALIAS_CRYPTO ("sha256" );
arch/s390/crypto/sha3_256_s390.c +1 -1
@@ -137,7 +137,7 @@ static void __exit sha3_256_s390_fini(void)crypto_unregister_shash (&sha3_256_alg); } -module_cpu_feature_match (MSA , sha3_256_s390_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , sha3_256_s390_init);module_exit (sha3_256_s390_fini);MODULE_ALIAS_CRYPTO ("sha3-256" );
arch/s390/crypto/sha3_512_s390.c +1 -1
@@ -147,7 +147,7 @@ static void __exit fini(void)crypto_unregister_shash (&sha3_384_alg); } -module_cpu_feature_match (MSA , init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , init);module_exit (fini);MODULE_LICENSE ("GPL" );
arch/s390/crypto/sha512_s390.c +1 -1
@@ -142,7 +142,7 @@ static void __exit fini(void)crypto_unregister_shash (&sha384_alg); } -module_cpu_feature_match (MSA , init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , init);module_exit (fini);MODULE_LICENSE ("GPL" );
arch/s390/include/asm/cpufeature.h +7 -15
@@ -2,28 +2,20 @@/* * Module interface for CPU features * -* Copyright IBM Corp. 2015 +* Copyright IBM Corp. 2015, 2022 * Author(s): Hendrik Brueckner <[email protected]> */ #ifndef __ASM_S390_CPUFEATURE_H#define __ASM_S390_CPUFEATURE_H -#include <asm/elf.h> +enum { +S390_CPU_FEATURE_MSA , +S390_CPU_FEATURE_VXRS , +MAX_CPU_FEATURES +}; -/* Hardware features on Linux on z Systems are indicated by facility bits that -* are mapped to the so-called machine flags. Particular machine flags are -* then used to define ELF hardware capabilities; most notably hardware flags -* that are essential for user space / glibc. -* -* Restrict the set of exposed CPU features to ELF hardware capabilities for -* now. Additional machine flags can be indicated by values larger than -* MAX_ELF_HWCAP_FEATURES. -*/ -#define MAX_ELF_HWCAP_FEATURES (8 * sizeof(elf_hwcap)) -#define MAX_CPU_FEATURES MAX_ELF_HWCAP_FEATURES - -#define cpu_feature (feat) ilog2(HWCAP_ ## feat) +#define cpu_feature (feature) (feature)int cpu_have_feature (unsigned int nr);
arch/s390/kernel/Makefile +1 -1
@@ -35,7 +35,7 @@ CFLAGS_unwind_bc.o += -fno-optimize-sibling-calls obj-y := traps.o time.o process.o earlypgm.o early.o setup.o idle.o vtime.o obj-y += processor.o syscall.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o -obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o +obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o cpufeature.o obj-y += sysinfo.o lgr.o os_info.o machine_kexec.o obj-y += runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o obj-y += entry.o reipl.o relocate_kernel.o kdebugfs.o alternative.o
arch/s390/kernel/cpufeature.c new file +42 -0
42 lines not on this page · raw message
arch/s390/kernel/processor.c +0 -10
@@ -8,7 +8,6 @@#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt#include <linux/stop_machine.h> -#include <linux/cpufeature.h> #include <linux/bitops.h> #include <linux/kernel.h> #include <linux/random.h>
@@ -96,15 +95,6 @@ void cpu_init(void)enter_lazy_tlb (&init_mm, current); } -/* -* cpu_have_feature - Test CPU features on module initialization -*/ -int cpu_have_feature (unsigned int num) -{ -return elf_hwcap & (1UL << num); -} -EXPORT_SYMBOL (cpu_have_feature); -static void show_facilities (struct seq_file *m) {unsigned int bit;
drivers/char/hw_random/s390-trng.c +1 -1
@@ -261,5 +261,5 @@ static void __exit trng_exit(void)trng_debug_exit (); } -module_cpu_feature_match (MSA , trng_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , trng_init);module_exit (trng_exit);
drivers/s390/crypto/pkey_api.c +1 -1
@@ -2115,5 +2115,5 @@ static void __exit pkey_exit(void)pkey_debug_exit (); } -module_cpu_feature_match (MSA , pkey_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , pkey_init);module_exit (pkey_exit);
Signature · 1 line
2.35.3
Re: [PATCH v2 1/3] s390/cpufeature: rework to allow more than only hwcap bits
Quoted 7 lines · On Wed, 13 Jul 2022 14:56:42 +0200 Steffen Eiden <[email protected]> wrote:
From: Heiko Carstens <[email protected]>
Rework cpufeature implementation to allow for various cpu feature indications, which is not only limited to hwcap bits. This is achieved by adding a sequential list of cpu feature numbers, where each of them is mapped to an entry which indicates what this number is about.
Quoted 7 lines
Each entry contains a type member, which indicates what feature name space to look into (e.g. hwcap, or cpu facility). If wanted this allows also to automatically load modules only in e.g. z/VM configurations.
Signed-off-by Heiko Carstens <[email protected]>Signed-off-by Steffen Eiden <[email protected]>
Quoted 313 lines
--- arch/s390/crypto/aes_s390.c | 2 +- arch/s390/crypto/chacha-glue.c | 2 +- arch/s390/crypto/crc32-vx.c | 2 +- arch/s390/crypto/des_s390.c | 2 +- arch/s390/crypto/ghash_s390.c | 2 +- arch/s390/crypto/prng.c | 2 +- arch/s390/crypto/sha1_s390.c | 2 +- arch/s390/crypto/sha256_s390.c | 2 +- arch/s390/crypto/sha3_256_s390.c | 2 +- arch/s390/crypto/sha3_512_s390.c | 2 +- arch/s390/crypto/sha512_s390.c | 2 +- arch/s390/include/asm/cpufeature.h | 22 +++++----------- arch/s390/kernel/Makefile | 2 +- arch/s390/kernel/cpufeature.c | 42 ++++++++++++++++++++++++++++++ arch/s390/kernel/processor.c | 10 ------- drivers/char/hw_random/s390-trng.c | 2 +- drivers/s390/crypto/pkey_api.c | 2 +- 17 files changed, 63 insertions(+), 39 deletions(-) create mode 100644 arch/s390/kernel/cpufeature.carch/s390/crypto/aes_s390.c +1
-1@@ -1049,7 +1049,7 @@ static int __init aes_s390_init(void)return ret; } -module_cpu_feature_match (MSA , aes_s390_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , aes_s390_init);module_exit (aes_s390_fini);MODULE_ALIAS_CRYPTO ("aes-all" );arch/s390/crypto/chacha-glue.c +1
-1@@ -121,7 +121,7 @@ static void __exit chacha_mod_fini(void)crypto_unregister_skciphers (chacha_algs,ARRAY_SIZE (chacha_algs)); } -module_cpu_feature_match (VXRS , chacha_mod_init); +module_cpu_feature_match (S390_CPU_FEATURE_VXRS , chacha_mod_init);module_exit (chacha_mod_fini);MODULE_DESCRIPTION ("ChaCha20 stream cipher" );arch/s390/crypto/crc32-vx.c +1
-1@@ -298,7 +298,7 @@ static void __exit crc_vx_mod_exit(void)crypto_unregister_shashes (crc32_vx_algs,ARRAY_SIZE (crc32_vx_algs)); } -module_cpu_feature_match (VXRS , crc_vx_mod_init); +module_cpu_feature_match (S390_CPU_FEATURE_VXRS , crc_vx_mod_init);module_exit (crc_vx_mod_exit);MODULE_AUTHOR ("Hendrik Brueckner <[email protected]>" );arch/s390/crypto/des_s390.c +1
-1@@ -492,7 +492,7 @@ static int __init des_s390_init(void)return ret; } -module_cpu_feature_match (MSA , des_s390_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , des_s390_init);module_exit (des_s390_exit);MODULE_ALIAS_CRYPTO ("des" );arch/s390/crypto/ghash_s390.c +1
-1@@ -145,7 +145,7 @@ static void __exit ghash_mod_exit(void)crypto_unregister_shash (&ghash_alg); } -module_cpu_feature_match (MSA , ghash_mod_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , ghash_mod_init);module_exit (ghash_mod_exit);MODULE_ALIAS_CRYPTO ("ghash" );arch/s390/crypto/prng.c +1
-1@@ -907,5 +907,5 @@ static void __exit prng_exit(void) } } -module_cpu_feature_match (MSA , prng_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , prng_init);module_exit (prng_exit);arch/s390/crypto/sha1_s390.c +1
-1@@ -95,7 +95,7 @@ static void __exit sha1_s390_fini(void)crypto_unregister_shash (&alg); } -module_cpu_feature_match (MSA , sha1_s390_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , sha1_s390_init);module_exit (sha1_s390_fini);MODULE_ALIAS_CRYPTO ("sha1" );arch/s390/crypto/sha256_s390.c +1
-1@@ -134,7 +134,7 @@ static void __exit sha256_s390_fini(void)crypto_unregister_shash (&sha256_alg); } -module_cpu_feature_match (MSA , sha256_s390_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , sha256_s390_init);module_exit (sha256_s390_fini);MODULE_ALIAS_CRYPTO ("sha256" );arch/s390/crypto/sha3_256_s390.c +1
-1@@ -137,7 +137,7 @@ static void __exit sha3_256_s390_fini(void)crypto_unregister_shash (&sha3_256_alg); } -module_cpu_feature_match (MSA , sha3_256_s390_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , sha3_256_s390_init);module_exit (sha3_256_s390_fini);MODULE_ALIAS_CRYPTO ("sha3-256" );arch/s390/crypto/sha3_512_s390.c +1
-1@@ -147,7 +147,7 @@ static void __exit fini(void)crypto_unregister_shash (&sha3_384_alg); } -module_cpu_feature_match (MSA , init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , init);module_exit (fini);MODULE_LICENSE ("GPL" );arch/s390/crypto/sha512_s390.c +1
-1@@ -142,7 +142,7 @@ static void __exit fini(void)crypto_unregister_shash (&sha384_alg); } -module_cpu_feature_match (MSA , init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , init);module_exit (fini);MODULE_LICENSE ("GPL" );arch/s390/include/asm/cpufeature.h +7
-15@@ -2,28 +2,20 @@/* * Module interface for CPU features * -* Copyright IBM Corp. 2015 +* Copyright IBM Corp. 2015, 2022 * Author(s): Hendrik Brueckner <[email protected]> */ #ifndef __ASM_S390_CPUFEATURE_H#define __ASM_S390_CPUFEATURE_H -#include <asm/elf.h> +enum { +S390_CPU_FEATURE_MSA , +S390_CPU_FEATURE_VXRS , +MAX_CPU_FEATURES +}; -/* Hardware features on Linux on z Systems are indicated by facility bits that -* are mapped to the so-called machine flags. Particular machine flags are -* then used to define ELF hardware capabilities; most notably hardware flags -* that are essential for user space / glibc. -* -* Restrict the set of exposed CPU features to ELF hardware capabilities for -* now. Additional machine flags can be indicated by values larger than -* MAX_ELF_HWCAP_FEATURES. -*/ -#define MAX_ELF_HWCAP_FEATURES (8 * sizeof(elf_hwcap)) -#define MAX_CPU_FEATURES MAX_ELF_HWCAP_FEATURES - -#define cpu_feature (feat) ilog2(HWCAP_ ## feat) +#define cpu_feature (feature) (feature)int cpu_have_feature (unsigned int nr);arch/s390/kernel/Makefile +1
-1@@ -35,7 +35,7 @@ CFLAGS_unwind_bc.o += -fno-optimize-sibling-calls obj-y := traps.o time.o process.o earlypgm.o early.o setup.o idle.o vtime.o obj-y += processor.o syscall.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o -obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o +obj-y += debug.o irq.o ipl.o dis.o diag.o vdso.o cpufeature.o obj-y += sysinfo.o lgr.o os_info.o machine_kexec.o obj-y += runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o obj-y += entry.o reipl.o relocate_kernel.o kdebugfs.o alternative.oarch/s390/kernel/cpufeature.c new file +42
-0@@ -0,0 +1,42 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright IBM Corp. 2022 +*/ +#include <linux/cpufeature.h> +#include <linux/bug.h> +#include <asm/elf.h> + +enum { +TYPE_HWCAP , +}; + +struct s390_cpu_feature { +unsigned int type :4 ; +unsigned int num :28 ; +}; + +static struct s390_cpu_feature s390_cpu_features[MAX_CPU_FEATURES ] = { + [S390_CPU_FEATURE_MSA ] = {.type =TYPE_HWCAP , .num =HWCAP_NR_MSA }, + [S390_CPU_FEATURE_VXRS ] = {.type =TYPE_HWCAP , .num =HWCAP_NR_VXRS }, +}; + +/* +* cpu_have_feature - Test CPU features on module initialization +*/ +int cpu_have_feature (unsigned int num) +{ +struct s390_cpu_feature *feature; + +if (WARN_ON_ONCE (num >=MAX_CPU_FEATURES )) +return 0 ; + + feature = &s390_cpu_features[num]; +switch (feature->type) { +case TYPE_HWCAP : +return !!(elf_hwcap &BIT (feature->num)); +default : +WARN_ON_ONCE (1 ); +return 0 ; + } +} +EXPORT_SYMBOL (cpu_have_feature);arch/s390/kernel/processor.c +0
-10@@ -8,7 +8,6 @@#define pr_fmt (fmt) KMSG_COMPONENT ": " fmt#include <linux/stop_machine.h> -#include <linux/cpufeature.h> #include <linux/bitops.h> #include <linux/kernel.h> #include <linux/random.h> @@ -96,15 +95,6 @@ void cpu_init(void)enter_lazy_tlb (&init_mm, current); } -/* -* cpu_have_feature - Test CPU features on module initialization -*/ -int cpu_have_feature (unsigned int num) -{ -return elf_hwcap & (1UL << num); -} -EXPORT_SYMBOL (cpu_have_feature); -static void show_facilities (struct seq_file *m) {unsigned int bit;drivers/char/hw_random/s390-trng.c +1
-1@@ -261,5 +261,5 @@ static void __exit trng_exit(void)trng_debug_exit (); } -module_cpu_feature_match (MSA , trng_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , trng_init);module_exit (trng_exit);drivers/s390/crypto/pkey_api.c +1
-1@@ -2115,5 +2115,5 @@ static void __exit pkey_exit(void)pkey_debug_exit (); } -module_cpu_feature_match (MSA , pkey_init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , pkey_init);module_exit (pkey_exit);
Re: [PATCH v2 1/3] s390/cpufeature: rework to allow more than only hwcap bits
In reply to Steffen EidenQuoted 14 lines · Steffen Eiden
From: Heiko Carstens <[email protected]>
Rework cpufeature implementation to allow for various cpu feature indications, which is not only limited to hwcap bits. This is achieved by adding a sequential list of cpu feature numbers, where each of them is mapped to an entry which indicates what this number is about.
Each entry contains a type member, which indicates what feature name space to look into (e.g. hwcap, or cpu facility). If wanted this allows also to automatically load modules only in e.g. z/VM configurations.
Signed-off-by Heiko Carstens <[email protected]>Signed-off-by Steffen Eiden <[email protected]>
Quoted 12 lines
--- arch/s390/crypto/aes_s390.c | 2 +- arch/s390/crypto/chacha-glue.c | 2 +- arch/s390/crypto/crc32-vx.c | 2 +- arch/s390/crypto/des_s390.c | 2 +- arch/s390/crypto/ghash_s390.c | 2 +- arch/s390/crypto/prng.c | 2 +- arch/s390/crypto/sha1_s390.c | 2 +- arch/s390/crypto/sha256_s390.c | 2 +- arch/s390/crypto/sha3_256_s390.c | 2 +- arch/s390/crypto/sha3_512_s390.c | 2 +- arch/s390/crypto/sha512_s390.c | 2 +-
Regarding facility bits for cpu features: Initially, I used MSA hwcap to cover all ciphers among all hw generations. With facility bit checks, it makes more sense to fine-tune and load based on respective MSA level or CPACF functions that is required for ciphers/hashes.
E.g. like
arch/s390/crypto/sha512_s390.c static void __exit fini(void) · line 146
Quoted 11 lines
arch/s390/crypto/sha512_s390.c +1
-1@@ -142,7 +142,7 @@ static void __exit fini(void)crypto_unregister_shash (&sha384_alg); } -module_cpu_feature_match (MSA , init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , init);module_exit (fini);
which becomes automatically loaded if (any) MSA is available and then performs this check:
cpacf_query_func(CPACF_KIMD, CPACF_KIMD_SHA_512
which in the worst case would fail.
This might be a very useful follow-up patch to remove those mod init checks into the cpu feature.
Other than that,
Heiko Carstens
maintainerRe: [PATCH v2 1/3] s390/cpufeature: rework to allow more than only hwcap bits
Quoted 4 lines · Hendrik Brueckner
Regarding facility bits for cpu features: Initially, I used MSA hwcap to cover all ciphers among all hw generations. With facility bit checks, it makes more sense to fine-tune and load based on respective MSA level or CPACF functions that is required for ciphers/hashes.
...
Quoted 7 lines
arch/s390/crypto/sha3_512_s390.c static void __exit fini(void) · line 151
Quoted 3 lines
arch/s390/crypto/sha3_512_s390.c +1
-1-module_cpu_feature_match (MSA , init); +module_cpu_feature_match (S390_CPU_FEATURE_MSA , init);module_exit (fini);which becomes automatically loaded if (any) MSA is available and then performs this check:
Quoted 6 lines
cpacf_query_func(CPACF_KIMD,
CPACF_KIMD_SHA_512which in the worst case would fail.
This might be a very useful follow-up patch to remove those mod init checks into the cpu feature.
Yes, that makes a lot of sense. Thanks for suggesting this!
PATCH v2 2/3 s390/cpufeature: allow for facility bits
In reply to Steffen EidenFrom: Heiko Carstens <[email protected]>
Allow for facility bits to be used in cpu features.
--- arch/s390/kernel/cpufeature.c | 3 +++ 1 file changed, 3 insertions(+)
arch/s390/kernel/cpufeature.c +3 -0
@@ -8,6 +8,7 @@enum {TYPE_HWCAP , +TYPE_FACILITY , };struct s390_cpu_feature {
@@ -34,6 +35,8 @@ int cpu_have_feature(unsigned int num)switch (feature->type) {case TYPE_HWCAP :return !!(elf_hwcap &BIT (feature->num)); +case TYPE_FACILITY : +return test_facility (feature->num);default :WARN_ON_ONCE (1 );return 0 ;
Signature · 1 line
2.35.3
PATCH v2 3/3 s390/uvdevice: autoload module based on CPU facility
In reply to Steffen EidenMake sure the uvdevice driver will be automatically loaded when facility 158 is available.
--- arch/s390/include/asm/cpufeature.h | 1 + arch/s390/kernel/cpufeature.c | 1 + drivers/s390/char/uvdevice.c | 5 ++--- 3 files changed, 4 insertions(+), 3 deletions(-)
arch/s390/include/asm/cpufeature.h +1 -0
@@ -12,6 +12,7 @@enum {S390_CPU_FEATURE_MSA ,S390_CPU_FEATURE_VXRS , +S390_CPU_FEATURE_UV ,MAX_CPU_FEATURES };
arch/s390/kernel/cpufeature.c +1 -0
@@ -19,6 +19,7 @@ struct s390_cpu_feature {static struct s390_cpu_feature s390_cpu_features[MAX_CPU_FEATURES ] = { [S390_CPU_FEATURE_MSA ] = {.type =TYPE_HWCAP , .num =HWCAP_NR_MSA }, [S390_CPU_FEATURE_VXRS ] = {.type =TYPE_HWCAP , .num =HWCAP_NR_VXRS }, + [S390_CPU_FEATURE_UV ] = {.type =TYPE_FACILITY , .num =158 }, };/*
drivers/s390/char/uvdevice.c +2 -3
@@ -27,6 +27,7 @@#include <linux/stddef.h> #include <linux/vmalloc.h> #include <linux/slab.h> +#include <linux/cpufeature.h> #include <asm/uvdevice.h> #include <asm/uv.h>
@@ -244,12 +245,10 @@ static void __exit uvio_dev_exit(void)static int __init uvio_dev_init (void ) { -if (!test_facility (158 )) -return -ENXIO ;return misc_register (&uvio_dev_miscdev); } -module_init (uvio_dev_init); +module_cpu_feature_match (S390_CPU_FEATURE_UV , uvio_dev_init);module_exit (uvio_dev_exit);MODULE_AUTHOR ("IBM Corporation" );
Signature · 1 line
2.35.3
Heiko Carstens
maintainerQuoted 16 lines · Steffen Eiden
Currently the s390 implementaion of cpufeature is limited to
elf_hwcapbits. Using these to automatically load modules also exposes this cpufeature to userspace which, sometimes is not intended.Therefore, rework the s390-cpufeature implementation to allow for various cpu feature indications, which is not only limited to hwcap bits.
Add a new type to allow facilities to be a cpufeature without using hwcap bits that expose this feature to userspace.
Load uvdevice when facility 158 is present.
since v1:
* add r-bs from Claudio
* worked in comments
Quoted 6 lines
Heiko Carstens (2):
s390/cpufeature: rework to allow more than only hwcap bits s390/cpufeature: allow for facility bitsSteffen Eiden (1):
s390/uvdevice: autoload module based on CPU facility
Series applied, thanks!
Maybe, I am bit late ...
Quoted 3 lines · Steffen Eiden
Currently the s390 implementaion of cpufeature is limited to
elf_hwcapbits. Using these to automatically load modules also exposes this cpufeature to userspace which, sometimes is not intended.
Those features are (always) exposed to user space as module loading is actually done by udev rules. However, we had some pseudo-hwcaps (e.g. sie64a) in the past.. but I very appreciate this change!
Thanks.