Add some validation for vector, vector crypto and fp stuff
Subsystems (2)
v4 cover Add some validation for vector, vector crypto and fp stuff
From: Conor Dooley <[email protected]>
Yo,
This series is partly leveraging Clement's work adding a validate callback in the extension detection code so that things like checking for whether a vector crypto extension is usable can be done like:
has_extension(<vector crypto>)
rather than
has_vector() && has_extension(<vector crypto>)
which Eric pointed out was a poor design some months ago.
The rest of this is adding some requirements to the bindings that prevent combinations of extensions disallowed by the ISA.
There's a bunch of over-long lines in here, but I thought that the over-long lines were clearer than breaking them up.
Cheers,
Conor.
(I've been unintentionally sitting on this for a month, hope I haven't omitted anything as a result)
v4:
- Zvbb -> vector_crypto_validate()
- remove copy-pasta section of commit messages
- Add commentary justifying !EPROBE_DEFER cases
- EPROBE_DEFER where possible (one instance, zve32x check)
v3:
- rebase on v6.14-rc1
- split vector crypto validation patch into vector validation and vector crypto validation
- fix zve64x requiring extension list to match Eric's PR
v2:
- Fix an inverted clause Clément pointed out
- Add Zvbb validation, that I had missed accidentally
- Drop the todo about checking the number of validation rounds, I tried in w/ qemu's max cpu and things looked right
Conor Dooley (6):
RISC-V: add vector extension validation checks
RISC-V: add vector crypto extension validation checks
RISC-V: add f & d extension validation checks
dt-bindings: riscv: d requires f
dt-bindings: riscv: add vector sub-extension dependencies
dt-bindings: riscv: document vector crypto requirements
.../devicetree/bindings/riscv/extensions.yaml | 85 +++++++++++ arch/riscv/include/asm/cpufeature.h | 3 + arch/riscv/kernel/cpufeature.c | 140 +++++++++++++----- 3 files changed, 190 insertions(+), 38 deletions(-)
Signature · 1 line
2.45.2
PATCH v4 1/6 RISC-V: add vector extension validation checks
From: Conor Dooley <[email protected]>
Using Clement's new validation callbacks, support checking that dependencies have been satisfied for the vector extensions. From the kernel's perfective, it's not required to differentiate between the conditions for all the various vector subsets - it's the firmware's job to not report impossible combinations. Instead, the kernel only has to check that the correct config options are enabled and to enforce its requirement of the d extension being present for FPU support.
Since vector will now be disabled proactively, there's no need to clear the bit in elf_hwcap in riscv_fill_hwcap() any longer.
--- arch/riscv/include/asm/cpufeature.h | 3 ++ arch/riscv/kernel/cpufeature.c | 60 +++++++++++++++++++---------- 2 files changed, 43 insertions(+), 20 deletions(-)
arch/riscv/include/asm/cpufeature.h +3 -0
@@ -56,6 +56,9 @@ void __init riscv_user_isa_enable(void);#define __RISCV_ISA_EXT_BUNDLE (_name, _bundled_exts) \ _RISCV_ISA_EXT_DATA(_name, RISCV_ISA_EXT_INVALID, _bundled_exts, \ ARRAY_SIZE(_bundled_exts), NULL) +#define __RISCV_ISA_EXT_BUNDLE_VALIDATE (_name, _bundled_exts, _validate) \ + _RISCV_ISA_EXT_DATA(_name, RISCV_ISA_EXT_INVALID, _bundled_exts, \ + ARRAY_SIZE(_bundled_exts), _validate)/* Used to declare extensions that are a superset of other extensions (Zvbb for instance) */ #define __RISCV_ISA_EXT_SUPERSET (_name, _id, _sub_exts) \
arch/riscv/kernel/cpufeature.c +40 -20
85 lines not on this page · raw message
Signature · 1 line
2.45.2
Re: [PATCH v4 1/6] RISC-V: add vector extension validation checks
Hi Conor,
Quoted 116 lines · Conor Dooley
From: Conor Dooley <[email protected]>
Using Clement's new validation callbacks, support checking that dependencies have been satisfied for the vector extensions. From the kernel's perfective, it's not required to differentiate between the conditions for all the various vector subsets - it's the firmware's job to not report impossible combinations. Instead, the kernel only has to check that the correct config options are enabled and to enforce its requirement of the d extension being present for FPU support.
Since vector will now be disabled proactively, there's no need to clear the bit in
elf_hwcapinriscv_fill_hwcap()any longer.Signed-off-by Conor Dooley <[email protected]>--- arch/riscv/include/asm/cpufeature.h | 3 ++ arch/riscv/kernel/cpufeature.c | 60 +++++++++++++++++++---------- 2 files changed, 43 insertions(+), 20 deletions(-)arch/riscv/include/asm/cpufeature.h +3
-0@@ -56,6 +56,9 @@ void __init riscv_user_isa_enable(void);#define __RISCV_ISA_EXT_BUNDLE (_name, _bundled_exts) \ _RISCV_ISA_EXT_DATA(_name, RISCV_ISA_EXT_INVALID, _bundled_exts, \ ARRAY_SIZE(_bundled_exts), NULL) +#define __RISCV_ISA_EXT_BUNDLE_VALIDATE (_name, _bundled_exts, _validate) \ + _RISCV_ISA_EXT_DATA(_name, RISCV_ISA_EXT_INVALID, _bundled_exts, \ + ARRAY_SIZE(_bundled_exts), _validate)/* Used to declare extensions that are a superset of other extensions (Zvbb for instance) */ #define __RISCV_ISA_EXT_SUPERSET (_name, _id, _sub_exts) \arch/riscv/kernel/cpufeature.c +40
-13@@ -109,6 +109,38 @@ static int riscv_ext_zicboz_validate(const struct riscv_isa_ext_data *data,return 0 ; } +static int riscv_ext_vector_x_validate (const struct riscv_isa_ext_data *data, +const unsigned long *isa_bitmap) +{ +if (!IS_ENABLED (CONFIG_RISCV_ISA_V )) +return -EINVAL ; + +return 0 ; +} + +static int riscv_ext_vector_float_validate (const struct riscv_isa_ext_data *data, +const unsigned long *isa_bitmap) +{ +if (!IS_ENABLED (CONFIG_RISCV_ISA_V )) +return -EINVAL ; + +if (!IS_ENABLED (CONFIG_FPU )) +return -EINVAL ; + +/* +* The kernel doesn't support systems that don't implement both of +* F and D, so if any of the vector extensions that do floating point +* are to be usable, both floating point extensions need to be usable. +* +* Since this function validates vector only, and v/Zve* are probed +* after f/d, there's no need for a deferral here. +*/ +if (!__riscv_isa_extension_available (isa_bitmap, RISCV_ISA_EXT_d)) +return -EINVAL ; + +return 0 ; +} +static int riscv_ext_zca_depends (const struct riscv_isa_ext_data *data,const unsigned long *isa_bitmap) {@@ -326,12 +358,10 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = {__RISCV_ISA_EXT_DATA (d, RISCV_ISA_EXT_d),__RISCV_ISA_EXT_DATA (q, RISCV_ISA_EXT_q),__RISCV_ISA_EXT_SUPERSET (c, RISCV_ISA_EXT_c, riscv_c_exts), -__RISCV_ISA_EXT_SUPERSET (v, RISCV_ISA_EXT_v, riscv_v_exts), +__RISCV_ISA_EXT_SUPERSET_VALIDATE (v, RISCV_ISA_EXT_v, riscv_v_exts, riscv_ext_vector_float_validate),__RISCV_ISA_EXT_DATA (h, RISCV_ISA_EXT_h), -__RISCV_ISA_EXT_SUPERSET_VALIDATE (zicbom,RISCV_ISA_EXT_ZICBOM , riscv_xlinuxenvcfg_exts, - riscv_ext_zicbom_validate), -__RISCV_ISA_EXT_SUPERSET_VALIDATE (zicboz,RISCV_ISA_EXT_ZICBOZ , riscv_xlinuxenvcfg_exts, - riscv_ext_zicboz_validate), +__RISCV_ISA_EXT_SUPERSET_VALIDATE (zicbom,RISCV_ISA_EXT_ZICBOM , riscv_xlinuxenvcfg_exts, riscv_ext_zicbom_validate), +__RISCV_ISA_EXT_SUPERSET_VALIDATE (zicboz,RISCV_ISA_EXT_ZICBOZ , riscv_xlinuxenvcfg_exts, riscv_ext_zicboz_validate),__RISCV_ISA_EXT_DATA (ziccrse,RISCV_ISA_EXT_ZICCRSE ),__RISCV_ISA_EXT_DATA (zicntr,RISCV_ISA_EXT_ZICNTR ), __RISCV_ISA_EXT_DATA(zicond, RISCV_ISA_EXT_ZICOND),@@ -372,11 +402,11 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = {__RISCV_ISA_EXT_DATA (ztso,RISCV_ISA_EXT_ZTSO ),__RISCV_ISA_EXT_SUPERSET (zvbb,RISCV_ISA_EXT_ZVBB , riscv_zvbb_exts),__RISCV_ISA_EXT_DATA (zvbc,RISCV_ISA_EXT_ZVBC ), -__RISCV_ISA_EXT_SUPERSET (zve32f,RISCV_ISA_EXT_ZVE32F , riscv_zve32f_exts), -__RISCV_ISA_EXT_DATA (zve32x,RISCV_ISA_EXT_ZVE32X ), -__RISCV_ISA_EXT_SUPERSET (zve64d,RISCV_ISA_EXT_ZVE64D , riscv_zve64d_exts), -__RISCV_ISA_EXT_SUPERSET (zve64f,RISCV_ISA_EXT_ZVE64F , riscv_zve64f_exts), -__RISCV_ISA_EXT_SUPERSET (zve64x,RISCV_ISA_EXT_ZVE64X , riscv_zve64x_exts), +__RISCV_ISA_EXT_SUPERSET_VALIDATE (zve32f,RISCV_ISA_EXT_ZVE32F , riscv_zve32f_exts, riscv_ext_vector_float_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zve32x,RISCV_ISA_EXT_ZVE32X , riscv_ext_vector_x_validate), +__RISCV_ISA_EXT_SUPERSET_VALIDATE (zve64d,RISCV_ISA_EXT_ZVE64D , riscv_zve64d_exts, riscv_ext_vector_float_validate), +__RISCV_ISA_EXT_SUPERSET_VALIDATE (zve64f,RISCV_ISA_EXT_ZVE64F , riscv_zve64f_exts, riscv_ext_vector_float_validate), +__RISCV_ISA_EXT_SUPERSET_VALIDATE (zve64x,RISCV_ISA_EXT_ZVE64X , riscv_zve64x_exts, riscv_ext_vector_x_validate),__RISCV_ISA_EXT_DATA (zvfh,RISCV_ISA_EXT_ZVFH ),__RISCV_ISA_EXT_DATA (zvfhmin,RISCV_ISA_EXT_ZVFHMIN ), __RISCV_ISA_EXT_DATA(zvkb, RISCV_ISA_EXT_ZVKB),@@ -960,16 +990,6 @@ void __init riscv_fill_hwcap(void)riscv_v_setup_vsize (); } -if (elf_hwcap &COMPAT_HWCAP_ISA_V ) { -/* -* ISA string in device tree might have 'v' flag, but
arch/riscv/kernel/cpufeature.c void __init riscv_fill_hwcap(void) · line 995
Quoted 10 lines
arch/riscv/kernel/cpufeature.c +0
-7-* CONFIG_RISCV_ISA_V is disabled in kernel. -* Clear V flag in elf_hwcap if CONFIG_RISCV_ISA_V is disabled. -*/ -if (!IS_ENABLED (CONFIG_RISCV_ISA_V )) - elf_hwcap &= ~COMPAT_HWCAP_ISA_V ; - } -memset (print_str,0 ,sizeof (print_str));for (i =0 , j =0 ; i <NUM_ALPHA_EXTS ; i++)if (riscv_isa[0 ] &BIT_MASK (i))
Thanks,
Alex
PATCH v4 2/6 RISC-V: add vector crypto extension validation checks
In reply to Conor DooleyFrom: Conor Dooley <[email protected]>
Using Clement's new validation callbacks, support checking that dependencies have been satisfied for the vector crpyto extensions. Currently riscv_isa_extension_available(<vector crypto>) will return true on systems that support the extensions but vector itself has been disabled by the kernel, adding validation callbacks will prevent such a scenario from occuring and make the behaviour of the extension detection functions more consistent with user expectations - it's not expected to have to check for vector AND the specific crypto extension.
The Unpriv spec states:
| The Zvknhb and Zvbc Vector Crypto Extensions --and accordingly the
| composite extensions Zvkn, Zvknc, Zvkng, and Zvksc-- require a Zve64x
| base, or application ("V") base Vector Extension. All of the other
| Vector Crypto Extensions can be built on any embedded (Zve*) or
| application ("V") base Vector Extension.While this could be used as the basis for checking that the correct base for individual crypto extensions, but that's not really the kernel's job in my opinion and it is sufficient to leave that sort of precision to the dt-bindings. The kernel only needs to make sure that vector, in some form, is available.
--- arch/riscv/kernel/cpufeature.c | 49 +++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 16 deletions(-)
arch/riscv/kernel/cpufeature.c +33 -16
@@ -141,6 +141,23 @@ static int riscv_ext_vector_float_validate(const struct riscv_isa_ext_data *datareturn 0 ; } +static int riscv_ext_vector_crypto_validate (const struct riscv_isa_ext_data *data, +const unsigned long *isa_bitmap) +{ +if (!IS_ENABLED (CONFIG_RISCV_ISA_V )) +return -EINVAL ; + +/* +* It isn't the kernel's job to check that the binding is correct, so +* it should be enough to check that any of the vector extensions are +* enabled, which in-turn means that vector is usable in this kernel +*/ +if (!__riscv_isa_extension_available (isa_bitmap,RISCV_ISA_EXT_ZVE32X )) +return -EPROBE_DEFER ; + +return 0 ; +} +static int riscv_ext_zca_depends (const struct riscv_isa_ext_data *data,const unsigned long *isa_bitmap) {
@@ -400,8 +417,8 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = {__RISCV_ISA_EXT_DATA (zksed,RISCV_ISA_EXT_ZKSED ),__RISCV_ISA_EXT_DATA (zksh,RISCV_ISA_EXT_ZKSH ),__RISCV_ISA_EXT_DATA (ztso,RISCV_ISA_EXT_ZTSO ), -__RISCV_ISA_EXT_SUPERSET (zvbb,RISCV_ISA_EXT_ZVBB , riscv_zvbb_exts), -__RISCV_ISA_EXT_DATA (zvbc,RISCV_ISA_EXT_ZVBC ), +__RISCV_ISA_EXT_SUPERSET_VALIDATE (zvbb,RISCV_ISA_EXT_ZVBB , riscv_zvbb_exts, riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zvbc,RISCV_ISA_EXT_ZVBC , riscv_ext_vector_crypto_validate),__RISCV_ISA_EXT_SUPERSET_VALIDATE (zve32f,RISCV_ISA_EXT_ZVE32F , riscv_zve32f_exts, riscv_ext_vector_float_validate),__RISCV_ISA_EXT_DATA_VALIDATE (zve32x,RISCV_ISA_EXT_ZVE32X , riscv_ext_vector_x_validate), __RISCV_ISA_EXT_SUPERSET_VALIDATE(zve64d, RISCV_ISA_EXT_ZVE64D, riscv_zve64d_exts, riscv_ext_vector_float_validate),
@@ -409,20 +426,20 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = {__RISCV_ISA_EXT_SUPERSET_VALIDATE (zve64x,RISCV_ISA_EXT_ZVE64X , riscv_zve64x_exts, riscv_ext_vector_x_validate),__RISCV_ISA_EXT_DATA (zvfh,RISCV_ISA_EXT_ZVFH ),__RISCV_ISA_EXT_DATA (zvfhmin,RISCV_ISA_EXT_ZVFHMIN ), -__RISCV_ISA_EXT_DATA (zvkb,RISCV_ISA_EXT_ZVKB ), -__RISCV_ISA_EXT_DATA (zvkg,RISCV_ISA_EXT_ZVKG ), -__RISCV_ISA_EXT_BUNDLE (zvkn, riscv_zvkn_bundled_exts), -__RISCV_ISA_EXT_BUNDLE (zvknc, riscv_zvknc_bundled_exts), -__RISCV_ISA_EXT_DATA (zvkned,RISCV_ISA_EXT_ZVKNED ), -__RISCV_ISA_EXT_BUNDLE (zvkng, riscv_zvkng_bundled_exts), -__RISCV_ISA_EXT_DATA (zvknha,RISCV_ISA_EXT_ZVKNHA ), -__RISCV_ISA_EXT_DATA (zvknhb,RISCV_ISA_EXT_ZVKNHB ), -__RISCV_ISA_EXT_BUNDLE (zvks, riscv_zvks_bundled_exts), -__RISCV_ISA_EXT_BUNDLE (zvksc, riscv_zvksc_bundled_exts), -__RISCV_ISA_EXT_DATA (zvksed,RISCV_ISA_EXT_ZVKSED ), -__RISCV_ISA_EXT_DATA (zvksh,RISCV_ISA_EXT_ZVKSH ), -__RISCV_ISA_EXT_BUNDLE (zvksg, riscv_zvksg_bundled_exts), -__RISCV_ISA_EXT_DATA (zvkt,RISCV_ISA_EXT_ZVKT ), +__RISCV_ISA_EXT_DATA_VALIDATE (zvkb,RISCV_ISA_EXT_ZVKB , riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zvkg,RISCV_ISA_EXT_ZVKG , riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_BUNDLE_VALIDATE (zvkn, riscv_zvkn_bundled_exts, riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_BUNDLE_VALIDATE (zvknc, riscv_zvknc_bundled_exts, riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zvkned,RISCV_ISA_EXT_ZVKNED , riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_BUNDLE_VALIDATE (zvkng, riscv_zvkng_bundled_exts, riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zvknha,RISCV_ISA_EXT_ZVKNHA , riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zvknhb,RISCV_ISA_EXT_ZVKNHB , riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_BUNDLE_VALIDATE (zvks, riscv_zvks_bundled_exts, riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_BUNDLE_VALIDATE (zvksc, riscv_zvksc_bundled_exts, riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zvksed,RISCV_ISA_EXT_ZVKSED , riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zvksh,RISCV_ISA_EXT_ZVKSH , riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_BUNDLE_VALIDATE (zvksg, riscv_zvksg_bundled_exts, riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zvkt,RISCV_ISA_EXT_ZVKT , riscv_ext_vector_crypto_validate),__RISCV_ISA_EXT_DATA (smaia,RISCV_ISA_EXT_SMAIA ),__RISCV_ISA_EXT_DATA (smmpm,RISCV_ISA_EXT_SMMPM ), __RISCV_ISA_EXT_SUPERSET(smnpm, RISCV_ISA_EXT_SMNPM, riscv_xlinuxenvcfg_exts),
Signature · 1 line
2.45.2
Alexandre Ghiti
reviewerRe: [PATCH v4 2/6] RISC-V: add vector crypto extension validation checks
Hi Conor,
Quoted 39 lines · Conor Dooley
From: Conor Dooley <[email protected]>
Using Clement's new validation callbacks, support checking that dependencies have been satisfied for the vector crpyto extensions. Currently
riscv_isa_extension_available(<vector crypto>)will return true on systems that support the extensions but vector itself has been disabled by the kernel, adding validation callbacks will prevent such a scenario from occuring and make the behaviour of the extension detection functions more consistent with user expectations - it's not expected to have to check for vector AND the specific crypto extension.The Unpriv spec states:
| The Zvknhb and Zvbc Vector Crypto Extensions --and accordingly the | composite extensions Zvkn, Zvknc, Zvkng, and Zvksc-- require a Zve64x | base, or application ("V") base Vector Extension. All of the other | Vector Crypto Extensions can be built on any embedded (Zve*) or | application ("V") base Vector Extension.While this could be used as the basis for checking that the correct base for individual crypto extensions, but that's not really the kernel's job in my opinion and it is sufficient to leave that sort of precision to the dt-bindings. The kernel only needs to make sure that vector, in some form, is available.
Signed-off-by Conor Dooley <[email protected]>--- arch/riscv/kernel/cpufeature.c | 49 +++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 16 deletions(-)arch/riscv/kernel/cpufeature.c +1
-0@@ -141,6 +141,23 @@ static int riscv_ext_vector_float_validate(const struct riscv_isa_ext_data *datareturn 0 ; } +static int riscv_ext_vector_crypto_validate(const struct riscv_isa_ext_data *data,
arch/riscv/kernel/cpufeature.c static int riscv_ext_vector_float_validate(const struct riscv_isa_ext_data *data · line 154
Quoted 10 lines
arch/riscv/kernel/cpufeature.c +10
-0+ const unsigned long *isa_bitmap) +{ +if (!IS_ENABLED (CONFIG_RISCV_ISA_V )) +return -EINVAL ; + +/* +* It isn't the kernel's job to check that the binding is correct, so +* it should be enough to check that any of the vector extensions are +* enabled, which in-turn means that vector is usable in this kernel +*/
I'm not sure to understand this comment. For example, Zvknhb depends on Zve64x so only checking for Zve32x would make Zvknhb usable in the kernel even though it's actually not supported right? Or am I missing something?
Thanks,
Alex
Quoted 55 lines
arch/riscv/kernel/cpufeature.c +22
-16+if (!__riscv_isa_extension_available (isa_bitmap,RISCV_ISA_EXT_ZVE32X )) +return -EPROBE_DEFER ; + +return 0 ; +} +static int riscv_ext_zca_depends (const struct riscv_isa_ext_data *data,const unsigned long *isa_bitmap) {@@ -400,8 +417,8 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = {__RISCV_ISA_EXT_DATA (zksed,RISCV_ISA_EXT_ZKSED ),__RISCV_ISA_EXT_DATA (zksh,RISCV_ISA_EXT_ZKSH ),__RISCV_ISA_EXT_DATA (ztso,RISCV_ISA_EXT_ZTSO ), -__RISCV_ISA_EXT_SUPERSET (zvbb,RISCV_ISA_EXT_ZVBB , riscv_zvbb_exts), -__RISCV_ISA_EXT_DATA (zvbc,RISCV_ISA_EXT_ZVBC ), +__RISCV_ISA_EXT_SUPERSET_VALIDATE (zvbb,RISCV_ISA_EXT_ZVBB , riscv_zvbb_exts, riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zvbc,RISCV_ISA_EXT_ZVBC , riscv_ext_vector_crypto_validate),__RISCV_ISA_EXT_SUPERSET_VALIDATE (zve32f,RISCV_ISA_EXT_ZVE32F , riscv_zve32f_exts, riscv_ext_vector_float_validate),__RISCV_ISA_EXT_DATA_VALIDATE (zve32x,RISCV_ISA_EXT_ZVE32X , riscv_ext_vector_x_validate), __RISCV_ISA_EXT_SUPERSET_VALIDATE(zve64d, RISCV_ISA_EXT_ZVE64D, riscv_zve64d_exts, riscv_ext_vector_float_validate),@@ -409,20 +426,20 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = {__RISCV_ISA_EXT_SUPERSET_VALIDATE (zve64x,RISCV_ISA_EXT_ZVE64X , riscv_zve64x_exts, riscv_ext_vector_x_validate),__RISCV_ISA_EXT_DATA (zvfh,RISCV_ISA_EXT_ZVFH ),__RISCV_ISA_EXT_DATA (zvfhmin,RISCV_ISA_EXT_ZVFHMIN ), -__RISCV_ISA_EXT_DATA (zvkb,RISCV_ISA_EXT_ZVKB ), -__RISCV_ISA_EXT_DATA (zvkg,RISCV_ISA_EXT_ZVKG ), -__RISCV_ISA_EXT_BUNDLE (zvkn, riscv_zvkn_bundled_exts), -__RISCV_ISA_EXT_BUNDLE (zvknc, riscv_zvknc_bundled_exts), -__RISCV_ISA_EXT_DATA (zvkned,RISCV_ISA_EXT_ZVKNED ), -__RISCV_ISA_EXT_BUNDLE (zvkng, riscv_zvkng_bundled_exts), -__RISCV_ISA_EXT_DATA (zvknha,RISCV_ISA_EXT_ZVKNHA ), -__RISCV_ISA_EXT_DATA (zvknhb,RISCV_ISA_EXT_ZVKNHB ), -__RISCV_ISA_EXT_BUNDLE (zvks, riscv_zvks_bundled_exts), -__RISCV_ISA_EXT_BUNDLE (zvksc, riscv_zvksc_bundled_exts), -__RISCV_ISA_EXT_DATA (zvksed,RISCV_ISA_EXT_ZVKSED ), -__RISCV_ISA_EXT_DATA (zvksh,RISCV_ISA_EXT_ZVKSH ), -__RISCV_ISA_EXT_BUNDLE (zvksg, riscv_zvksg_bundled_exts), -__RISCV_ISA_EXT_DATA (zvkt,RISCV_ISA_EXT_ZVKT ), +__RISCV_ISA_EXT_DATA_VALIDATE (zvkb,RISCV_ISA_EXT_ZVKB , riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zvkg,RISCV_ISA_EXT_ZVKG , riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_BUNDLE_VALIDATE (zvkn, riscv_zvkn_bundled_exts, riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_BUNDLE_VALIDATE (zvknc, riscv_zvknc_bundled_exts, riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zvkned,RISCV_ISA_EXT_ZVKNED , riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_BUNDLE_VALIDATE (zvkng, riscv_zvkng_bundled_exts, riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zvknha,RISCV_ISA_EXT_ZVKNHA , riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zvknhb,RISCV_ISA_EXT_ZVKNHB , riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_BUNDLE_VALIDATE (zvks, riscv_zvks_bundled_exts, riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_BUNDLE_VALIDATE (zvksc, riscv_zvksc_bundled_exts, riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zvksed,RISCV_ISA_EXT_ZVKSED , riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zvksh,RISCV_ISA_EXT_ZVKSH , riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_BUNDLE_VALIDATE (zvksg, riscv_zvksg_bundled_exts, riscv_ext_vector_crypto_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (zvkt,RISCV_ISA_EXT_ZVKT , riscv_ext_vector_crypto_validate),__RISCV_ISA_EXT_DATA (smaia,RISCV_ISA_EXT_SMAIA ),__RISCV_ISA_EXT_DATA (smmpm,RISCV_ISA_EXT_SMMPM ), __RISCV_ISA_EXT_SUPERSET(smnpm, RISCV_ISA_EXT_SMNPM, riscv_xlinuxenvcfg_exts),
PATCH v4 3/6 RISC-V: add f & d extension validation checks
In reply to Conor DooleyFrom: Conor Dooley <[email protected]>
Using Clement's new validation callbacks, support checking that dependencies have been satisfied for the floating point extensions.
The check for "d" might be slightly confusingly shorter than that of "f", despite "d" depending on "f". This is because the requirement that a hart supporting double precision must also support single precision, should be validated by dt-bindings etc, not the kernel but lack of support for single precision only is a limitation of the kernel.
Since vector will now be disabled proactively, there's no need to clear the bit in elf_hwcap in riscv_fill_hwcap() any longer.
--- arch/riscv/kernel/cpufeature.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-)
arch/riscv/kernel/cpufeature.c +29 -2
@@ -109,6 +109,33 @@ static int riscv_ext_zicboz_validate(const struct riscv_isa_ext_data *data,return 0 ; } +static int riscv_ext_f_validate (const struct riscv_isa_ext_data *data, +const unsigned long *isa_bitmap) +{ +if (!IS_ENABLED (CONFIG_FPU )) +return -EINVAL ; + +/* +* Due to extension ordering, d is checked before f, so no deferral +* is required. +*/ +if (!__riscv_isa_extension_available (isa_bitmap, RISCV_ISA_EXT_d)) { +pr_warn_once ("This kernel does not support systems with F but not D\n" ); +return -EINVAL ; + } + +return 0 ; +} + +static int riscv_ext_d_validate (const struct riscv_isa_ext_data *data, +const unsigned long *isa_bitmap) +{ +if (!IS_ENABLED (CONFIG_FPU )) +return -EINVAL ; + +return 0 ; +} +static int riscv_ext_vector_x_validate (const struct riscv_isa_ext_data *data,const unsigned long *isa_bitmap) {
@@ -371,8 +398,8 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = {__RISCV_ISA_EXT_DATA (i, RISCV_ISA_EXT_i),__RISCV_ISA_EXT_DATA (m, RISCV_ISA_EXT_m),__RISCV_ISA_EXT_DATA (a, RISCV_ISA_EXT_a), -__RISCV_ISA_EXT_DATA (f, RISCV_ISA_EXT_f), -__RISCV_ISA_EXT_DATA (d, RISCV_ISA_EXT_d), +__RISCV_ISA_EXT_DATA_VALIDATE (f, RISCV_ISA_EXT_f, riscv_ext_f_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (d, RISCV_ISA_EXT_d, riscv_ext_d_validate),__RISCV_ISA_EXT_DATA (q, RISCV_ISA_EXT_q),__RISCV_ISA_EXT_SUPERSET (c, RISCV_ISA_EXT_c, riscv_c_exts), __RISCV_ISA_EXT_SUPERSET_VALIDATE(v, RISCV_ISA_EXT_v, riscv_v_exts, riscv_ext_vector_float_validate),
Signature · 1 line
2.45.2
Re: [PATCH v4 3/6] RISC-V: add f & d extension validation checks
Quoted 5 lines · Conor Dooley
From: Conor Dooley <[email protected]>
Using Clement's new validation callbacks, support checking that dependencies have been satisfied for the floating point extensions.
Quoted 8 lines
The check for "d" might be slightly confusingly shorter than that of "f", despite "d" depending on "f". This is because the requirement that a hart supporting double precision must also support single precision, should be validated by dt-bindings etc, not the kernel but lack of support for single precision only is a limitation of the kernel.
Since vector will now be disabled proactively, there's no need to clear the bit in
elf_hwcapinriscv_fill_hwcap()any longer.
I guess this is a leftover from the split right? No need to respin a new version only for that, I can remove it if you confirm.
Quoted 47 lines
Tested-by Clément Léger <[email protected]>Reviewed-by Clément Léger <[email protected]>Signed-off-by Conor Dooley <[email protected]>--- arch/riscv/kernel/cpufeature.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-)arch/riscv/kernel/cpufeature.c +27
-0@@ -109,6 +109,33 @@ static int riscv_ext_zicboz_validate(const struct riscv_isa_ext_data *data,return 0 ; } +static int riscv_ext_f_validate (const struct riscv_isa_ext_data *data, +const unsigned long *isa_bitmap) +{ +if (!IS_ENABLED (CONFIG_FPU )) +return -EINVAL ; + +/* +* Due to extension ordering, d is checked before f, so no deferral +* is required. +*/ +if (!__riscv_isa_extension_available (isa_bitmap, RISCV_ISA_EXT_d)) { +pr_warn_once ("This kernel does not support systems with F but not D\n" ); +return -EINVAL ; + } + +return 0 ; +} + +static int riscv_ext_d_validate (const struct riscv_isa_ext_data *data, +const unsigned long *isa_bitmap) +{ +if (!IS_ENABLED (CONFIG_FPU )) +return -EINVAL ; + +return 0 ; +} +static int riscv_ext_vector_x_validate (const struct riscv_isa_ext_data *data,const unsigned long *isa_bitmap) {
arch/riscv/kernel/cpufeature.c const struct riscv_isa_ext_data riscv_isa_ext[] = { · line 405
Quoted 10 lines
arch/riscv/kernel/cpufeature.c +2
-2@@ -371,8 +398,8 @@ const struct riscv_isa_ext_data riscv_isa_ext[] = {__RISCV_ISA_EXT_DATA (i, RISCV_ISA_EXT_i),__RISCV_ISA_EXT_DATA (m, RISCV_ISA_EXT_m),__RISCV_ISA_EXT_DATA (a, RISCV_ISA_EXT_a), -__RISCV_ISA_EXT_DATA (f, RISCV_ISA_EXT_f), -__RISCV_ISA_EXT_DATA (d, RISCV_ISA_EXT_d), +__RISCV_ISA_EXT_DATA_VALIDATE (f, RISCV_ISA_EXT_f, riscv_ext_f_validate), +__RISCV_ISA_EXT_DATA_VALIDATE (d, RISCV_ISA_EXT_d, riscv_ext_d_validate),__RISCV_ISA_EXT_DATA (q, RISCV_ISA_EXT_q),__RISCV_ISA_EXT_SUPERSET (c, RISCV_ISA_EXT_c, riscv_c_exts), __RISCV_ISA_EXT_SUPERSET_VALIDATE(v, RISCV_ISA_EXT_v, riscv_v_exts, riscv_ext_vector_float_validate),
Thanks,
Alex
PATCH v4 4/6 dt-bindings: riscv: d requires f
In reply to Conor DooleyFrom: Conor Dooley <[email protected]>
Per the specifications, the d extension for double-precision floating point operations depends on the f extension for single-precision floating point. Add that requirement to the bindings. This differs from the Linux implementation, where single-precious only is not supported.
--- Documentation/devicetree/bindings/riscv/extensions.yaml | 6 ++++++ 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/riscv/extensions.yaml +6 -0
@@ -639,6 +639,12 @@ properties: https://github.com/T-head-Semi/thead-extension-spec/blob/95358cb2cca9489361c61d335e03d3134b14133f/xtheadvector.adoc. allOf: + - if: + contains: + const: d + then: + contains: + const: f # Zcb depends on Zca - if: contains:
Signature · 1 line
2.45.2
PATCH v4 5/6 dt-bindings: riscv: add vector sub-extension dependencies
In reply to Conor DooleyFrom: Conor Dooley <[email protected]>
Section 33.18.2. Zve*: Vector Extensions for Embedded Processors
in [1] says:
| The Zve32f and Zve64x extensions depend on the Zve32x extension. The Zve64f extension depends | on the Zve32f and Zve64x extensions. The Zve64d extension depends on the Zve64f extension
| The Zve32x extension depends on the Zicsr extension. The Zve32f and Zve64f extensions depend | upon the F extension
| The Zve64d extension depends upon the D extension
Apply these rules to the bindings to help prevent invalid combinations.
--- .../devicetree/bindings/riscv/extensions.yaml | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+)
Documentation/devicetree/bindings/riscv/extensions.yaml +46 -0
@@ -680,6 +680,52 @@ properties: contains: const: zca + - if: + contains: + const: zve32x + then: + contains: + const: zicsr + + - if: + contains: + const: zve32f + then: + allOf: + - contains: + const: f + - contains: + const: zve32x + + - if: + contains: + const: zve64x + then: + contains: + const: zve32x + + - if: + contains: + const: zve64f + then: + allOf: + - contains: + const: f + - contains: + const: zve32f + - contains: + const: zve64x + + - if: + contains: + const: zve64d + then: + allOf: + - contains: + const: d + - contains: + const: zve64f + allOf: # Zcf extension does not exist on rv64 - if:
Signature · 1 line
2.45.2
PATCH v4 6/6 dt-bindings: riscv: document vector crypto requirements
In reply to Conor DooleyFrom: Conor Dooley <[email protected]>
The Unpriv spec states:
| The Zvknhb and Zvbc Vector Crypto Extensions --and accordingly the
| composite extensions Zvkn, Zvknc, Zvkng, and Zvksc-- require a Zve64x
| base, or application ("V") base Vector Extension. All of the other
| Vector Crypto Extensions can be built on any embedded (Zve*) or
| application ("V") base Vector Extension.Enforce the minimum requirement via schema.
--- .../devicetree/bindings/riscv/extensions.yaml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+)
Documentation/devicetree/bindings/riscv/extensions.yaml +33 -0
@@ -726,6 +726,39 @@ properties: - contains: const: zve64f + - if: + contains: + anyOf: + - const: zvbc + - const: zvkn + - const: zvknc + - const: zvkng + - const: zvknhb + - const: zvksc + then: + contains: + anyOf: + - const: v + - const: zve64x + + - if: + contains: + anyOf: + - const: zvbb + - const: zvkb + - const: zvkg + - const: zvkned + - const: zvknha + - const: zvksed + - const: zvksh + - const: zvks + - const: zvkt + then: + contains: + anyOf: + - const: v + - const: zve32x + allOf: # Zcf extension does not exist on rv64 - if:
Signature · 1 line
2.45.2
Alexandre Ghiti
reviewerRe: [PATCH v4 6/6] dt-bindings: riscv: document vector crypto requirements
Quoted 52 lines · Conor Dooley
From: Conor Dooley <[email protected]>
The Unpriv spec states:
| The Zvknhb and Zvbc Vector Crypto Extensions --and accordingly the | composite extensions Zvkn, Zvknc, Zvkng, and Zvksc-- require a Zve64x | base, or application ("V") base Vector Extension. All of the other | Vector Crypto Extensions can be built on any embedded (Zve*) or | application ("V") base Vector Extension.Enforce the minimum requirement via schema.
Signed-off-by Conor Dooley <[email protected]>--- .../devicetree/bindings/riscv/extensions.yaml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+)Documentation/devicetree/bindings/riscv/extensions.yaml +26
-0@@ -726,6 +726,39 @@ properties: - contains: const: zve64f + - if: + contains: + anyOf: + - const: zvbc + - const: zvkn + - const: zvknc + - const: zvkng + - const: zvknhb + - const: zvksc + then: + contains: + anyOf: + - const: v + - const: zve64x + + - if: + contains: + anyOf: + - const: zvbb + - const: zvkb + - const: zvkg + - const: zvkned + - const: zvknha + - const: zvksed + - const: zvksh + - const: zvks
Documentation/devicetree/bindings/riscv/extensions.yaml properties: · line 764
Quoted 10 lines
Documentation/devicetree/bindings/riscv/extensions.yaml +7
-0+ - const: zvkt + then: + contains: + anyOf: + - const: v + - const: zve32x + allOf: # Zcf extension does not exist on rv64 - if:
Ok I see now where you enforce the right dependencies, you can ignore my question in patch 2.
Thanks,
Alex
This series was applied to riscv/linux.git (for-next) by Alexandre Ghiti <[email protected]>:
Hello:
This series was applied to riscv/linux.git (for-next) by Alexandre Ghiti <[email protected]>:
Quoted 9 lines · On Wed, 12 Mar 2025 13:11:43 +0000 you wrote:
From: Conor Dooley <[email protected]>
Yo,
This series is partly leveraging Clement's work adding a validate callback in the extension detection code so that things like checking for whether a vector crypto extension is usable can be done like:
has_extension(<vector crypto>)
rather than
Quoted 4 lines
has_vector() && has_extension(<vector crypto>)which Eric pointed out was a poor design some months ago.
[...]
Here is the summary with links:
- [v4,1/6] RISC-V: add vector extension validation checks
https://git.kernel.org/riscv/c/9324571e9eea - [v4,2/6] RISC-V: add vector crypto extension validation checks https://git.kernel.org/riscv/c/38077ec8fc11 - [v4,3/6] RISC-V: add f & d extension validation checks https://git.kernel.org/riscv/c/12e7fbb6a84e - [v4,4/6] dt-bindings: riscv: d requires f https://git.kernel.org/riscv/c/534d813a0620 - [v4,5/6] dt-bindings: riscv: add vector sub-extension dependencies https://git.kernel.org/riscv/c/e9f1d61a5e18 - [v4,6/6] dt-bindings: riscv: document vector crypto requirements https://git.kernel.org/riscv/c/a0d857205756
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html