ARMv8.5-RNG support
Subsystems (2)
v11 cover ARMv8.5-RNG support
This series is based on Richard Henderson's previous v7, it addresses review comments from that version by dropping the boot time RNG support and adds a new change that uses the v8.5-RNG extension to seed KASLR when ARCH_RANDOM is enabled. The boot time support will be re-added later, there are awkward potential interactons with CPU feature enumeration which need a bit more thought.
v11:
- Add a hwcap for v8.5-RNG.
- Drop the addition of data to the pool, it's of questionable value and we need to go back and get the addition of actual entropy working anyway.
v10:
- Spell out that we're adding data not entropy from setup_arch() in the commit message for patch 2.
v9:
- Make another static inline helper for early feature checks.
- Add init annotations.
- Use xor to add RNDR output to seed for KASLR.
Mark Brown (1):
arm64: Use v8.5-RNG entropy for KASLR seed
Richard Henderson (1):
arm64: Implement archrandom.h for ARMv8.5-RNG
Documentation/arm64/cpu-feature-registers.rst | 2 + Documentation/arm64/elf_hwcaps.rst | 4 ++ arch/arm64/Kconfig | 12 ++++ arch/arm64/include/asm/archrandom.h | 67 +++++++++++++++++++ arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/hwcap.h | 1 + arch/arm64/include/asm/sysreg.h | 4 ++ arch/arm64/include/uapi/asm/hwcap.h | 1 + arch/arm64/kernel/cpufeature.c | 14 ++++ arch/arm64/kernel/kaslr.c | 11 +++ 10 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/include/asm/archrandom.h
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v11 1/2 arm64: Implement archrandom.h for ARMv8.5-RNG
From: Richard Henderson <[email protected]>
Expose the ID_AA64ISAR0.RNDR field to userspace, as the RNG system registers are always available at EL0.
Implement arch_get_random_seed_long using RNDR. Given that the TRNG is likely to be a shared resource between cores, and VMs, do not explicitly force re-seeding with RNDRRS. In order to avoid code complexity and potential issues with hetrogenous systems only provide values after cpufeature has finalized the system capabilities.
[Modified to only function after cpufeature has finalized the system capabilities and move all the code into the header and add a hwcap -- broonie]
--- Documentation/arm64/cpu-feature-registers.rst | 2 + Documentation/arm64/elf_hwcaps.rst | 4 ++ arch/arm64/Kconfig | 12 ++++ arch/arm64/include/asm/archrandom.h | 67 +++++++++++++++++++ arch/arm64/include/asm/cpucaps.h | 3 +- arch/arm64/include/asm/hwcap.h | 1 + arch/arm64/include/asm/sysreg.h | 4 ++ arch/arm64/include/uapi/asm/hwcap.h | 1 + arch/arm64/kernel/cpufeature.c | 14 ++++ 9 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/include/asm/archrandom.h
Documentation/arm64/cpu-feature-registers.rst +2 -0
@@ -117,6 +117,8 @@ infrastructure: +------------------------------+---------+---------+ | Name | bits | visible | +------------------------------+---------+---------+ + | RNDR | [63-60] | y | + +------------------------------+---------+---------+ | TS | [55-52] | y | +------------------------------+---------+---------+ | FHM | [51-48] | y |
Documentation/arm64/elf_hwcaps.rst +4 -0
@@ -204,6 +204,10 @@ HWCAP2_FRINT Functionality implied by ID_AA64ISAR1_EL1.FRINTTS == 0b0001. +HWCAP2_RNG + + Functionality implied by ID_AA64ISAR0_EL1.RNDR == 0b0001. + 4. Unused AT_HWCAP bits -----------------------
arch/arm64/Kconfig +12 -0
@@ -1484,6 +1484,18 @@ config ARM64_PTR_AUTH endmenu +menu "ARMv8.5 architectural features" + +config ARCH_RANDOM + bool "Enable support for random number generation" + default y + help + Random number generation (part of the ARMv8.5 Extensions) + provides a high bandwidth, cryptographically secure + hardware random number generator. + +endmenu + config ARM64_SVE bool "ARM Scalable Vector Extension support" default y
arch/arm64/include/asm/archrandom.h new file +67 -0
67 lines not on this page · raw message
arch/arm64/include/asm/cpucaps.h +2 -1
@@ -56,7 +56,8 @@#define ARM64_WORKAROUND_CAVIUM_TX2_219_PRFM 46#define ARM64_WORKAROUND_1542419 47#define ARM64_WORKAROUND_1319367 48 +#define ARM64_HAS_RNG 49 -#define ARM64_NCAPS 49 +#define ARM64_NCAPS 50#endif /* __ASM_CPUCAPS_H */
arch/arm64/include/asm/hwcap.h +1 -0
@@ -86,6 +86,7 @@#define KERNEL_HWCAP_SVESM4 __khwcap2_feature(SVESM4)#define KERNEL_HWCAP_FLAGM2 __khwcap2_feature(FLAGM2)#define KERNEL_HWCAP_FRINT __khwcap2_feature(FRINT) +#define KERNEL_HWCAP_RNG __khwcap2_feature(RNG)/* * This yields a mask that user programs can use to figure out what
arch/arm64/include/asm/sysreg.h +4 -0
@@ -365,6 +365,9 @@#define SYS_CTR_EL0 sys_reg(3, 3, 0, 0, 1)#define SYS_DCZID_EL0 sys_reg(3, 3, 0, 0, 7) +#define SYS_RNDR_EL0 sys_reg(3, 3, 2, 4, 0) +#define SYS_RNDRRS_EL0 sys_reg(3, 3, 2, 4, 1) +#define SYS_PMCR_EL0 sys_reg(3, 3, 9, 12, 0)#define SYS_PMCNTENSET_EL0 sys_reg(3, 3, 9, 12, 1)#define SYS_PMCNTENCLR_EL0 sys_reg(3, 3, 9, 12, 2)
@@ -539,6 +542,7 @@ ENDIAN_SET_EL1 | SCTLR_EL1_UCI | SCTLR_EL1_RES1)/* id_aa64isar0 */ +#define ID_AA64ISAR0_RNDR_SHIFT 60#define ID_AA64ISAR0_TS_SHIFT 52#define ID_AA64ISAR0_FHM_SHIFT 48#define ID_AA64ISAR0_DP_SHIFT 44
arch/arm64/include/uapi/asm/hwcap.h +1 -0
@@ -65,5 +65,6 @@#define HWCAP2_SVESM4 (1 << 6)#define HWCAP2_FLAGM2 (1 << 7)#define HWCAP2_FRINT (1 << 8) +#define HWCAP2_RNG (1 << 9)#endif /* _UAPI__ASM_HWCAP_H */
arch/arm64/kernel/cpufeature.c +14 -0
@@ -119,6 +119,7 @@ static void cpu_enable_cnp(struct arm64_cpu_capabilities const *cap);* sync with the documentation of the CPU feature register ABI. */ static const struct arm64_ftr_bits ftr_id_aa64isar0[] = { +ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_AA64ISAR0_RNDR_SHIFT ,4 ,0 ),ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_AA64ISAR0_TS_SHIFT ,4 ,0 ),ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_AA64ISAR0_FHM_SHIFT ,4 ,0 ),ARM64_FTR_BITS (FTR_VISIBLE ,FTR_STRICT ,FTR_LOWER_SAFE ,ID_AA64ISAR0_DP_SHIFT ,4 ,0 ),
@@ -1566,6 +1567,18 @@ static const struct arm64_cpu_capabilities arm64_features[] = { .sign = FTR_UNSIGNED, .min_field_value = 1, }, +#endif +#ifdef CONFIG_ARCH_RANDOM + { + .desc = "Random Number Generator", + .capability = ARM64_HAS_RNG, + .type = ARM64_CPUCAP_SYSTEM_FEATURE, + .matches = has_cpuid_feature, + .sys_reg = SYS_ID_AA64ISAR0_EL1, + .field_pos = ID_AA64ISAR0_RNDR_SHIFT, + .sign = FTR_UNSIGNED, + .min_field_value = 1, + }, #endif {}, };
@@ -1638,6 +1651,7 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = {HWCAP_CAP (SYS_ID_AA64ISAR0_EL1 ,ID_AA64ISAR0_FHM_SHIFT ,FTR_UNSIGNED ,1 ,CAP_HWCAP ,KERNEL_HWCAP_ASIMDFHM ),HWCAP_CAP (SYS_ID_AA64ISAR0_EL1 ,ID_AA64ISAR0_TS_SHIFT ,FTR_UNSIGNED ,1 ,CAP_HWCAP ,KERNEL_HWCAP_FLAGM ),HWCAP_CAP (SYS_ID_AA64ISAR0_EL1 ,ID_AA64ISAR0_TS_SHIFT ,FTR_UNSIGNED ,2 ,CAP_HWCAP ,KERNEL_HWCAP_FLAGM2 ), +HWCAP_CAP (SYS_ID_AA64ISAR0_EL1 ,ID_AA64ISAR0_RNDR_SHIFT ,FTR_UNSIGNED ,1 ,CAP_HWCAP ,KERNEL_HWCAP_RNG ),HWCAP_CAP (SYS_ID_AA64PFR0_EL1 ,ID_AA64PFR0_FP_SHIFT ,FTR_SIGNED ,0 ,CAP_HWCAP ,KERNEL_HWCAP_FP ),HWCAP_CAP (SYS_ID_AA64PFR0_EL1 ,ID_AA64PFR0_FP_SHIFT ,FTR_SIGNED ,1 ,CAP_HWCAP ,KERNEL_HWCAP_FPHP ), HWCAP_CAP(SYS_ID_AA64PFR0_EL1, ID_AA64PFR0_ASIMD_SHIFT, FTR_SIGNED, 0, CAP_HWCAP, KERNEL_HWCAP_ASIMD),
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v11 2/2 arm64: Use v8.5-RNG entropy for KASLR seed
In reply to Mark BrownWhen seeding KALSR on a system where we have architecture level random number generation make use of that entropy, mixing it in with the seed passed by the bootloader. Since this is run very early in init before feature detection is complete we open code rather than use archrandom.h.
--- arch/arm64/kernel/kaslr.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/arm64/kernel/kaslr.c +11 -0
@@ -120,6 +120,17 @@ u64 __init kaslr_early_init(u64 dt_phys)return 0 ; } +/* +* Mix in any entropy obtainable architecturally, open coded +* since this runs extremely early. +*/ +if (__early_cpu_has_rndr ()) { +unsigned long raw; + +if (__arm64_rndr (&raw)) + seed ^= raw; + } +if (!seed) { kaslr_status =KASLR_DISABLED_NO_SEED ;return 0 ;
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Will Deacon
maintainerQuoted 6 lines · Mark Brown
This series is based on Richard Henderson's previous v7, it addresses review comments from that version by dropping the boot time RNG support and adds a new change that uses the v8.5-RNG extension to seed KASLR when
ARCH_RANDOMis enabled. The boot time support will be re-added later, there are awkward potential interactons with CPU feature enumeration which need a bit more thought.
Thanks, but this fails an allmodconfig build for me:
arch/arm64/kernel/kaslr.c: In function ‘kaslr_early_init’:arch/arm64/kernel/kaslr.c:127:6: error: implicit declaration of function ‘__early_cpu_has_rndr’; did you mean ‘__early_pfn_to_nid’? [-Werror=implicit-function-declaration]
if (__early_cpu_has_rndr()) {
^~~~~~~~~~~~~~~~~~~~
__early_pfn_to_nidcc1: some warnings being treated as errors
(no gcc, we didn't mean that!)
Will
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Will Deacon
maintainerQuoted 13 lines · Will Deacon
Quoted 6 lines · Mark Brown
This series is based on Richard Henderson's previous v7, it addresses review comments from that version by dropping the boot time RNG support and adds a new change that uses the v8.5-RNG extension to seed KASLR when
ARCH_RANDOMis enabled. The boot time support will be re-added later, there are awkward potential interactons with CPU feature enumeration which need a bit more thought.Thanks, but this fails an allmodconfig build for me:
arch/arm64/kernel/kaslr.c: In function ‘kaslr_early_init’:arch/arm64/kernel/kaslr.c:127:6: error: implicit declaration of function ‘__early_cpu_has_rndr’; did you mean ‘__early_pfn_to_nid’? [-Werror=implicit-function-declaration]
Quoted 7 lines
if (__early_cpu_has_rndr()) { ^~~~~~~~~~~~~~~~~~~~ __early_pfn_to_nidcc1: some warnings being treated as errors
(no gcc, we didn't mean that!)
Also fails on defconfig, so should save you a bit of time.
Will
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel