x86/CPU/AMD: Rename the spectral chicken
Borislav Petkov
maintainerPATCH 1/1 x86/CPU/AMD: Rename the spectral chicken
From: "Borislav Petkov (AMD)" <[email protected]>
We've had enough fun with the spectral chicken bit - name it what it really does: it suppresses non-branch predictions.
Rename defines to make it clear that it is Zen2 only.
No functional changes.
--- arch/x86/include/asm/msr-index.h | 6 ++++-- arch/x86/kernel/cpu/amd.c | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-)
arch/x86/include/asm/msr-index.h +4 -2
@@ -625,8 +625,10 @@/* Fam 17h MSRs */ #define MSR_F17H_IRPERF 0xc00000e9 -#define MSR_ZEN2_SPECTRAL_CHICKEN 0xc00110e3 -#define MSR_ZEN2_SPECTRAL_CHICKEN_BIT BIT_ULL(1) +/* Fam 17h, Zen2 MSRs */ +#define MSR_ZEN2_DE_CFG2 0xc00110e3 +#define MSR_ZEN2_DE_CFG2_SUPPRESS_NOBR_PRED_BIT 1 +#define MSR_ZEN2_DE_CFG2_SUPPRESS_NOBR_PRED BIT(MSR_ZEN2_DE_CFG2_SUPPRESS_NOBR_PRED_BIT)/* Fam 16h MSRs */ #define MSR_F16H_L2I_PERF_CTL 0xc0010230
arch/x86/kernel/cpu/amd.c +11 -11
@@ -860,23 +860,23 @@ static void init_amd_bd(struct cpuinfo_x86 *c)clear_rdrand_cpuid_bit (c); } -void init_spectral_chicken (struct cpuinfo_x86 *c) +void init_amd_zn2 (struct cpuinfo_x86 *c) {#ifdef CONFIG_CPU_UNRET_ENTRY u64 value;/* -* On Zen2 we offer this chicken (bit) on the altar of Speculation. +* Suppress speculation from the middle of a basic block, i.e. +* non-branch predictions. * -* This suppresses speculation from the middle of a basic block, i.e. it -* suppresses non-branch predictions. -* -* We use STIBP as a heuristic to filter out Zen2 from the rest of F17H +* STIBP is used as a heuristic to filter out Zen2 from the rest +* of family 0x17. */ -if (!cpu_has (c,X86_FEATURE_HYPERVISOR ) &&cpu_has (c,X86_FEATURE_AMD_STIBP )) { -if (!rdmsrl_safe (MSR_ZEN2_SPECTRAL_CHICKEN , &value)) { - value |=MSR_ZEN2_SPECTRAL_CHICKEN_BIT ; -wrmsrl_safe (MSR_ZEN2_SPECTRAL_CHICKEN , value); +if (!cpu_has (c,X86_FEATURE_HYPERVISOR ) && +cpu_has (c,X86_FEATURE_AMD_STIBP )) { +if (!rdmsrl_safe (MSR_ZEN2_DE_CFG2 , &value)) { + value |=MSR_ZEN2_DE_CFG2_SUPPRESS_NOBR_PRED ; +wrmsrl_safe (MSR_ZEN2_DE_CFG2 , value); } }#endif
@@ -949,7 +949,7 @@ static void init_amd(struct cpuinfo_x86 *c)case 0x12 :init_amd_ln (c);break ;case 0x15 :init_amd_bd (c);break ;case 0x16 :init_amd_jg (c);break ; -case 0x17 :init_spectral_chicken (c); +case 0x17 :init_amd_zn2 (c); fallthrough;case 0x19 :init_amd_zn (c);break ; }
Signature · 1 line
2.35.1
Peter Zijlstra
NAKQuoted 20 lines · Borislav Petkov
From: "Borislav Petkov (AMD)" <[email protected]>
We've had enough fun with the spectral chicken bit - name it what it really does: it suppresses non-branch predictions.
Rename defines to make it clear that it is Zen2 only.
No functional changes.
Signed-off-by Borislav Petkov (AMD) <[email protected]>--- arch/x86/include/asm/msr-index.h | 6 ++++-- arch/x86/kernel/cpu/amd.c | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-)arch/x86/include/asm/msr-index.h +0
-0
arch/x86/include/asm/msr-index.h line 631
Quoted 9 lines
arch/x86/include/asm/msr-index.h +4
-2@@ -625,8 +625,10 @@/* Fam 17h MSRs */ #define MSR_F17H_IRPERF 0xc00000e9 -#define MSR_ZEN2_SPECTRAL_CHICKEN 0xc00110e3 -#define MSR_ZEN2_SPECTRAL_CHICKEN_BIT BIT_ULL(1) +/* Fam 17h, Zen2 MSRs */ +#define MSR_ZEN2_DE_CFG2 0xc00110e3 +#define MSR_ZEN2_DE_CFG2_SUPPRESS_NOBR_PRED_BIT 1 +#define MSR_ZEN2_DE_CFG2_SUPPRESS_NOBR_PRED BIT(MSR_ZEN2_DE_CFG2_SUPPRESS_NOBR_PRED_BIT)
NAK, I had to write all this without *any* official communication from AMD, mostly on hear-say.
This gets to be the spectral chicken forever more as punishment. Next time AMD can try again, and if they manage to get their act together and publish something before I get to write the code and invent a name for a magical bit, they get to name it how they like.
Borislav Petkov
maintainerQuoted 4 lines · Peter Zijlstra
This gets to be the spectral chicken forever more as punishment. Next time AMD can try again, and if they manage to get their act together and publish something before I get to write the code and invent a name for a magical bit, they get to name it how they like.
It is unlikely that you'll have to do that again.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteBorislav Petkov
maintainerQuoted 1 line · Thomas Gleixner
That's a purely speculative assumption.
No, it's not.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 7 lines · Borislav Petkov
Quoted 4 lines · Peter Zijlstra
This gets to be the spectral chicken forever more as punishment. Next time AMD can try again, and if they manage to get their act together and publish something before I get to write the code and invent a name for a magical bit, they get to name it how they like.
It is unlikely that you'll have to do that again.
That's a purely speculative assumption.
Quoted 3 lines · Borislav Petkov
Quoted 1 line · Thomas Gleixner
That's a purely speculative assumption.
No, it's not.
Until you retire, I'm not sure you can make that guarantee...
/me ducks.