Skip to content

Commit 526d069

Browse files
sean-jcsmb49
authored andcommitted
x86/CPU/AMD: WARN when setting EFER.AUTOIBRS if and only if the WRMSR fails
BugLink: https://bugs.launchpad.net/bugs/2102118 [ Upstream commit 492077668fb453b8b16c842fcf3fafc2ebc190e9 ] When ensuring EFER.AUTOIBRS is set, WARN only on a negative return code from msr_set_bit(), as '1' is used to indicate the WRMSR was successful ('0' indicates the MSR bit was already set). Fixes: 8cc68c9 ("x86/CPU/AMD: Make sure EFER[AIBRSE] is set") Reported-by: Nathan Chancellor <[email protected]> Signed-off-by: Sean Christopherson <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected] Closes: https://lore.kernel.org/all/20241205220604.GA2054199@thelio-3990X Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Koichiro Den <[email protected]> Signed-off-by: Stefan Bader <[email protected]>
1 parent 35431c0 commit 526d069

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/kernel/cpu/amd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@ static void init_amd(struct cpuinfo_x86 *c)
12011201
*/
12021202
if (spectre_v2_in_eibrs_mode(spectre_v2_enabled) &&
12031203
cpu_has(c, X86_FEATURE_AUTOIBRS))
1204-
WARN_ON_ONCE(msr_set_bit(MSR_EFER, _EFER_AUTOIBRS));
1204+
WARN_ON_ONCE(msr_set_bit(MSR_EFER, _EFER_AUTOIBRS) < 0);
12051205

12061206
/* AMD CPUs don't need fencing after x2APIC/TSC_DEADLINE MSR writes. */
12071207
clear_cpu_cap(c, X86_FEATURE_APIC_MSRS_FENCE);

0 commit comments

Comments
 (0)