x86/amd: don't set X86_BUG_SYSRET_SS_ATTRS when running under Xen
Subsystems (2)
Juergen Gross
maintainerPATCH v3 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.
--- arch/x86/kernel/cpu/amd.c | 5 +++-- arch/x86/xen/enlighten_pv.c | 1 - 2 files changed, 3 insertions(+), 3 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
arch/x86/xen/enlighten_pv.c +0 -1
@@ -290,7 +290,6 @@ static bool __init xen_check_xsave(void)static void __init xen_init_capabilities (void ) { -setup_clear_cpu_cap (X86_BUG_SYSRET_SS_ATTRS );setup_force_cpu_cap (X86_FEATURE_XENPV );setup_clear_cpu_cap (X86_FEATURE_DCA );setup_clear_cpu_cap (X86_FEATURE_APERFMPERF );
Signature · 1 line
2.12.0
Juergen Gross
maintainerAny comments?
Juergen
Quoted 40 lines · Juergen Gross
When running as Xen pv guest
X86_BUG_SYSRET_SS_ATTRSmust 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'sset_cpu_featurescallback. 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 +++-- arch/x86/xen/enlighten_pv.c | 1 - 2 files changed, 3 insertions(+), 3 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 arch/x86/xen/enlighten_pv.c +0
-0
arch/x86/xen/enlighten_pv.c static bool __init xen_check_xsave(void) · line 295
Quoted 7 lines
arch/x86/xen/enlighten_pv.c +0
-1@@ -290,7 +290,6 @@ static bool __init xen_check_xsave(void)static void __init xen_init_capabilities (void ) { -setup_clear_cpu_cap (X86_BUG_SYSRET_SS_ATTRS );setup_force_cpu_cap (X86_FEATURE_XENPV );setup_clear_cpu_cap (X86_FEATURE_DCA );setup_clear_cpu_cap (X86_FEATURE_APERFMPERF );
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel
Juergen Gross
maintainerAny comments?
Juergen
Quoted 47 lines · Juergen Gross
When running as Xen pv guest
X86_BUG_SYSRET_SS_ATTRSmust 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'sset_cpu_featurescallback. 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 +++-- arch/x86/xen/enlighten_pv.c | 1 - 2 files changed, 3 insertions(+), 3 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 arch/x86/xen/enlighten_pv.c +0
-1@@ -290,7 +290,6 @@ static bool __init xen_check_xsave(void)static void __init xen_init_capabilities (void ) { -setup_clear_cpu_cap (X86_BUG_SYSRET_SS_ATTRS );setup_force_cpu_cap (X86_FEATURE_XENPV );setup_clear_cpu_cap (X86_FEATURE_DCA );setup_clear_cpu_cap (X86_FEATURE_APERFMPERF );
Quoted 17 lines · Juergen Gross
Any comments?
Juergen
Quoted 11 lines · Juergen Gross
When running as Xen pv guest
X86_BUG_SYSRET_SS_ATTRSmust 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'sset_cpu_featurescallback. 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.
FWIW,
Quoted 29 lines
Quoted 29 lines
Signed-off-by Juergen Gross <[email protected]>--- arch/x86/kernel/cpu/amd.c | 5 +++-- arch/x86/xen/enlighten_pv.c | 1 - 2 files changed, 3 insertions(+), 3 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 arch/x86/xen/enlighten_pv.c +0
-0@@ -290,7 +290,6 @@ static bool __init xen_check_xsave(void)
Quoted 7 lines
arch/x86/xen/enlighten_pv.c static bool __init xen_check_xsave(void) · line 295
Quoted 7 lines
arch/x86/xen/enlighten_pv.c +0
-1static void __init xen_init_capabilities (void ) { -setup_clear_cpu_cap (X86_BUG_SYSRET_SS_ATTRS );setup_force_cpu_cap (X86_FEATURE_XENPV );setup_clear_cpu_cap (X86_FEATURE_DCA );setup_clear_cpu_cap (X86_FEATURE_APERFMPERF );
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel
Juergen Gross
maintainerQuoted 10 lines · Juergen Gross
When running as Xen pv guest
X86_BUG_SYSRET_SS_ATTRSmust 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'sset_cpu_featurescallback. It seems this larger window now makes it rather easy to hit the problem.
Quoted 3 lines
The proper solution is to never set the bit in case of Xen.
Signed-off-by Juergen Gross <[email protected]>
Any objections for carrying this through the Xen tree?
Juergen
Quoted 34 lines
--- arch/x86/kernel/cpu/amd.c | 5 +++-- arch/x86/xen/enlighten_pv.c | 1 - 2 files changed, 3 insertions(+), 3 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 arch/x86/xen/enlighten_pv.c +0
-1@@ -290,7 +290,6 @@ static bool __init xen_check_xsave(void)static void __init xen_init_capabilities (void ) { -setup_clear_cpu_cap (X86_BUG_SYSRET_SS_ATTRS );setup_force_cpu_cap (X86_FEATURE_XENPV );setup_clear_cpu_cap (X86_FEATURE_DCA );setup_clear_cpu_cap (X86_FEATURE_APERFMPERF );
Thomas Gleixner
Acked-byQuoted 11 lines · Juergen Gross
Quoted 10 lines · Juergen Gross
When running as Xen pv guest
X86_BUG_SYSRET_SS_ATTRSmust 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'sset_cpu_featurescallback. It seems this larger window now makes it rather easy to hit the problem.
Quoted 5 lines
Quoted 3 lines
The proper solution is to never set the bit in case of Xen.
Signed-off-by Juergen Gross <[email protected]>Any objections for carrying this through the Xen tree?
Thomas Gleixner
Acked-byQuoted 11 lines · Juergen Gross
Quoted 10 lines · Juergen Gross
When running as Xen pv guest
X86_BUG_SYSRET_SS_ATTRSmust 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'sset_cpu_featurescallback. It seems this larger window now makes it rather easy to hit the problem.
Quoted 5 lines
Quoted 3 lines
The proper solution is to never set the bit in case of Xen.
Signed-off-by Juergen Gross <[email protected]>Any objections for carrying this through the Xen tree?
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel
Juergen Gross
maintainerQuoted 10 lines · Juergen Gross
When running as Xen pv guest
X86_BUG_SYSRET_SS_ATTRSmust 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'sset_cpu_featurescallback. It seems this larger window now makes it rather easy to hit the problem.
Quoted 3 lines
The proper solution is to never set the bit in case of Xen.
Signed-off-by Juergen Gross <[email protected]>
Any objections for carrying this through the Xen tree?
Juergen
Quoted 27 lines
--- arch/x86/kernel/cpu/amd.c | 5 +++-- arch/x86/xen/enlighten_pv.c | 1 - 2 files changed, 3 insertions(+), 3 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 arch/x86/xen/enlighten_pv.c +0
-0
arch/x86/xen/enlighten_pv.c static bool __init xen_check_xsave(void) · line 295
Quoted 7 lines
arch/x86/xen/enlighten_pv.c +0
-1@@ -290,7 +290,6 @@ static bool __init xen_check_xsave(void)static void __init xen_init_capabilities (void ) { -setup_clear_cpu_cap (X86_BUG_SYSRET_SS_ATTRS );setup_force_cpu_cap (X86_FEATURE_XENPV );setup_clear_cpu_cap (X86_FEATURE_DCA );setup_clear_cpu_cap (X86_FEATURE_APERFMPERF );
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel