x86/amd: don't set X86_BUG_SYSRET_SS_ATTRS when running under Xen
PATCH v2 1/1 x86/amd: don't set X86_BUG_SYSRET_SS_ATTRS when running under Xen
When running as Xen pv guest X86_BUG_SYSRET_SS_ATTRS must not be set on AMD cpus.
This bug/feature bit is kind of special as it will be used very early when switching threads. Setting the bit and clearing it a little bit later leaves a critical window where things can go wrong. This time window has enlarged a little bit by using setup_clear_cpu_cap() instead of the hypervisor's set_cpu_features callback. It seems this larger window now makes it rather easy to hit the problem.
The proper solution is to never set the bit in case of Xen.
Signed-off-by Juergen Gross <[email protected]>
--- arch/x86/kernel/cpu/amd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/amd.c +3 -2
@@ -799,8 +799,9 @@ static void init_amd(struct cpuinfo_x86 *c)if (cpu_has (c,X86_FEATURE_3DNOW ) ||cpu_has (c,X86_FEATURE_LM ))set_cpu_cap (c,X86_FEATURE_3DNOWPREFETCH ); -/* AMD CPUs don't reset SS attributes on SYSRET */ -set_cpu_bug (c,X86_BUG_SYSRET_SS_ATTRS ); +/* AMD CPUs don't reset SS attributes on SYSRET, Xen does. */ +if (!cpu_has (c,X86_FEATURE_XENPV )) +set_cpu_bug (c,X86_BUG_SYSRET_SS_ATTRS ); }#ifdef CONFIG_X86_32
Signature · 1 line
2.12.0