introduce unified static key mechanism for ISA ext
v2 cover introduce unified static key mechanism for ISA ext
Currently, riscv has several extensions which may not be supported on all riscv platforms, for example, FPU and so on. To support unified kernel Image style, we need to check whether the feature is supported or not. If the check sits at hot code path, the performance will be impacted a lot. static key can be used to solve the issue. In the past, FPU support has been converted to use static key mechanism. I believe we will have similar cases in the future.
Since v1:
- fix typo, thank Atish
- remove riscv_isa_have_key_extension() instead use the isa ext keys directly as pointed out by Atish.
Jisheng Zhang (2):
riscv: introduce unified static key mechanism for ISA extensions
riscv: switch has_fpu() to the unified static key mechanism
arch/riscv/include/asm/hwcap.h | 25 +++++++++++++++++++++++++ arch/riscv/include/asm/switch_to.h | 4 ++-- arch/riscv/kernel/cpufeature.c | 14 +++++++------- 3 files changed, 34 insertions(+), 9 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/2 riscv: introduce unified static key mechanism for ISA extensions
Currently, riscv has several extensions which may not be supported on all riscv platforms, for example, FPU and so on. To support unified kernel Image style, we need to check whether the feature is supported or not. If the check sits at hot code path, then performance will be impacted a lot. static key can be used to solve the issue. In the past, FPU support has been converted to use static key mechanism. I believe we will have similar cases in the future.
This patch tries to add an unified mechanism to use static keys for some ISA extensions by implementing an array of default-false static keys and enabling them when detected.
--- arch/riscv/include/asm/hwcap.h | 25 +++++++++++++++++++++++++ arch/riscv/kernel/cpufeature.c | 7 +++++++ 2 files changed, 32 insertions(+)
arch/riscv/include/asm/hwcap.h +25 -0
@@ -12,6 +12,7 @@#include <uapi/asm/hwcap.h> #ifndef __ASSEMBLY__ +#include <linux/jump_label.h> /* * This yields a mask that user programs can use to figure out what * instruction set this cpu supports.
@@ -55,6 +56,16 @@ enum riscv_isa_ext_id { RISCV_ISA_EXT_ID_MAX = RISCV_ISA_EXT_MAX, }; +/* +* This enum represents the logical ID for each RISC-V ISA extension static +* keys. We can use static key to optimize code path if some ISA extensions +* are available. +*/ +enum riscv_isa_ext_key { +RISCV_ISA_EXT_KEY_FPU ,/* For 'F' and 'D' */ +RISCV_ISA_EXT_KEY_MAX , +}; +struct riscv_isa_ext_data {/* Name of the extension displayed to userspace via /proc/cpuinfo */ char uprop[RISCV_ISA_EXT_NAME_LEN_MAX ];
@@ -62,6 +73,20 @@ struct riscv_isa_ext_data {unsigned int isa_ext_id; }; +extern struct static_key_false riscv_isa_ext_keys[RISCV_ISA_EXT_KEY_MAX ]; + +static __always_inline int riscv_isa_ext2key(int num) +{ +switch (num) { +case RISCV_ISA_EXT_f: +return RISCV_ISA_EXT_KEY_FPU ; +case RISCV_ISA_EXT_d: +return RISCV_ISA_EXT_KEY_FPU ; +default : +return -EINVAL ; + } +} +unsigned long riscv_isa_extension_base (const unsigned long *isa_bitmap);#define riscv_isa_extension_mask (ext) BIT_MASK(RISCV_ISA_EXT_##ext)
arch/riscv/kernel/cpufeature.c +7 -0
@@ -24,6 +24,8 @@ static DECLARE_BITMAP(riscv_isa, RISCV_ISA_EXT_MAX) __read_mostly;#ifdef CONFIG_FPU __ro_after_init DEFINE_STATIC_KEY_FALSE (cpu_hwcap_fpu);#endif +__ro_after_init DEFINE_STATIC_KEY_ARRAY_FALSE (riscv_isa_ext_keys,RISCV_ISA_EXT_KEY_MAX ); +EXPORT_SYMBOL (riscv_isa_ext_keys);/** * riscv_isa_extension_base() - Get base extension word
@@ -232,6 +234,11 @@ void __init riscv_fill_hwcap(void) print_str[j++] = (char )('a' + i);pr_info ("riscv: ELF capabilities %s\n" , print_str); +for_each_set_bit (i, riscv_isa,RISCV_ISA_EXT_MAX ) { + j =riscv_isa_ext2key (i); +if (j >=0 ) +static_branch_enable (&riscv_isa_ext_keys[j]); + }#ifdef CONFIG_FPU if (elf_hwcap & (COMPAT_HWCAP_ISA_F |COMPAT_HWCAP_ISA_D ))static_branch_enable (&cpu_hwcap_fpu);
Signature · 1 line
2.34.1
Re: [PATCH v2 1/2] riscv: introduce unified static key mechanism for ISA extensions
Quoted 95 lines · Jisheng Zhang
Currently, riscv has several extensions which may not be supported on all riscv platforms, for example, FPU and so on. To support unified kernel Image style, we need to check whether the feature is supported or not. If the check sits at hot code path, then performance will be impacted a lot. static key can be used to solve the issue. In the past, FPU support has been converted to use static key mechanism. I believe we will have similar cases in the future.
This patch tries to add an unified mechanism to use static keys for some ISA extensions by implementing an array of default-false static keys and enabling them when detected.
Signed-off-by Jisheng Zhang <[email protected]>--- arch/riscv/include/asm/hwcap.h | 25 +++++++++++++++++++++++++ arch/riscv/kernel/cpufeature.c | 7 +++++++ 2 files changed, 32 insertions(+)arch/riscv/include/asm/hwcap.h +25
-0@@ -12,6 +12,7 @@#include <uapi/asm/hwcap.h> #ifndef __ASSEMBLY__ +#include <linux/jump_label.h> /* * This yields a mask that user programs can use to figure out what * instruction set this cpu supports. @@ -55,6 +56,16 @@ enum riscv_isa_ext_id { RISCV_ISA_EXT_ID_MAX = RISCV_ISA_EXT_MAX, }; +/* +* This enum represents the logical ID for each RISC-V ISA extension static +* keys. We can use static key to optimize code path if some ISA extensions +* are available. +*/ +enum riscv_isa_ext_key { +RISCV_ISA_EXT_KEY_FPU ,/* For 'F' and 'D' */ +RISCV_ISA_EXT_KEY_MAX , +}; +struct riscv_isa_ext_data {/* Name of the extension displayed to userspace via /proc/cpuinfo */ char uprop[RISCV_ISA_EXT_NAME_LEN_MAX ];@@ -62,6 +73,20 @@ struct riscv_isa_ext_data {unsigned int isa_ext_id; }; +extern struct static_key_false riscv_isa_ext_keys[RISCV_ISA_EXT_KEY_MAX ]; + +static __always_inline int riscv_isa_ext2key(int num) +{ +switch (num) { +case RISCV_ISA_EXT_f: +return RISCV_ISA_EXT_KEY_FPU ; +case RISCV_ISA_EXT_d: +return RISCV_ISA_EXT_KEY_FPU ; +default : +return -EINVAL ; + } +} +unsigned long riscv_isa_extension_base (const unsigned long *isa_bitmap);#define riscv_isa_extension_mask (ext) BIT_MASK(RISCV_ISA_EXT_##ext)arch/riscv/kernel/cpufeature.c +7
-1@@ -24,6 +24,8 @@ static DECLARE_BITMAP(riscv_isa, RISCV_ISA_EXT_MAX) __read_mostly;#ifdef CONFIG_FPU __ro_after_init DEFINE_STATIC_KEY_FALSE (cpu_hwcap_fpu);#endif +__ro_after_init DEFINE_STATIC_KEY_ARRAY_FALSE (riscv_isa_ext_keys,RISCV_ISA_EXT_KEY_MAX ); +EXPORT_SYMBOL (riscv_isa_ext_keys);/** * riscv_isa_extension_base() - Get base extension word @@ -232,6 +234,11 @@ void __init riscv_fill_hwcap(void) print_str[j++] = (char )('a' + i);pr_info ("riscv: ELF capabilities %s\n" , print_str); +for_each_set_bit (i, riscv_isa,RISCV_ISA_EXT_MAX ) { + j =riscv_isa_ext2key (i); +if (j >=0 ) +static_branch_enable (&riscv_isa_ext_keys[j]); + }#ifdef CONFIG_FPU if (elf_hwcap & (COMPAT_HWCAP_ISA_F |COMPAT_HWCAP_ISA_D ))static_branch_enable (&cpu_hwcap_fpu); --
Quoted 2 lines
2.34.1
Signature · 2 lines
Regards, Atish
Re: [PATCH v2 1/2] riscv: introduce unified static key mechanism for ISA extensions
In reply to Jisheng ZhangQuoted 9 lines · Jisheng Zhang
Currently, riscv has several extensions which may not be supported on all riscv platforms, for example, FPU and so on. To support unified kernel Image style, we need to check whether the feature is supported or not. If the check sits at hot code path, then performance will be impacted a lot. static key can be used to solve the issue. In the past, FPU support has been converted to use static key mechanism. I believe we will have similar cases in the future.
Quoted 5 lines
This patch tries to add an unified mechanism to use static keys for some ISA extensions by implementing an array of default-false static keys and enabling them when detected.
Signed-off-by Jisheng Zhang <[email protected]>
Looks good to me.
Regards,
Anup
Quoted 83 lines
--- arch/riscv/include/asm/hwcap.h | 25 +++++++++++++++++++++++++ arch/riscv/kernel/cpufeature.c | 7 +++++++ 2 files changed, 32 insertions(+)arch/riscv/include/asm/hwcap.h +25
-0@@ -12,6 +12,7 @@#include <uapi/asm/hwcap.h> #ifndef __ASSEMBLY__ +#include <linux/jump_label.h> /* * This yields a mask that user programs can use to figure out what * instruction set this cpu supports. @@ -55,6 +56,16 @@ enum riscv_isa_ext_id { RISCV_ISA_EXT_ID_MAX = RISCV_ISA_EXT_MAX, }; +/* +* This enum represents the logical ID for each RISC-V ISA extension static +* keys. We can use static key to optimize code path if some ISA extensions +* are available. +*/ +enum riscv_isa_ext_key { +RISCV_ISA_EXT_KEY_FPU ,/* For 'F' and 'D' */ +RISCV_ISA_EXT_KEY_MAX , +}; +struct riscv_isa_ext_data {/* Name of the extension displayed to userspace via /proc/cpuinfo */ char uprop[RISCV_ISA_EXT_NAME_LEN_MAX ];@@ -62,6 +73,20 @@ struct riscv_isa_ext_data {unsigned int isa_ext_id; }; +extern struct static_key_false riscv_isa_ext_keys[RISCV_ISA_EXT_KEY_MAX ]; + +static __always_inline int riscv_isa_ext2key(int num) +{ +switch (num) { +case RISCV_ISA_EXT_f: +return RISCV_ISA_EXT_KEY_FPU ; +case RISCV_ISA_EXT_d: +return RISCV_ISA_EXT_KEY_FPU ; +default : +return -EINVAL ; + } +} +unsigned long riscv_isa_extension_base (const unsigned long *isa_bitmap);#define riscv_isa_extension_mask (ext) BIT_MASK(RISCV_ISA_EXT_##ext)arch/riscv/kernel/cpufeature.c +7
-1@@ -24,6 +24,8 @@ static DECLARE_BITMAP(riscv_isa, RISCV_ISA_EXT_MAX) __read_mostly;#ifdef CONFIG_FPU __ro_after_init DEFINE_STATIC_KEY_FALSE (cpu_hwcap_fpu);#endif +__ro_after_init DEFINE_STATIC_KEY_ARRAY_FALSE (riscv_isa_ext_keys,RISCV_ISA_EXT_KEY_MAX ); +EXPORT_SYMBOL (riscv_isa_ext_keys);/** * riscv_isa_extension_base() - Get base extension word @@ -232,6 +234,11 @@ void __init riscv_fill_hwcap(void) print_str[j++] = (char )('a' + i);pr_info ("riscv: ELF capabilities %s\n" , print_str); +for_each_set_bit (i, riscv_isa,RISCV_ISA_EXT_MAX ) { + j =riscv_isa_ext2key (i); +if (j >=0 ) +static_branch_enable (&riscv_isa_ext_keys[j]); + }#ifdef CONFIG_FPU if (elf_hwcap & (COMPAT_HWCAP_ISA_F |COMPAT_HWCAP_ISA_D ))static_branch_enable (&cpu_hwcap_fpu); --2.34.1
PATCH v2 2/2 riscv: switch has_fpu() to the unified static key mechanism
In reply to Jisheng ZhangThis is to use the unified static key mechanism instead of putting static key related here and there.
--- arch/riscv/include/asm/switch_to.h | 4 ++-- arch/riscv/kernel/cpufeature.c | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-)
arch/riscv/include/asm/switch_to.h +2 -2
@@ -8,6 +8,7 @@#include <linux/jump_label.h> #include <linux/sched/task_stack.h> +#include <asm/hwcap.h> #include <asm/processor.h> #include <asm/ptrace.h> #include <asm/csr.h>
@@ -56,10 +57,9 @@ static inline void __switch_to_aux(struct task_struct *prev,fstate_restore (next,task_pt_regs (next)); } -extern struct static_key_false cpu_hwcap_fpu; static __always_inline bool has_fpu(void) { -return static_branch_likely (&cpu_hwcap_fpu); +return static_branch_likely (&riscv_isa_ext_keys[RISCV_ISA_EXT_KEY_FPU ]); }#else static __always_inline bool has_fpu(void) { return false; }
arch/riscv/kernel/cpufeature.c +0 -7
@@ -21,9 +21,6 @@ unsigned long elf_hwcap __read_mostly;/* Host ISA bitmap */ static DECLARE_BITMAP(riscv_isa, RISCV_ISA_EXT_MAX) __read_mostly; -#ifdef CONFIG_FPU -__ro_after_init DEFINE_STATIC_KEY_FALSE (cpu_hwcap_fpu); -#endif __ro_after_init DEFINE_STATIC_KEY_ARRAY_FALSE (riscv_isa_ext_keys, RISCV_ISA_EXT_KEY_MAX);EXPORT_SYMBOL (riscv_isa_ext_keys);
@@ -239,8 +236,4 @@ void __init riscv_fill_hwcap(void)if (j >=0 )static_branch_enable (&riscv_isa_ext_keys[j]); } -#ifdef CONFIG_FPU -if (elf_hwcap & (COMPAT_HWCAP_ISA_F |COMPAT_HWCAP_ISA_D )) -static_branch_enable (&cpu_hwcap_fpu); -#endif }
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v2 2/2] riscv: switch has_fpu() to the unified static key mechanism
Quoted 58 lines · Jisheng Zhang
This is to use the unified static key mechanism instead of putting static key related here and there.
Signed-off-by Jisheng Zhang <[email protected]>--- arch/riscv/include/asm/switch_to.h | 4 ++-- arch/riscv/kernel/cpufeature.c | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-)arch/riscv/include/asm/switch_to.h +2
-2@@ -8,6 +8,7 @@#include <linux/jump_label.h> #include <linux/sched/task_stack.h> +#include <asm/hwcap.h> #include <asm/processor.h> #include <asm/ptrace.h> #include <asm/csr.h> @@ -56,10 +57,9 @@ static inline void __switch_to_aux(struct task_struct *prev,fstate_restore (next,task_pt_regs (next)); } -extern struct static_key_false cpu_hwcap_fpu; static __always_inline bool has_fpu(void) { -return static_branch_likely (&cpu_hwcap_fpu); +return static_branch_likely (&riscv_isa_ext_keys[RISCV_ISA_EXT_KEY_FPU ]); }#else static __always_inline bool has_fpu(void) { return false; }arch/riscv/kernel/cpufeature.c +0
-8@@ -21,9 +21,6 @@ unsigned long elf_hwcap __read_mostly;/* Host ISA bitmap */ static DECLARE_BITMAP(riscv_isa, RISCV_ISA_EXT_MAX) __read_mostly; -#ifdef CONFIG_FPU -__ro_after_init DEFINE_STATIC_KEY_FALSE (cpu_hwcap_fpu); -#endif __ro_after_init DEFINE_STATIC_KEY_ARRAY_FALSE (riscv_isa_ext_keys, RISCV_ISA_EXT_KEY_MAX);EXPORT_SYMBOL (riscv_isa_ext_keys);@@ -239,8 +236,4 @@ void __init riscv_fill_hwcap(void)if (j >=0 )static_branch_enable (&riscv_isa_ext_keys[j]); } -#ifdef CONFIG_FPU -if (elf_hwcap & (COMPAT_HWCAP_ISA_F |COMPAT_HWCAP_ISA_D )) -static_branch_enable (&cpu_hwcap_fpu); -#endif } --
Quoted 2 lines
2.34.1
Signature · 2 lines
Regards, Atish
Re: [PATCH v2 2/2] riscv: switch has_fpu() to the unified static key mechanism
In reply to Jisheng ZhangQuoted 5 lines · Jisheng Zhang
This is to use the unified static key mechanism instead of putting static key related here and there.
Signed-off-by Jisheng Zhang <[email protected]>
Looks good to me.
Regards,
Anup
Quoted 55 lines
--- arch/riscv/include/asm/switch_to.h | 4 ++-- arch/riscv/kernel/cpufeature.c | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-)arch/riscv/include/asm/switch_to.h +2
-2@@ -8,6 +8,7 @@#include <linux/jump_label.h> #include <linux/sched/task_stack.h> +#include <asm/hwcap.h> #include <asm/processor.h> #include <asm/ptrace.h> #include <asm/csr.h> @@ -56,10 +57,9 @@ static inline void __switch_to_aux(struct task_struct *prev,fstate_restore (next,task_pt_regs (next)); } -extern struct static_key_false cpu_hwcap_fpu; static __always_inline bool has_fpu(void) { -return static_branch_likely (&cpu_hwcap_fpu); +return static_branch_likely (&riscv_isa_ext_keys[RISCV_ISA_EXT_KEY_FPU ]); }#else static __always_inline bool has_fpu(void) { return false; }arch/riscv/kernel/cpufeature.c +0
-8@@ -21,9 +21,6 @@ unsigned long elf_hwcap __read_mostly;/* Host ISA bitmap */ static DECLARE_BITMAP(riscv_isa, RISCV_ISA_EXT_MAX) __read_mostly; -#ifdef CONFIG_FPU -__ro_after_init DEFINE_STATIC_KEY_FALSE (cpu_hwcap_fpu); -#endif __ro_after_init DEFINE_STATIC_KEY_ARRAY_FALSE (riscv_isa_ext_keys, RISCV_ISA_EXT_KEY_MAX);EXPORT_SYMBOL (riscv_isa_ext_keys);@@ -239,8 +236,4 @@ void __init riscv_fill_hwcap(void)if (j >=0 )static_branch_enable (&riscv_isa_ext_keys[j]); } -#ifdef CONFIG_FPU -if (elf_hwcap & (COMPAT_HWCAP_ISA_F |COMPAT_HWCAP_ISA_D )) -static_branch_enable (&cpu_hwcap_fpu); -#endif } --2.34.1
Palmer Dabbelt
maintainerQuoted 13 lines · On Sun, 22 May 2022 08:35:41 PDT (-0700), [email protected] wrote:
Currently, riscv has several extensions which may not be supported on all riscv platforms, for example, FPU and so on. To support unified kernel Image style, we need to check whether the feature is supported or not. If the check sits at hot code path, the performance will be impacted a lot. static key can be used to solve the issue. In the past, FPU support has been converted to use static key mechanism. I believe we will have similar cases in the future.
Since v1:
- fix typo, thank Atish
- removeriscv_isa_have_key_extension()instead use the isa ext keys directly as pointed out by Atish.
Quoted 8 lines
Jisheng Zhang (2):
riscv: introduce unified static key mechanism for ISA extensions
riscv: switchhas_fpu()to the unified static key mechanismarch/riscv/include/asm/hwcap.h | 25 +++++++++++++++++++++++++ arch/riscv/include/asm/switch_to.h | 4 ++-- arch/riscv/kernel/cpufeature.c | 14 +++++++------- 3 files changed, 34 insertions(+), 9 deletions(-)
Thanks, this is on for-next.
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv