arm64 CTR_EL0 cpufeature fixes
Subsystems (2)
Will Deacon
maintainercover arm64 CTR_EL0 cpufeature fixes
Hi,
These two patches are backports for 4.9.y stable kernels after one of them failed to apply:
https://lkml.kernel.org/r/[email protected]
Cheers,
Will
--->8
Will Deacon (2):
arm64: cpufeature: Fix CTR_EL0 field definitions
arm64: cpufeature: Fix feature comparison for CTR_EL0.{CWG,ERG}
arch/arm64/include/asm/cpufeature.h | 7 ++++--- arch/arm64/kernel/cpufeature.c | 14 ++++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-)
Signature · 1 line
2.11.0
Will Deacon
maintainerPATCH 1/2 arm64: cpufeature: Fix CTR_EL0 field definitions
From: Will Deacon <[email protected]>
commit be68a8aaf925aaf35574260bf820bb09d2f9e07f upstream.
Our field definitions for CTR_EL0 suffer from a number of problems:
- The IDC and DIC fields are missing, which causes us to enable CTR trapping on CPUs with either of these returning non-zero values.
- The ERG is FTR_LOWER_SAFE, whereas it should be treated like CWG as FTR_HIGHER_SAFE so that applications can use it to avoid false sharing.
- [nit] A RES1 field is described as "RAO"
This patch updates the CTR_EL0 field definitions to fix these issues.
--- arch/arm64/kernel/cpufeature.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/arm64/kernel/cpufeature.c +5 -3
@@ -148,10 +148,12 @@ static const struct arm64_ftr_bits ftr_id_aa64mmfr2[] = { };static const struct arm64_ftr_bits ftr_ctr[] = { -ARM64_FTR_BITS (FTR_STRICT ,FTR_EXACT ,31 ,1 ,1 ),/* RAO */ -ARM64_FTR_BITS (FTR_STRICT ,FTR_EXACT ,28 ,3 ,0 ), +ARM64_FTR_BITS (FTR_STRICT ,FTR_EXACT ,31 ,1 ,1 ),/* RES1 */ +ARM64_FTR_BITS (FTR_STRICT ,FTR_EXACT ,30 ,1 ,0 ), +ARM64_FTR_BITS (FTR_STRICT ,FTR_LOWER_SAFE ,29 ,1 ,1 ),/* DIC */ +ARM64_FTR_BITS (FTR_STRICT ,FTR_LOWER_SAFE ,28 ,1 ,1 ),/* IDC */ ARM64_FTR_BITS (FTR_STRICT ,FTR_HIGHER_SAFE ,24 ,4 ,0 ),/* CWG */ -ARM64_FTR_BITS (FTR_STRICT ,FTR_LOWER_SAFE ,20 ,4 ,0 ),/* ERG */ +ARM64_FTR_BITS (FTR_STRICT ,FTR_HIGHER_SAFE ,20 ,4 ,0 ),/* ERG */ ARM64_FTR_BITS (FTR_STRICT ,FTR_LOWER_SAFE ,CTR_DMINLINE_SHIFT ,4 ,1 ),/* * Linux can handle differing I-cache policies. Userspace JITs will
Signature · 1 line
2.11.0
Will Deacon
maintainerPATCH 2/2 arm64: cpufeature: Fix feature comparison for CTR_EL0.{CWG,ERG}
In reply to Will Deaconcommit 147b9635e6347104b91f48ca9dca61eb0fbf2a54 upstream.
If CTR_EL0.{CWG,ERG} are 0b0000 then they must be interpreted to have their architecturally maximum values, which defeats the use of FTR_HIGHER_SAFE when sanitising CPU ID registers on heterogeneous machines.
Introduce FTR_HIGHER_OR_ZERO_SAFE so that these fields effectively saturate at zero.
--- arch/arm64/include/asm/cpufeature.h | 7 ++++--- arch/arm64/kernel/cpufeature.c | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-)
arch/arm64/include/asm/cpufeature.h +4 -3
@@ -31,9 +31,10 @@/* CPU feature register tracking */ enum ftr_type { -FTR_EXACT ,/* Use a predefined safe value */ -FTR_LOWER_SAFE ,/* Smaller value is safe */ -FTR_HIGHER_SAFE ,/* Bigger value is safe */ +FTR_EXACT ,/* Use a predefined safe value */ +FTR_LOWER_SAFE ,/* Smaller value is safe */ +FTR_HIGHER_SAFE ,/* Bigger value is safe */ +FTR_HIGHER_OR_ZERO_SAFE ,/* Bigger value is safe, but 0 is biggest */ };#define FTR_STRICT true/* SANITY check strict matching required */
arch/arm64/kernel/cpufeature.c +6 -2
@@ -152,8 +152,8 @@ static const struct arm64_ftr_bits ftr_ctr[] = {ARM64_FTR_BITS (FTR_STRICT ,FTR_EXACT ,30 ,1 ,0 ),ARM64_FTR_BITS (FTR_STRICT ,FTR_LOWER_SAFE ,29 ,1 ,1 ),/* DIC */ ARM64_FTR_BITS (FTR_STRICT ,FTR_LOWER_SAFE ,28 ,1 ,1 ),/* IDC */ -ARM64_FTR_BITS (FTR_STRICT ,FTR_HIGHER_SAFE ,24 ,4 ,0 ),/* CWG */ -ARM64_FTR_BITS (FTR_STRICT ,FTR_HIGHER_SAFE ,20 ,4 ,0 ),/* ERG */ +ARM64_FTR_BITS (FTR_STRICT ,FTR_HIGHER_OR_ZERO_SAFE ,24 ,4 ,0 ),/* CWG */ +ARM64_FTR_BITS (FTR_STRICT ,FTR_HIGHER_OR_ZERO_SAFE ,20 ,4 ,0 ),/* ERG */ ARM64_FTR_BITS (FTR_STRICT ,FTR_LOWER_SAFE ,CTR_DMINLINE_SHIFT ,4 ,1 ),/* * Linux can handle differing I-cache policies. Userspace JITs will
@@ -392,6 +392,10 @@ static s64 arm64_ftr_safe_value(const struct arm64_ftr_bits *ftrp, s64 new,case FTR_LOWER_SAFE : ret = new < cur ? new : cur;break ; +case FTR_HIGHER_OR_ZERO_SAFE : +if (!cur || !new) +break ; +/* Fallthrough */ case FTR_HIGHER_SAFE : ret = new > cur ? new : cur;break ;
Signature · 1 line
2.11.0
Sasha Levin
maintainerQuoted 6 lines · Will Deacon
Hi,
These two patches are backports for 4.9.y stable kernels after one of them failed to apply:
I took the 4.9 patches, thanks!
--
Thanks,
Sasha