A couple of cleanups on top of for-next/e0pd
Will Deacon
maintainercover A couple of cleanups on top of for-next/e0pd
Hi Mark,
I've queued the E0PD patches for 5.6 (thanks!), but in reading them a final time I noticed a couple of cleanups that I think we can make to kaslr_requires_kpti(). I don't have a TX1 to test them on, but I think the logic is sound.
Please take a look, as I'd like to queue these on top.
Thanks.
Will
--->8
Will Deacon (2):
arm64: Simplify early check for broken TX1 when KASLR is enabled
arm64: Use register field helper in kaslr_requires_kpti()
arch/arm64/kernel/cpufeature.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)
Signature · 7 lines
2.25.0.rc1.283.g88dfdc4193-goog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Will Deacon
maintainerPATCH 1/2 arm64: Simplify early check for broken TX1 when KASLR is enabled
Now that the decision to use non-global mappings is stored in a variable, the check to avoid enabling them for the terminally broken ThunderX1 platform can be simplified so that it is only keyed off the MIDR value.
--- arch/arm64/kernel/cpufeature.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
arch/arm64/kernel/cpufeature.c +4 -11
@@ -980,9 +980,7 @@ has_useable_cnp(const struct arm64_cpu_capabilities *entry, int scope)*/ bool kaslr_requires_kpti (void ) { -bool tx1_bug;u64 ftr; -if (!IS_ENABLED (CONFIG_RANDOMIZE_BASE ))return false;
@@ -1000,18 +998,13 @@ bool kaslr_requires_kpti(void)* Systems affected by Cavium erratum 24756 are incompatible * with KPTI. */ -if (!IS_ENABLED (CONFIG_CAVIUM_ERRATUM_27456 )) { - tx1_bug = false; - }else if (!static_branch_likely (&arm64_const_caps_ready)) { +if (IS_ENABLED (CONFIG_CAVIUM_ERRATUM_27456 )) {extern const struct midr_range cavium_erratum_27456_cpus[]; - tx1_bug =is_midr_in_range_list (read_cpuid_id (), - cavium_erratum_27456_cpus); - }else { - tx1_bug =__cpus_have_const_cap (ARM64_WORKAROUND_CAVIUM_27456 ); +if (is_midr_in_range_list (read_cpuid_id (), + cavium_erratum_27456_cpus)) +return false; } -if (tx1_bug) -return false;return kaslr_offset () >0 ; }
Signature · 7 lines
2.25.0.rc1.283.g88dfdc4193-goog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Will Deacon
maintainerPATCH 2/2 arm64: Use register field helper in kaslr_requires_kpti()
In reply to Will DeaconRather than open-code the extraction of the E0PD field from the MMFR2 register, we can use the cpuid_feature_extract_unsigned_field() helper instead.
--- arch/arm64/kernel/cpufeature.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/kernel/cpufeature.c +3 -3
@@ -980,7 +980,6 @@ has_useable_cnp(const struct arm64_cpu_capabilities *entry, int scope)*/ bool kaslr_requires_kpti (void ) { -u64 ftr;if (!IS_ENABLED (CONFIG_RANDOMIZE_BASE ))return false;
@@ -989,8 +988,9 @@ bool kaslr_requires_kpti(void)* where available. */ if (IS_ENABLED (CONFIG_ARM64_E0PD )) { - ftr =read_sysreg_s (SYS_ID_AA64MMFR2_EL1 ); -if ((ftr >>ID_AA64MMFR2_E0PD_SHIFT ) &0xf ) +u64 mmfr2 =read_sysreg_s (SYS_ID_AA64MMFR2_EL1 ); +if (cpuid_feature_extract_unsigned_field (mmfr2, +ID_AA64MMFR2_E0PD_SHIFT ))return false; }
Signature · 7 lines
2.25.0.rc1.283.g88dfdc4193-goog _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 2/2] arm64: Use register field helper in kaslr_requires_kpti()
Quoted 3 lines · Will Deacon
Rather than open-code the extraction of the E0PD field from the MMFR2 register, we can use the
cpuid_feature_extract_unsigned_field()helper instead.
This was suggested by Suzuki at some point but I ended up not doing it as the helper function name is so long I couldn't work out how to lay the code out in a satisfactory way at the time.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 3 lines · Will Deacon
Will Deacon (2):
arm64: Simplify early check for broken TX1 when KASLR is enabled
arm64: Use register field helper inkaslr_requires_kpti()
The clean-ups look fine to me. With the latest patches we never call kaslr_requires_kpti() after arm64_const_caps_ready has been set.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 9 lines · Will Deacon
Hi Mark,
I've queued the E0PD patches for 5.6 (thanks!), but in reading them a final time I noticed a couple of cleanups that I think we can make to
kaslr_requires_kpti(). I don't have a TX1 to test them on, but I think the logic is sound.Please take a look, as I'd like to queue these on top.
Quoted 7 lines
Thanks.
Will
Cc Catalin Marinas <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Marc Zyngier <[email protected]>
Looks good to me.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel