Commit 9b040453 authored by Tony Battersby's avatar Tony Battersby Committed by Thomas Gleixner

x86/smp: Dont access non-existing CPUID leaf

stop_this_cpu() tests CPUID leaf 0x8000001f::EAX unconditionally. Intel
CPUs return the content of the highest supported leaf when a non-existing
leaf is read, while AMD CPUs return all zeros for unsupported leafs.

So the result of the test on Intel CPUs is lottery.

While harmless it's incorrect and causes the conditional wbinvd() to be
issued where not required.

Check whether the leaf is supported before reading it.

[ tglx: Adjusted changelog ]

Fixes: 08f253ec ("x86/cpu: Clear SME feature flag when not in use")
Signed-off-by: default avatarTony Battersby <tonyb@cybernetics.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Reviewed-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/3817d810-e0f1-8ef8-0bbd-663b919ca49b@cybernetics.com
Link: https://lore.kernel.org/r/20230615193330.322186388@linutronix.de
parent 1f5e7eb7
...@@ -763,6 +763,7 @@ struct cpumask cpus_stop_mask; ...@@ -763,6 +763,7 @@ struct cpumask cpus_stop_mask;
void __noreturn stop_this_cpu(void *dummy) void __noreturn stop_this_cpu(void *dummy)
{ {
struct cpuinfo_x86 *c = this_cpu_ptr(&cpu_info);
unsigned int cpu = smp_processor_id(); unsigned int cpu = smp_processor_id();
local_irq_disable(); local_irq_disable();
...@@ -777,7 +778,7 @@ void __noreturn stop_this_cpu(void *dummy) ...@@ -777,7 +778,7 @@ void __noreturn stop_this_cpu(void *dummy)
*/ */
set_cpu_online(cpu, false); set_cpu_online(cpu, false);
disable_local_APIC(); disable_local_APIC();
mcheck_cpu_clear(this_cpu_ptr(&cpu_info)); mcheck_cpu_clear(c);
/* /*
* Use wbinvd on processors that support SME. This provides support * Use wbinvd on processors that support SME. This provides support
...@@ -791,7 +792,7 @@ void __noreturn stop_this_cpu(void *dummy) ...@@ -791,7 +792,7 @@ void __noreturn stop_this_cpu(void *dummy)
* Test the CPUID bit directly because the machine might've cleared * Test the CPUID bit directly because the machine might've cleared
* X86_FEATURE_SME due to cmdline options. * X86_FEATURE_SME due to cmdline options.
*/ */
if (cpuid_eax(0x8000001f) & BIT(0)) if (c->extended_cpuid_level >= 0x8000001f && (cpuid_eax(0x8000001f) & BIT(0)))
native_wbinvd(); native_wbinvd();
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment