| Message ID | 20230627143747.1599218-3-sameo@rivosinc.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | RISC-V: archrandom support | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/cover_letter | success | Series has a cover letter |
| conchuod/tree_selection | success | Guessed tree name to be for-next at HEAD 488833ccdcac |
| conchuod/fixes_present | success | Fixes tag not required for -next series |
| conchuod/maintainers_pattern | success | MAINTAINERS pattern errors before the patch: 6 and now 6 |
| conchuod/verify_signedoff | success | Signed-off-by tag matches author and committer |
| conchuod/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| conchuod/build_rv64_clang_allmodconfig | success | Errors and warnings before: 248 this patch: 248 |
| conchuod/module_param | success | Was 0 now: 0 |
| conchuod/build_rv64_gcc_allmodconfig | success | Errors and warnings before: 919 this patch: 919 |
| conchuod/build_rv32_defconfig | success | Build OK |
| conchuod/dtb_warn_rv64 | success | Errors and warnings before: 20 this patch: 20 |
| conchuod/header_inline | success | No static functions without inline keyword in header files |
| conchuod/checkpatch | warning | CHECK: Prefer using the BIT macro |
| conchuod/build_rv64_nommu_k210_defconfig | success | Build OK |
| conchuod/verify_fixes | success | No Fixes tag |
| conchuod/build_rv64_nommu_virt_defconfig | success | Build OK |
On Tue, Jun 27, 2023 at 7:38 AM Samuel Ortiz <sameo@rivosinc.com> wrote: > > Zbc was missing from a previous Bit-Manipulation extension hwprobe > patch. > > Add all scalar crypto extensions bits, and define a macro for setting > the hwprobe key/pair in a more readable way. > > Signed-off-by: Samuel Ortiz <sameo@rivosinc.com> Reviewed-by: Evan Green <evan@rivosinc.com>
On Tue, Jun 27, 2023, at 10:37 AM, Samuel Ortiz wrote: > Zbc was missing from a previous Bit-Manipulation extension hwprobe > patch. > > Add all scalar crypto extensions bits, and define a macro for setting > the hwprobe key/pair in a more readable way. > > Signed-off-by: Samuel Ortiz <sameo@rivosinc.com> > --- > Documentation/riscv/hwprobe.rst | 33 ++++++++++++++++++++++++ > arch/riscv/include/uapi/asm/hwprobe.h | 11 ++++++++ > arch/riscv/kernel/sys_riscv.c | 36 ++++++++++++++++----------- > 3 files changed, 66 insertions(+), 14 deletions(-) > > diff --git a/Documentation/riscv/hwprobe.rst b/Documentation/riscv/hwprobe.rst > index 19165ebd82ba..3177550106e0 100644 > --- a/Documentation/riscv/hwprobe.rst > +++ b/Documentation/riscv/hwprobe.rst > @@ -72,11 +72,44 @@ The following keys are defined: > extensions. > > * :c:macro:`RISCV_HWPROBE_EXT_ZBB`: The Zbb extension is supported, > as defined > + in version 1.0 of the Bit-Manipulation ISA extensions. > + > + * :c:macro:`RISCV_HWPROBE_EXT_ZBC`: The Zbc extension is supported, > as defined > in version 1.0 of the Bit-Manipulation ISA extensions. > > * :c:macro:`RISCV_HWPROBE_EXT_ZBS`: The Zbs extension is supported, > as defined > in version 1.0 of the Bit-Manipulation ISA extensions. > > + * :c:macro:`RISCV_HWPROBE_EXT_ZBKB`: The Zbkb extension is > supported, as defined > + in version 1.0 of the Scalar Cryptography ISA extensions. > + > + * :c:macro:`RISCV_HWPROBE_EXT_ZBKC`: The Zbkc extension is > supported, as defined > + in version 1.0 of the Scalar Cryptography ISA extensions. > + > + * :c:macro:`RISCV_HWPROBE_EXT_ZBKX`: The Zbkx extension is > supported, as defined > + in version 1.0 of the Scalar Cryptography ISA extensions. > + > + * :c:macro:`RISCV_HWPROBE_EXT_ZKND`: The Zknd extension is > supported, as defined > + in version 1.0 of the Scalar Cryptography ISA extensions. > + > + * :c:macro:`RISCV_HWPROBE_EXT_ZKNE`: The Zkne extension is > supported, as defined > + in version 1.0 of the Scalar Cryptography ISA extensions. > + > + * :c:macro:`RISCV_HWPROBE_EXT_ZKNH`: The Zknh extension is > supported, as defined > + in version 1.0 of the Scalar Cryptography ISA extensions. > + > + * :c:macro:`RISCV_HWPROBE_EXT_ZKR`: The Zkr extension is supported, > as defined > + in version 1.0 of the Scalar Cryptography ISA extensions. > + > + * :c:macro:`RISCV_HWPROBE_EXT_ZKSED`: The Zksed extension is > supported, as defined > + in version 1.0 of the Scalar Cryptography ISA extensions. > + > + * :c:macro:`RISCV_HWPROBE_EXT_ZKSH`: The Zksh extension is > supported, as defined > + in version 1.0 of the Scalar Cryptography ISA extensions. > + > + * :c:macro:`RISCV_HWPROBE_EXT_ZKT`: The Zkt extension is supported, > as defined > + in version 1.0 of the Scalar Cryptography ISA extensions. > + > * :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: A bitmask that contains > performance > information about the selected set of processors. > > diff --git a/arch/riscv/include/uapi/asm/hwprobe.h > b/arch/riscv/include/uapi/asm/hwprobe.h > index 006bfb48343d..8357052061b3 100644 > --- a/arch/riscv/include/uapi/asm/hwprobe.h > +++ b/arch/riscv/include/uapi/asm/hwprobe.h > @@ -29,6 +29,17 @@ struct riscv_hwprobe { > #define RISCV_HWPROBE_EXT_ZBA (1 << 3) > #define RISCV_HWPROBE_EXT_ZBB (1 << 4) > #define RISCV_HWPROBE_EXT_ZBS (1 << 5) > +#define RISCV_HWPROBE_EXT_ZBC (1 << 6) > +#define RISCV_HWPROBE_EXT_ZBKB (1 << 7) > +#define RISCV_HWPROBE_EXT_ZBKC (1 << 8) > +#define RISCV_HWPROBE_EXT_ZBKX (1 << 9) > +#define RISCV_HWPROBE_EXT_ZKND (1 << 10) > +#define RISCV_HWPROBE_EXT_ZKNE (1 << 11) > +#define RISCV_HWPROBE_EXT_ZKNH (1 << 12) > +#define RISCV_HWPROBE_EXT_ZKR (1 << 13) > +#define RISCV_HWPROBE_EXT_ZKSED (1 << 14) > +#define RISCV_HWPROBE_EXT_ZKSH (1 << 15) > +#define RISCV_HWPROBE_EXT_ZKT (1 << 16) > #define RISCV_HWPROBE_KEY_CPUPERF_0 5 > #define RISCV_HWPROBE_MISALIGNED_UNKNOWN (0 << 0) > #define RISCV_HWPROBE_MISALIGNED_EMULATED (1 << 0) > diff --git a/arch/riscv/kernel/sys_riscv.c > b/arch/riscv/kernel/sys_riscv.c > index 26ef5526bfb4..df15926196b6 100644 > --- a/arch/riscv/kernel/sys_riscv.c > +++ b/arch/riscv/kernel/sys_riscv.c > @@ -145,20 +145,28 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe > *pair, > for_each_cpu(cpu, cpus) { > struct riscv_isainfo *isainfo = &hart_isa[cpu]; > > - if (riscv_isa_extension_available(isainfo->isa, ZBA)) > - pair->value |= RISCV_HWPROBE_EXT_ZBA; > - else > - missing |= RISCV_HWPROBE_EXT_ZBA; > - > - if (riscv_isa_extension_available(isainfo->isa, ZBB)) > - pair->value |= RISCV_HWPROBE_EXT_ZBB; > - else > - missing |= RISCV_HWPROBE_EXT_ZBB; > - > - if (riscv_isa_extension_available(isainfo->isa, ZBS)) > - pair->value |= RISCV_HWPROBE_EXT_ZBS; > - else > - missing |= RISCV_HWPROBE_EXT_ZBS; > +#define SET_HWPROBE_EXT_PAIR(ext) \ > + do { \ > + if (riscv_isa_extension_available(isainfo->isa, ext)) \ > + pair->value |= RISCV_HWPROBE_EXT_## ext; \ > + else \ > + missing |= RISCV_HWPROBE_EXT_## ext; \ > + } while (false) \ > + > + SET_HWPROBE_EXT_PAIR(ZBA); > + SET_HWPROBE_EXT_PAIR(ZBB); > + SET_HWPROBE_EXT_PAIR(ZBC); > + SET_HWPROBE_EXT_PAIR(ZBS); > + SET_HWPROBE_EXT_PAIR(ZBKB); > + SET_HWPROBE_EXT_PAIR(ZBKC); > + SET_HWPROBE_EXT_PAIR(ZBKX); > + SET_HWPROBE_EXT_PAIR(ZKND); > + SET_HWPROBE_EXT_PAIR(ZKNE); > + SET_HWPROBE_EXT_PAIR(ZKNH); > + SET_HWPROBE_EXT_PAIR(ZKR); Does the presence of a HWPROBE_EXT bit imply that userspace software can actually directly use the described feature? If so, we should probably not set ZKR unless mseccfg.USEED=1. -s > + SET_HWPROBE_EXT_PAIR(ZKSED); > + SET_HWPROBE_EXT_PAIR(ZKSH); > + SET_HWPROBE_EXT_PAIR(ZKT); > } > > /* Now turn off reporting features if any CPU is missing it. */ > -- > 2.41.0 > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv
On Tue, Jun 27, 2023 at 08:34:20PM -0400, Stefan O'Rear wrote: > On Tue, Jun 27, 2023, at 10:37 AM, Samuel Ortiz wrote: > > Zbc was missing from a previous Bit-Manipulation extension hwprobe > > patch. > > > > Add all scalar crypto extensions bits, and define a macro for setting > > the hwprobe key/pair in a more readable way. > > > > Signed-off-by: Samuel Ortiz <sameo@rivosinc.com> > > --- > > Documentation/riscv/hwprobe.rst | 33 ++++++++++++++++++++++++ > > arch/riscv/include/uapi/asm/hwprobe.h | 11 ++++++++ > > arch/riscv/kernel/sys_riscv.c | 36 ++++++++++++++++----------- > > 3 files changed, 66 insertions(+), 14 deletions(-) > > > > diff --git a/Documentation/riscv/hwprobe.rst b/Documentation/riscv/hwprobe.rst > > index 19165ebd82ba..3177550106e0 100644 > > --- a/Documentation/riscv/hwprobe.rst > > +++ b/Documentation/riscv/hwprobe.rst > > @@ -72,11 +72,44 @@ The following keys are defined: > > extensions. > > > > * :c:macro:`RISCV_HWPROBE_EXT_ZBB`: The Zbb extension is supported, > > as defined > > + in version 1.0 of the Bit-Manipulation ISA extensions. > > + > > + * :c:macro:`RISCV_HWPROBE_EXT_ZBC`: The Zbc extension is supported, > > as defined > > in version 1.0 of the Bit-Manipulation ISA extensions. > > > > * :c:macro:`RISCV_HWPROBE_EXT_ZBS`: The Zbs extension is supported, > > as defined > > in version 1.0 of the Bit-Manipulation ISA extensions. > > > > + * :c:macro:`RISCV_HWPROBE_EXT_ZBKB`: The Zbkb extension is > > supported, as defined > > + in version 1.0 of the Scalar Cryptography ISA extensions. > > + > > + * :c:macro:`RISCV_HWPROBE_EXT_ZBKC`: The Zbkc extension is > > supported, as defined > > + in version 1.0 of the Scalar Cryptography ISA extensions. > > + > > + * :c:macro:`RISCV_HWPROBE_EXT_ZBKX`: The Zbkx extension is > > supported, as defined > > + in version 1.0 of the Scalar Cryptography ISA extensions. > > + > > + * :c:macro:`RISCV_HWPROBE_EXT_ZKND`: The Zknd extension is > > supported, as defined > > + in version 1.0 of the Scalar Cryptography ISA extensions. > > + > > + * :c:macro:`RISCV_HWPROBE_EXT_ZKNE`: The Zkne extension is > > supported, as defined > > + in version 1.0 of the Scalar Cryptography ISA extensions. > > + > > + * :c:macro:`RISCV_HWPROBE_EXT_ZKNH`: The Zknh extension is > > supported, as defined > > + in version 1.0 of the Scalar Cryptography ISA extensions. > > + > > + * :c:macro:`RISCV_HWPROBE_EXT_ZKR`: The Zkr extension is supported, > > as defined > > + in version 1.0 of the Scalar Cryptography ISA extensions. > > + > > + * :c:macro:`RISCV_HWPROBE_EXT_ZKSED`: The Zksed extension is > > supported, as defined > > + in version 1.0 of the Scalar Cryptography ISA extensions. > > + > > + * :c:macro:`RISCV_HWPROBE_EXT_ZKSH`: The Zksh extension is > > supported, as defined > > + in version 1.0 of the Scalar Cryptography ISA extensions. > > + > > + * :c:macro:`RISCV_HWPROBE_EXT_ZKT`: The Zkt extension is supported, > > as defined > > + in version 1.0 of the Scalar Cryptography ISA extensions. > > + > > * :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: A bitmask that contains > > performance > > information about the selected set of processors. > > > > diff --git a/arch/riscv/include/uapi/asm/hwprobe.h > > b/arch/riscv/include/uapi/asm/hwprobe.h > > index 006bfb48343d..8357052061b3 100644 > > --- a/arch/riscv/include/uapi/asm/hwprobe.h > > +++ b/arch/riscv/include/uapi/asm/hwprobe.h > > @@ -29,6 +29,17 @@ struct riscv_hwprobe { > > #define RISCV_HWPROBE_EXT_ZBA (1 << 3) > > #define RISCV_HWPROBE_EXT_ZBB (1 << 4) > > #define RISCV_HWPROBE_EXT_ZBS (1 << 5) > > +#define RISCV_HWPROBE_EXT_ZBC (1 << 6) > > +#define RISCV_HWPROBE_EXT_ZBKB (1 << 7) > > +#define RISCV_HWPROBE_EXT_ZBKC (1 << 8) > > +#define RISCV_HWPROBE_EXT_ZBKX (1 << 9) > > +#define RISCV_HWPROBE_EXT_ZKND (1 << 10) > > +#define RISCV_HWPROBE_EXT_ZKNE (1 << 11) > > +#define RISCV_HWPROBE_EXT_ZKNH (1 << 12) > > +#define RISCV_HWPROBE_EXT_ZKR (1 << 13) > > +#define RISCV_HWPROBE_EXT_ZKSED (1 << 14) > > +#define RISCV_HWPROBE_EXT_ZKSH (1 << 15) > > +#define RISCV_HWPROBE_EXT_ZKT (1 << 16) > > #define RISCV_HWPROBE_KEY_CPUPERF_0 5 > > #define RISCV_HWPROBE_MISALIGNED_UNKNOWN (0 << 0) > > #define RISCV_HWPROBE_MISALIGNED_EMULATED (1 << 0) > > diff --git a/arch/riscv/kernel/sys_riscv.c > > b/arch/riscv/kernel/sys_riscv.c > > index 26ef5526bfb4..df15926196b6 100644 > > --- a/arch/riscv/kernel/sys_riscv.c > > +++ b/arch/riscv/kernel/sys_riscv.c > > @@ -145,20 +145,28 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe > > *pair, > > for_each_cpu(cpu, cpus) { > > struct riscv_isainfo *isainfo = &hart_isa[cpu]; > > > > - if (riscv_isa_extension_available(isainfo->isa, ZBA)) > > - pair->value |= RISCV_HWPROBE_EXT_ZBA; > > - else > > - missing |= RISCV_HWPROBE_EXT_ZBA; > > - > > - if (riscv_isa_extension_available(isainfo->isa, ZBB)) > > - pair->value |= RISCV_HWPROBE_EXT_ZBB; > > - else > > - missing |= RISCV_HWPROBE_EXT_ZBB; > > - > > - if (riscv_isa_extension_available(isainfo->isa, ZBS)) > > - pair->value |= RISCV_HWPROBE_EXT_ZBS; > > - else > > - missing |= RISCV_HWPROBE_EXT_ZBS; > > +#define SET_HWPROBE_EXT_PAIR(ext) \ > > + do { \ > > + if (riscv_isa_extension_available(isainfo->isa, ext)) \ > > + pair->value |= RISCV_HWPROBE_EXT_## ext; \ > > + else \ > > + missing |= RISCV_HWPROBE_EXT_## ext; \ > > + } while (false) \ > > + > > + SET_HWPROBE_EXT_PAIR(ZBA); > > + SET_HWPROBE_EXT_PAIR(ZBB); > > + SET_HWPROBE_EXT_PAIR(ZBC); > > + SET_HWPROBE_EXT_PAIR(ZBS); > > + SET_HWPROBE_EXT_PAIR(ZBKB); > > + SET_HWPROBE_EXT_PAIR(ZBKC); > > + SET_HWPROBE_EXT_PAIR(ZBKX); > > + SET_HWPROBE_EXT_PAIR(ZKND); > > + SET_HWPROBE_EXT_PAIR(ZKNE); > > + SET_HWPROBE_EXT_PAIR(ZKNH); > > + SET_HWPROBE_EXT_PAIR(ZKR); > > Does the presence of a HWPROBE_EXT bit imply that userspace software can > actually directly use the described feature? If so, we should probably > not set ZKR unless mseccfg.USEED=1. mseccfg is MRW, so only accessible from M-mode only afaiu. So I don't think we would be able to check that from Linux in S-mode. Cheers, Samuel.
On Wed, Jun 28, 2023, at 6:04 AM, Samuel Ortiz wrote: > On Tue, Jun 27, 2023 at 08:34:20PM -0400, Stefan O'Rear wrote: >> On Tue, Jun 27, 2023, at 10:37 AM, Samuel Ortiz wrote: >> > Zbc was missing from a previous Bit-Manipulation extension hwprobe >> > patch. >> > >> > Add all scalar crypto extensions bits, and define a macro for setting >> > the hwprobe key/pair in a more readable way. >> > >> > Signed-off-by: Samuel Ortiz <sameo@rivosinc.com> >> > --- >> > Documentation/riscv/hwprobe.rst | 33 ++++++++++++++++++++++++ >> > arch/riscv/include/uapi/asm/hwprobe.h | 11 ++++++++ >> > arch/riscv/kernel/sys_riscv.c | 36 ++++++++++++++++----------- >> > 3 files changed, 66 insertions(+), 14 deletions(-) >> > >> > diff --git a/Documentation/riscv/hwprobe.rst b/Documentation/riscv/hwprobe.rst >> > index 19165ebd82ba..3177550106e0 100644 >> > --- a/Documentation/riscv/hwprobe.rst >> > +++ b/Documentation/riscv/hwprobe.rst >> > @@ -72,11 +72,44 @@ The following keys are defined: >> > extensions. >> > >> > * :c:macro:`RISCV_HWPROBE_EXT_ZBB`: The Zbb extension is supported, >> > as defined >> > + in version 1.0 of the Bit-Manipulation ISA extensions. >> > + >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZBC`: The Zbc extension is supported, >> > as defined >> > in version 1.0 of the Bit-Manipulation ISA extensions. >> > >> > * :c:macro:`RISCV_HWPROBE_EXT_ZBS`: The Zbs extension is supported, >> > as defined >> > in version 1.0 of the Bit-Manipulation ISA extensions. >> > >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZBKB`: The Zbkb extension is >> > supported, as defined >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> > + >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZBKC`: The Zbkc extension is >> > supported, as defined >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> > + >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZBKX`: The Zbkx extension is >> > supported, as defined >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> > + >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKND`: The Zknd extension is >> > supported, as defined >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> > + >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKNE`: The Zkne extension is >> > supported, as defined >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> > + >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKNH`: The Zknh extension is >> > supported, as defined >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> > + >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKR`: The Zkr extension is supported, >> > as defined >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> > + >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKSED`: The Zksed extension is >> > supported, as defined >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> > + >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKSH`: The Zksh extension is >> > supported, as defined >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> > + >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKT`: The Zkt extension is supported, >> > as defined >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> > + >> > * :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: A bitmask that contains >> > performance >> > information about the selected set of processors. >> > >> > diff --git a/arch/riscv/include/uapi/asm/hwprobe.h >> > b/arch/riscv/include/uapi/asm/hwprobe.h >> > index 006bfb48343d..8357052061b3 100644 >> > --- a/arch/riscv/include/uapi/asm/hwprobe.h >> > +++ b/arch/riscv/include/uapi/asm/hwprobe.h >> > @@ -29,6 +29,17 @@ struct riscv_hwprobe { >> > #define RISCV_HWPROBE_EXT_ZBA (1 << 3) >> > #define RISCV_HWPROBE_EXT_ZBB (1 << 4) >> > #define RISCV_HWPROBE_EXT_ZBS (1 << 5) >> > +#define RISCV_HWPROBE_EXT_ZBC (1 << 6) >> > +#define RISCV_HWPROBE_EXT_ZBKB (1 << 7) >> > +#define RISCV_HWPROBE_EXT_ZBKC (1 << 8) >> > +#define RISCV_HWPROBE_EXT_ZBKX (1 << 9) >> > +#define RISCV_HWPROBE_EXT_ZKND (1 << 10) >> > +#define RISCV_HWPROBE_EXT_ZKNE (1 << 11) >> > +#define RISCV_HWPROBE_EXT_ZKNH (1 << 12) >> > +#define RISCV_HWPROBE_EXT_ZKR (1 << 13) >> > +#define RISCV_HWPROBE_EXT_ZKSED (1 << 14) >> > +#define RISCV_HWPROBE_EXT_ZKSH (1 << 15) >> > +#define RISCV_HWPROBE_EXT_ZKT (1 << 16) >> > #define RISCV_HWPROBE_KEY_CPUPERF_0 5 >> > #define RISCV_HWPROBE_MISALIGNED_UNKNOWN (0 << 0) >> > #define RISCV_HWPROBE_MISALIGNED_EMULATED (1 << 0) >> > diff --git a/arch/riscv/kernel/sys_riscv.c >> > b/arch/riscv/kernel/sys_riscv.c >> > index 26ef5526bfb4..df15926196b6 100644 >> > --- a/arch/riscv/kernel/sys_riscv.c >> > +++ b/arch/riscv/kernel/sys_riscv.c >> > @@ -145,20 +145,28 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe >> > *pair, >> > for_each_cpu(cpu, cpus) { >> > struct riscv_isainfo *isainfo = &hart_isa[cpu]; >> > >> > - if (riscv_isa_extension_available(isainfo->isa, ZBA)) >> > - pair->value |= RISCV_HWPROBE_EXT_ZBA; >> > - else >> > - missing |= RISCV_HWPROBE_EXT_ZBA; >> > - >> > - if (riscv_isa_extension_available(isainfo->isa, ZBB)) >> > - pair->value |= RISCV_HWPROBE_EXT_ZBB; >> > - else >> > - missing |= RISCV_HWPROBE_EXT_ZBB; >> > - >> > - if (riscv_isa_extension_available(isainfo->isa, ZBS)) >> > - pair->value |= RISCV_HWPROBE_EXT_ZBS; >> > - else >> > - missing |= RISCV_HWPROBE_EXT_ZBS; >> > +#define SET_HWPROBE_EXT_PAIR(ext) \ >> > + do { \ >> > + if (riscv_isa_extension_available(isainfo->isa, ext)) \ >> > + pair->value |= RISCV_HWPROBE_EXT_## ext; \ >> > + else \ >> > + missing |= RISCV_HWPROBE_EXT_## ext; \ >> > + } while (false) \ >> > + >> > + SET_HWPROBE_EXT_PAIR(ZBA); >> > + SET_HWPROBE_EXT_PAIR(ZBB); >> > + SET_HWPROBE_EXT_PAIR(ZBC); >> > + SET_HWPROBE_EXT_PAIR(ZBS); >> > + SET_HWPROBE_EXT_PAIR(ZBKB); >> > + SET_HWPROBE_EXT_PAIR(ZBKC); >> > + SET_HWPROBE_EXT_PAIR(ZBKX); >> > + SET_HWPROBE_EXT_PAIR(ZKND); >> > + SET_HWPROBE_EXT_PAIR(ZKNE); >> > + SET_HWPROBE_EXT_PAIR(ZKNH); >> > + SET_HWPROBE_EXT_PAIR(ZKR); >> >> Does the presence of a HWPROBE_EXT bit imply that userspace software can >> actually directly use the described feature? If so, we should probably >> not set ZKR unless mseccfg.USEED=1. > > mseccfg is MRW, so only accessible from M-mode only afaiu. So I don't > think we would be able to check that from Linux in S-mode. Check directly, no, but your patch already makes the assumption that mseccfg.SSEED=1 if zkr is present in the device tree. Which is fine as long as that contract is documented somewhere (presumably, the device tree binding; some of the language in the RVA22U64 profile spec implies USEED=0, but linux does not require profiles and they don't exist for rv32). If we want U-mode behavior to be discoverable and/or predictable, we have three good options: Simplest: Document that we expect USEED=0 or USEED=1. Set zkr appropriately in hwprobe. Most flexible: Work with the SBI people to add a SBI_EXT_FWFEATURE for USEED, as well as defining the value on kernel entry. Expose this via hwprobe and a new prctl. Most robust: Add an illegal instruction handler for CSR_SEED that grabs 16 bits from the kernel entropy pool. Expose zkr in hwprobe unconditionally. -s > Cheers, > Samuel.
On Wed, Jun 28, 2023 at 09:25:02AM -0400, Stefan O'Rear wrote: > On Wed, Jun 28, 2023, at 6:04 AM, Samuel Ortiz wrote: > > On Tue, Jun 27, 2023 at 08:34:20PM -0400, Stefan O'Rear wrote: > >> On Tue, Jun 27, 2023, at 10:37 AM, Samuel Ortiz wrote: > >> > Zbc was missing from a previous Bit-Manipulation extension hwprobe > >> > patch. > >> > > >> > Add all scalar crypto extensions bits, and define a macro for setting > >> > the hwprobe key/pair in a more readable way. > >> > > >> > Signed-off-by: Samuel Ortiz <sameo@rivosinc.com> > >> > --- > >> > Documentation/riscv/hwprobe.rst | 33 ++++++++++++++++++++++++ > >> > arch/riscv/include/uapi/asm/hwprobe.h | 11 ++++++++ > >> > arch/riscv/kernel/sys_riscv.c | 36 ++++++++++++++++----------- > >> > 3 files changed, 66 insertions(+), 14 deletions(-) > >> > > >> > diff --git a/Documentation/riscv/hwprobe.rst b/Documentation/riscv/hwprobe.rst > >> > index 19165ebd82ba..3177550106e0 100644 > >> > --- a/Documentation/riscv/hwprobe.rst > >> > +++ b/Documentation/riscv/hwprobe.rst > >> > @@ -72,11 +72,44 @@ The following keys are defined: > >> > extensions. > >> > > >> > * :c:macro:`RISCV_HWPROBE_EXT_ZBB`: The Zbb extension is supported, > >> > as defined > >> > + in version 1.0 of the Bit-Manipulation ISA extensions. > >> > + > >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZBC`: The Zbc extension is supported, > >> > as defined > >> > in version 1.0 of the Bit-Manipulation ISA extensions. > >> > > >> > * :c:macro:`RISCV_HWPROBE_EXT_ZBS`: The Zbs extension is supported, > >> > as defined > >> > in version 1.0 of the Bit-Manipulation ISA extensions. > >> > > >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZBKB`: The Zbkb extension is > >> > supported, as defined > >> > + in version 1.0 of the Scalar Cryptography ISA extensions. > >> > + > >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZBKC`: The Zbkc extension is > >> > supported, as defined > >> > + in version 1.0 of the Scalar Cryptography ISA extensions. > >> > + > >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZBKX`: The Zbkx extension is > >> > supported, as defined > >> > + in version 1.0 of the Scalar Cryptography ISA extensions. > >> > + > >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKND`: The Zknd extension is > >> > supported, as defined > >> > + in version 1.0 of the Scalar Cryptography ISA extensions. > >> > + > >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKNE`: The Zkne extension is > >> > supported, as defined > >> > + in version 1.0 of the Scalar Cryptography ISA extensions. > >> > + > >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKNH`: The Zknh extension is > >> > supported, as defined > >> > + in version 1.0 of the Scalar Cryptography ISA extensions. > >> > + > >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKR`: The Zkr extension is supported, > >> > as defined > >> > + in version 1.0 of the Scalar Cryptography ISA extensions. > >> > + > >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKSED`: The Zksed extension is > >> > supported, as defined > >> > + in version 1.0 of the Scalar Cryptography ISA extensions. > >> > + > >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKSH`: The Zksh extension is > >> > supported, as defined > >> > + in version 1.0 of the Scalar Cryptography ISA extensions. > >> > + > >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKT`: The Zkt extension is supported, > >> > as defined > >> > + in version 1.0 of the Scalar Cryptography ISA extensions. > >> > + > >> > * :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: A bitmask that contains > >> > performance > >> > information about the selected set of processors. > >> > > >> > diff --git a/arch/riscv/include/uapi/asm/hwprobe.h > >> > b/arch/riscv/include/uapi/asm/hwprobe.h > >> > index 006bfb48343d..8357052061b3 100644 > >> > --- a/arch/riscv/include/uapi/asm/hwprobe.h > >> > +++ b/arch/riscv/include/uapi/asm/hwprobe.h > >> > @@ -29,6 +29,17 @@ struct riscv_hwprobe { > >> > #define RISCV_HWPROBE_EXT_ZBA (1 << 3) > >> > #define RISCV_HWPROBE_EXT_ZBB (1 << 4) > >> > #define RISCV_HWPROBE_EXT_ZBS (1 << 5) > >> > +#define RISCV_HWPROBE_EXT_ZBC (1 << 6) > >> > +#define RISCV_HWPROBE_EXT_ZBKB (1 << 7) > >> > +#define RISCV_HWPROBE_EXT_ZBKC (1 << 8) > >> > +#define RISCV_HWPROBE_EXT_ZBKX (1 << 9) > >> > +#define RISCV_HWPROBE_EXT_ZKND (1 << 10) > >> > +#define RISCV_HWPROBE_EXT_ZKNE (1 << 11) > >> > +#define RISCV_HWPROBE_EXT_ZKNH (1 << 12) > >> > +#define RISCV_HWPROBE_EXT_ZKR (1 << 13) > >> > +#define RISCV_HWPROBE_EXT_ZKSED (1 << 14) > >> > +#define RISCV_HWPROBE_EXT_ZKSH (1 << 15) > >> > +#define RISCV_HWPROBE_EXT_ZKT (1 << 16) > >> > #define RISCV_HWPROBE_KEY_CPUPERF_0 5 > >> > #define RISCV_HWPROBE_MISALIGNED_UNKNOWN (0 << 0) > >> > #define RISCV_HWPROBE_MISALIGNED_EMULATED (1 << 0) > >> > diff --git a/arch/riscv/kernel/sys_riscv.c > >> > b/arch/riscv/kernel/sys_riscv.c > >> > index 26ef5526bfb4..df15926196b6 100644 > >> > --- a/arch/riscv/kernel/sys_riscv.c > >> > +++ b/arch/riscv/kernel/sys_riscv.c > >> > @@ -145,20 +145,28 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe > >> > *pair, > >> > for_each_cpu(cpu, cpus) { > >> > struct riscv_isainfo *isainfo = &hart_isa[cpu]; > >> > > >> > - if (riscv_isa_extension_available(isainfo->isa, ZBA)) > >> > - pair->value |= RISCV_HWPROBE_EXT_ZBA; > >> > - else > >> > - missing |= RISCV_HWPROBE_EXT_ZBA; > >> > - > >> > - if (riscv_isa_extension_available(isainfo->isa, ZBB)) > >> > - pair->value |= RISCV_HWPROBE_EXT_ZBB; > >> > - else > >> > - missing |= RISCV_HWPROBE_EXT_ZBB; > >> > - > >> > - if (riscv_isa_extension_available(isainfo->isa, ZBS)) > >> > - pair->value |= RISCV_HWPROBE_EXT_ZBS; > >> > - else > >> > - missing |= RISCV_HWPROBE_EXT_ZBS; > >> > +#define SET_HWPROBE_EXT_PAIR(ext) \ > >> > + do { \ > >> > + if (riscv_isa_extension_available(isainfo->isa, ext)) \ > >> > + pair->value |= RISCV_HWPROBE_EXT_## ext; \ > >> > + else \ > >> > + missing |= RISCV_HWPROBE_EXT_## ext; \ > >> > + } while (false) \ > >> > + > >> > + SET_HWPROBE_EXT_PAIR(ZBA); > >> > + SET_HWPROBE_EXT_PAIR(ZBB); > >> > + SET_HWPROBE_EXT_PAIR(ZBC); > >> > + SET_HWPROBE_EXT_PAIR(ZBS); > >> > + SET_HWPROBE_EXT_PAIR(ZBKB); > >> > + SET_HWPROBE_EXT_PAIR(ZBKC); > >> > + SET_HWPROBE_EXT_PAIR(ZBKX); > >> > + SET_HWPROBE_EXT_PAIR(ZKND); > >> > + SET_HWPROBE_EXT_PAIR(ZKNE); > >> > + SET_HWPROBE_EXT_PAIR(ZKNH); > >> > + SET_HWPROBE_EXT_PAIR(ZKR); > >> > >> Does the presence of a HWPROBE_EXT bit imply that userspace software can > >> actually directly use the described feature? If so, we should probably > >> not set ZKR unless mseccfg.USEED=1. > > > > mseccfg is MRW, so only accessible from M-mode only afaiu. So I don't > > think we would be able to check that from Linux in S-mode. > > Check directly, no, but your patch already makes the assumption that > mseccfg.SSEED=1 if zkr is present in the device tree. Which is fine as long > as that contract is documented somewhere (presumably, the device tree > binding; some of the language in the RVA22U64 profile spec implies USEED=0, > but linux does not require profiles and they don't exist for rv32). > > If we want U-mode behavior to be discoverable and/or predictable, we have > three good options: Thanks for the suggestions. > Simplest: Document that we expect USEED=0 or USEED=1. Set zkr appropriately > in hwprobe. > > Most flexible: Work with the SBI people to add a SBI_EXT_FWFEATURE for USEED, > as well as defining the value on kernel entry. Expose this via hwprobe and > a new prctl. I'd like to go down that route, but this depends on [1] to get accepted/merged first. Would it make sense to go with only documenting the USEED expectation for now and then move to the more flexible FWFEATURE SBI approach? Cheers, Samuel. [1] https://lists.riscv.org/g/tech-prs/message/540
On Mon, Jul 10, 2023, at 3:59 AM, Samuel Ortiz wrote: > On Wed, Jun 28, 2023 at 09:25:02AM -0400, Stefan O'Rear wrote: >> On Wed, Jun 28, 2023, at 6:04 AM, Samuel Ortiz wrote: >> > On Tue, Jun 27, 2023 at 08:34:20PM -0400, Stefan O'Rear wrote: >> >> On Tue, Jun 27, 2023, at 10:37 AM, Samuel Ortiz wrote: >> >> > Zbc was missing from a previous Bit-Manipulation extension hwprobe >> >> > patch. >> >> > >> >> > Add all scalar crypto extensions bits, and define a macro for setting >> >> > the hwprobe key/pair in a more readable way. >> >> > >> >> > Signed-off-by: Samuel Ortiz <sameo@rivosinc.com> >> >> > --- >> >> > Documentation/riscv/hwprobe.rst | 33 ++++++++++++++++++++++++ >> >> > arch/riscv/include/uapi/asm/hwprobe.h | 11 ++++++++ >> >> > arch/riscv/kernel/sys_riscv.c | 36 ++++++++++++++++----------- >> >> > 3 files changed, 66 insertions(+), 14 deletions(-) >> >> > >> >> > diff --git a/Documentation/riscv/hwprobe.rst b/Documentation/riscv/hwprobe.rst >> >> > index 19165ebd82ba..3177550106e0 100644 >> >> > --- a/Documentation/riscv/hwprobe.rst >> >> > +++ b/Documentation/riscv/hwprobe.rst >> >> > @@ -72,11 +72,44 @@ The following keys are defined: >> >> > extensions. >> >> > >> >> > * :c:macro:`RISCV_HWPROBE_EXT_ZBB`: The Zbb extension is supported, >> >> > as defined >> >> > + in version 1.0 of the Bit-Manipulation ISA extensions. >> >> > + >> >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZBC`: The Zbc extension is supported, >> >> > as defined >> >> > in version 1.0 of the Bit-Manipulation ISA extensions. >> >> > >> >> > * :c:macro:`RISCV_HWPROBE_EXT_ZBS`: The Zbs extension is supported, >> >> > as defined >> >> > in version 1.0 of the Bit-Manipulation ISA extensions. >> >> > >> >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZBKB`: The Zbkb extension is >> >> > supported, as defined >> >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> >> > + >> >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZBKC`: The Zbkc extension is >> >> > supported, as defined >> >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> >> > + >> >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZBKX`: The Zbkx extension is >> >> > supported, as defined >> >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> >> > + >> >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKND`: The Zknd extension is >> >> > supported, as defined >> >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> >> > + >> >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKNE`: The Zkne extension is >> >> > supported, as defined >> >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> >> > + >> >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKNH`: The Zknh extension is >> >> > supported, as defined >> >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> >> > + >> >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKR`: The Zkr extension is supported, >> >> > as defined >> >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> >> > + >> >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKSED`: The Zksed extension is >> >> > supported, as defined >> >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> >> > + >> >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKSH`: The Zksh extension is >> >> > supported, as defined >> >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> >> > + >> >> > + * :c:macro:`RISCV_HWPROBE_EXT_ZKT`: The Zkt extension is supported, >> >> > as defined >> >> > + in version 1.0 of the Scalar Cryptography ISA extensions. >> >> > + >> >> > * :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: A bitmask that contains >> >> > performance >> >> > information about the selected set of processors. >> >> > >> >> > diff --git a/arch/riscv/include/uapi/asm/hwprobe.h >> >> > b/arch/riscv/include/uapi/asm/hwprobe.h >> >> > index 006bfb48343d..8357052061b3 100644 >> >> > --- a/arch/riscv/include/uapi/asm/hwprobe.h >> >> > +++ b/arch/riscv/include/uapi/asm/hwprobe.h >> >> > @@ -29,6 +29,17 @@ struct riscv_hwprobe { >> >> > #define RISCV_HWPROBE_EXT_ZBA (1 << 3) >> >> > #define RISCV_HWPROBE_EXT_ZBB (1 << 4) >> >> > #define RISCV_HWPROBE_EXT_ZBS (1 << 5) >> >> > +#define RISCV_HWPROBE_EXT_ZBC (1 << 6) >> >> > +#define RISCV_HWPROBE_EXT_ZBKB (1 << 7) >> >> > +#define RISCV_HWPROBE_EXT_ZBKC (1 << 8) >> >> > +#define RISCV_HWPROBE_EXT_ZBKX (1 << 9) >> >> > +#define RISCV_HWPROBE_EXT_ZKND (1 << 10) >> >> > +#define RISCV_HWPROBE_EXT_ZKNE (1 << 11) >> >> > +#define RISCV_HWPROBE_EXT_ZKNH (1 << 12) >> >> > +#define RISCV_HWPROBE_EXT_ZKR (1 << 13) >> >> > +#define RISCV_HWPROBE_EXT_ZKSED (1 << 14) >> >> > +#define RISCV_HWPROBE_EXT_ZKSH (1 << 15) >> >> > +#define RISCV_HWPROBE_EXT_ZKT (1 << 16) >> >> > #define RISCV_HWPROBE_KEY_CPUPERF_0 5 >> >> > #define RISCV_HWPROBE_MISALIGNED_UNKNOWN (0 << 0) >> >> > #define RISCV_HWPROBE_MISALIGNED_EMULATED (1 << 0) >> >> > diff --git a/arch/riscv/kernel/sys_riscv.c >> >> > b/arch/riscv/kernel/sys_riscv.c >> >> > index 26ef5526bfb4..df15926196b6 100644 >> >> > --- a/arch/riscv/kernel/sys_riscv.c >> >> > +++ b/arch/riscv/kernel/sys_riscv.c >> >> > @@ -145,20 +145,28 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe >> >> > *pair, >> >> > for_each_cpu(cpu, cpus) { >> >> > struct riscv_isainfo *isainfo = &hart_isa[cpu]; >> >> > >> >> > - if (riscv_isa_extension_available(isainfo->isa, ZBA)) >> >> > - pair->value |= RISCV_HWPROBE_EXT_ZBA; >> >> > - else >> >> > - missing |= RISCV_HWPROBE_EXT_ZBA; >> >> > - >> >> > - if (riscv_isa_extension_available(isainfo->isa, ZBB)) >> >> > - pair->value |= RISCV_HWPROBE_EXT_ZBB; >> >> > - else >> >> > - missing |= RISCV_HWPROBE_EXT_ZBB; >> >> > - >> >> > - if (riscv_isa_extension_available(isainfo->isa, ZBS)) >> >> > - pair->value |= RISCV_HWPROBE_EXT_ZBS; >> >> > - else >> >> > - missing |= RISCV_HWPROBE_EXT_ZBS; >> >> > +#define SET_HWPROBE_EXT_PAIR(ext) \ >> >> > + do { \ >> >> > + if (riscv_isa_extension_available(isainfo->isa, ext)) \ >> >> > + pair->value |= RISCV_HWPROBE_EXT_## ext; \ >> >> > + else \ >> >> > + missing |= RISCV_HWPROBE_EXT_## ext; \ >> >> > + } while (false) \ >> >> > + >> >> > + SET_HWPROBE_EXT_PAIR(ZBA); >> >> > + SET_HWPROBE_EXT_PAIR(ZBB); >> >> > + SET_HWPROBE_EXT_PAIR(ZBC); >> >> > + SET_HWPROBE_EXT_PAIR(ZBS); >> >> > + SET_HWPROBE_EXT_PAIR(ZBKB); >> >> > + SET_HWPROBE_EXT_PAIR(ZBKC); >> >> > + SET_HWPROBE_EXT_PAIR(ZBKX); >> >> > + SET_HWPROBE_EXT_PAIR(ZKND); >> >> > + SET_HWPROBE_EXT_PAIR(ZKNE); >> >> > + SET_HWPROBE_EXT_PAIR(ZKNH); >> >> > + SET_HWPROBE_EXT_PAIR(ZKR); >> >> >> >> Does the presence of a HWPROBE_EXT bit imply that userspace software can >> >> actually directly use the described feature? If so, we should probably >> >> not set ZKR unless mseccfg.USEED=1. >> > >> > mseccfg is MRW, so only accessible from M-mode only afaiu. So I don't >> > think we would be able to check that from Linux in S-mode. >> >> Check directly, no, but your patch already makes the assumption that >> mseccfg.SSEED=1 if zkr is present in the device tree. Which is fine as long >> as that contract is documented somewhere (presumably, the device tree >> binding; some of the language in the RVA22U64 profile spec implies USEED=0, >> but linux does not require profiles and they don't exist for rv32). >> >> If we want U-mode behavior to be discoverable and/or predictable, we have >> three good options: > > Thanks for the suggestions. > >> Simplest: Document that we expect USEED=0 or USEED=1. Set zkr appropriately >> in hwprobe. >> >> Most flexible: Work with the SBI people to add a SBI_EXT_FWFEATURE for USEED, >> as well as defining the value on kernel entry. Expose this via hwprobe and >> a new prctl. > > I'd like to go down that route, but this depends on [1] to get > accepted/merged first. > > Would it make sense to go with only documenting the USEED expectation > for now and then move to the more flexible FWFEATURE SBI approach? Yes. I would start with an assumption that SSEED=1 (so that we can use it at all), USEED=0 (because many systems will want to prevent unprivileged access to raw hardware randomness, so we don't want the uABI to guarantee accessibility of seed until a mechanism has been defined to communicate USEED to userspace), and there is no nonstandard extension on the FWFT extension ID or nonstandard use of reserved feature space (so we can probe for the USEED feature to become available; this can be tightened once a specific feature ID is allocated for USEED). I assumed earlier in the thread that we would communicate USEED to userspace by conditionally setting the RISCV_HWPROBE_EXT_ZKR flag. This was an error on my part as I assumed hwprobe could return different values per process, but it uses data from the vvar area which only exists once per time namespace. A new mechanism will need to be developed. -s > Cheers, > Samuel. > > [1] https://lists.riscv.org/g/tech-prs/message/540 > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv
diff --git a/Documentation/riscv/hwprobe.rst b/Documentation/riscv/hwprobe.rst index 19165ebd82ba..3177550106e0 100644 --- a/Documentation/riscv/hwprobe.rst +++ b/Documentation/riscv/hwprobe.rst @@ -72,11 +72,44 @@ The following keys are defined: extensions. * :c:macro:`RISCV_HWPROBE_EXT_ZBB`: The Zbb extension is supported, as defined + in version 1.0 of the Bit-Manipulation ISA extensions. + + * :c:macro:`RISCV_HWPROBE_EXT_ZBC`: The Zbc extension is supported, as defined in version 1.0 of the Bit-Manipulation ISA extensions. * :c:macro:`RISCV_HWPROBE_EXT_ZBS`: The Zbs extension is supported, as defined in version 1.0 of the Bit-Manipulation ISA extensions. + * :c:macro:`RISCV_HWPROBE_EXT_ZBKB`: The Zbkb extension is supported, as defined + in version 1.0 of the Scalar Cryptography ISA extensions. + + * :c:macro:`RISCV_HWPROBE_EXT_ZBKC`: The Zbkc extension is supported, as defined + in version 1.0 of the Scalar Cryptography ISA extensions. + + * :c:macro:`RISCV_HWPROBE_EXT_ZBKX`: The Zbkx extension is supported, as defined + in version 1.0 of the Scalar Cryptography ISA extensions. + + * :c:macro:`RISCV_HWPROBE_EXT_ZKND`: The Zknd extension is supported, as defined + in version 1.0 of the Scalar Cryptography ISA extensions. + + * :c:macro:`RISCV_HWPROBE_EXT_ZKNE`: The Zkne extension is supported, as defined + in version 1.0 of the Scalar Cryptography ISA extensions. + + * :c:macro:`RISCV_HWPROBE_EXT_ZKNH`: The Zknh extension is supported, as defined + in version 1.0 of the Scalar Cryptography ISA extensions. + + * :c:macro:`RISCV_HWPROBE_EXT_ZKR`: The Zkr extension is supported, as defined + in version 1.0 of the Scalar Cryptography ISA extensions. + + * :c:macro:`RISCV_HWPROBE_EXT_ZKSED`: The Zksed extension is supported, as defined + in version 1.0 of the Scalar Cryptography ISA extensions. + + * :c:macro:`RISCV_HWPROBE_EXT_ZKSH`: The Zksh extension is supported, as defined + in version 1.0 of the Scalar Cryptography ISA extensions. + + * :c:macro:`RISCV_HWPROBE_EXT_ZKT`: The Zkt extension is supported, as defined + in version 1.0 of the Scalar Cryptography ISA extensions. + * :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: A bitmask that contains performance information about the selected set of processors. diff --git a/arch/riscv/include/uapi/asm/hwprobe.h b/arch/riscv/include/uapi/asm/hwprobe.h index 006bfb48343d..8357052061b3 100644 --- a/arch/riscv/include/uapi/asm/hwprobe.h +++ b/arch/riscv/include/uapi/asm/hwprobe.h @@ -29,6 +29,17 @@ struct riscv_hwprobe { #define RISCV_HWPROBE_EXT_ZBA (1 << 3) #define RISCV_HWPROBE_EXT_ZBB (1 << 4) #define RISCV_HWPROBE_EXT_ZBS (1 << 5) +#define RISCV_HWPROBE_EXT_ZBC (1 << 6) +#define RISCV_HWPROBE_EXT_ZBKB (1 << 7) +#define RISCV_HWPROBE_EXT_ZBKC (1 << 8) +#define RISCV_HWPROBE_EXT_ZBKX (1 << 9) +#define RISCV_HWPROBE_EXT_ZKND (1 << 10) +#define RISCV_HWPROBE_EXT_ZKNE (1 << 11) +#define RISCV_HWPROBE_EXT_ZKNH (1 << 12) +#define RISCV_HWPROBE_EXT_ZKR (1 << 13) +#define RISCV_HWPROBE_EXT_ZKSED (1 << 14) +#define RISCV_HWPROBE_EXT_ZKSH (1 << 15) +#define RISCV_HWPROBE_EXT_ZKT (1 << 16) #define RISCV_HWPROBE_KEY_CPUPERF_0 5 #define RISCV_HWPROBE_MISALIGNED_UNKNOWN (0 << 0) #define RISCV_HWPROBE_MISALIGNED_EMULATED (1 << 0) diff --git a/arch/riscv/kernel/sys_riscv.c b/arch/riscv/kernel/sys_riscv.c index 26ef5526bfb4..df15926196b6 100644 --- a/arch/riscv/kernel/sys_riscv.c +++ b/arch/riscv/kernel/sys_riscv.c @@ -145,20 +145,28 @@ static void hwprobe_isa_ext0(struct riscv_hwprobe *pair, for_each_cpu(cpu, cpus) { struct riscv_isainfo *isainfo = &hart_isa[cpu]; - if (riscv_isa_extension_available(isainfo->isa, ZBA)) - pair->value |= RISCV_HWPROBE_EXT_ZBA; - else - missing |= RISCV_HWPROBE_EXT_ZBA; - - if (riscv_isa_extension_available(isainfo->isa, ZBB)) - pair->value |= RISCV_HWPROBE_EXT_ZBB; - else - missing |= RISCV_HWPROBE_EXT_ZBB; - - if (riscv_isa_extension_available(isainfo->isa, ZBS)) - pair->value |= RISCV_HWPROBE_EXT_ZBS; - else - missing |= RISCV_HWPROBE_EXT_ZBS; +#define SET_HWPROBE_EXT_PAIR(ext) \ + do { \ + if (riscv_isa_extension_available(isainfo->isa, ext)) \ + pair->value |= RISCV_HWPROBE_EXT_## ext; \ + else \ + missing |= RISCV_HWPROBE_EXT_## ext; \ + } while (false) \ + + SET_HWPROBE_EXT_PAIR(ZBA); + SET_HWPROBE_EXT_PAIR(ZBB); + SET_HWPROBE_EXT_PAIR(ZBC); + SET_HWPROBE_EXT_PAIR(ZBS); + SET_HWPROBE_EXT_PAIR(ZBKB); + SET_HWPROBE_EXT_PAIR(ZBKC); + SET_HWPROBE_EXT_PAIR(ZBKX); + SET_HWPROBE_EXT_PAIR(ZKND); + SET_HWPROBE_EXT_PAIR(ZKNE); + SET_HWPROBE_EXT_PAIR(ZKNH); + SET_HWPROBE_EXT_PAIR(ZKR); + SET_HWPROBE_EXT_PAIR(ZKSED); + SET_HWPROBE_EXT_PAIR(ZKSH); + SET_HWPROBE_EXT_PAIR(ZKT); } /* Now turn off reporting features if any CPU is missing it. */
Zbc was missing from a previous Bit-Manipulation extension hwprobe patch. Add all scalar crypto extensions bits, and define a macro for setting the hwprobe key/pair in a more readable way. Signed-off-by: Samuel Ortiz <sameo@rivosinc.com> --- Documentation/riscv/hwprobe.rst | 33 ++++++++++++++++++++++++ arch/riscv/include/uapi/asm/hwprobe.h | 11 ++++++++ arch/riscv/kernel/sys_riscv.c | 36 ++++++++++++++++----------- 3 files changed, 66 insertions(+), 14 deletions(-)