x86: add workaround monitor bug
PATCH v2 1/1 x86: add workaround monitor bug
From: Peter Zijlstra <[email protected]>
Monitored cached line may not wake up from mwait on certain Goldmont based CPUs. This patch will avoid calling current_set_polling_and_test() and thereby not set the TIF_ flag. The result is that we'll always send IPIs for wakeups.
--- arch/x86/include/asm/cpufeatures.h | 2 +- arch/x86/include/asm/mwait.h | 2 +- arch/x86/kernel/cpu/intel.c | 5 +++++ arch/x86/kernel/process.c | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-)
arch/x86/include/asm/cpufeatures.h +1 -1
@@ -310,5 +310,5 @@#endif #define X86_BUG_NULL_SEG X86_BUG(10)/* Nulling a selector preserves the base */ #define X86_BUG_SWAPGS_FENCE X86_BUG(11)/* SWAPGS without input dep on GS */ - +#define X86_BUG_MONITOR X86_BUG(12)/* IPI required to wake up remote cpu */ #endif /* _ASM_X86_CPUFEATURES_H */
arch/x86/include/asm/mwait.h +1 -1
@@ -97,7 +97,7 @@ static inline void __sti_mwait(unsigned long eax, unsigned long ecx)*/ static inline void mwait_idle_with_hints (unsigned long eax,unsigned long ecx) { -if (!current_set_polling_and_test ()) { +if (static_cpu_has_bug (X86_BUG_MONITOR ) || !current_set_polling_and_test ()) {if (static_cpu_has_bug (X86_BUG_CLFLUSH_MONITOR )) {mb ();clflush ((void *)¤t_thread_info ()->flags);
arch/x86/kernel/cpu/intel.c +5 -0
@@ -13,6 +13,7 @@#include <asm/msr.h> #include <asm/bugs.h> #include <asm/cpu.h> +#include <asm/intel-family.h> #ifdef CONFIG_X86_64 #include <linux/topology.h>
@@ -508,6 +509,10 @@ static void init_intel(struct cpuinfo_x86 *c) (c->x86_model == 29 || c->x86_model == 46 || c->x86_model == 47))set_cpu_bug (c,X86_BUG_CLFLUSH_MONITOR ); +if (c->x86 ==6 &&boot_cpu_has (X86_FEATURE_MWAIT ) && + ((c->x86_model ==INTEL_FAM6_ATOM_GOLDMONT ))) +set_cpu_bug (c,X86_BUG_MONITOR ); +#ifdef CONFIG_X86_64 if (c->x86 ==15 ) c->x86_cache_alignment = c->x86_clflush_size *2 ;
arch/x86/kernel/process.c +1 -1
@@ -405,7 +405,7 @@ static int prefer_mwait_c1_over_halt(const struct cpuinfo_x86 *c)if (c->x86_vendor !=X86_VENDOR_INTEL )return 0 ; -if (!cpu_has (c,X86_FEATURE_MWAIT )) +if (!cpu_has (c,X86_FEATURE_MWAIT ) ||static_cpu_has_bug (X86_BUG_MONITOR ))return 0 ;return 1 ;
Signature · 1 line
2.7.4
Quoted 77 lines · Jacob Pan
From: Peter Zijlstra <[email protected]>
Monitored cached line may not wake up from mwait on certain Goldmont based CPUs. This patch will avoid calling
current_set_polling_and_test()and thereby not set theTIF_flag. The result is that we'll always send IPIs for wakeups.Signed-off-by Peter Zijlstra <[email protected]>Signed-off-by Jacob Pan <[email protected]>--- arch/x86/include/asm/cpufeatures.h | 2 +- arch/x86/include/asm/mwait.h | 2 +- arch/x86/kernel/cpu/intel.c | 5 +++++ arch/x86/kernel/process.c | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-)arch/x86/include/asm/cpufeatures.h +1
-1@@ -310,5 +310,5 @@#endif #define X86_BUG_NULL_SEG X86_BUG(10)/* Nulling a selector preserves the base */ #define X86_BUG_SWAPGS_FENCE X86_BUG(11)/* SWAPGS without input dep on GS */ - +#define X86_BUG_MONITOR X86_BUG(12)/* IPI required to wake up remote cpu */ #endif /* _ASM_X86_CPUFEATURES_H */ arch/x86/include/asm/mwait.h +1
-1@@ -97,7 +97,7 @@ static inline void __sti_mwait(unsigned long eax, unsigned long ecx)*/ static inline void mwait_idle_with_hints (unsigned long eax,unsigned long ecx) { -if (!current_set_polling_and_test ()) { +if (static_cpu_has_bug (X86_BUG_MONITOR ) || !current_set_polling_and_test ()) {if (static_cpu_has_bug (X86_BUG_CLFLUSH_MONITOR )) {mb ();clflush ((void *)¤t_thread_info ()->flags);arch/x86/kernel/cpu/intel.c +5
-0@@ -13,6 +13,7 @@#include <asm/msr.h> #include <asm/bugs.h> #include <asm/cpu.h> +#include <asm/intel-family.h> #ifdef CONFIG_X86_64 #include <linux/topology.h> @@ -508,6 +509,10 @@ static void init_intel(struct cpuinfo_x86 *c) (c->x86_model == 29 || c->x86_model == 46 || c->x86_model == 47))set_cpu_bug (c,X86_BUG_CLFLUSH_MONITOR ); +if (c->x86 ==6 &&boot_cpu_has (X86_FEATURE_MWAIT ) && + ((c->x86_model ==INTEL_FAM6_ATOM_GOLDMONT ))) +set_cpu_bug (c,X86_BUG_MONITOR ); +#ifdef CONFIG_X86_64 if (c->x86 ==15 ) c->x86_cache_alignment = c->x86_clflush_size *2 ;arch/x86/kernel/process.c +1
-2@@ -405,7 +405,7 @@ static int prefer_mwait_c1_over_halt(const struct cpuinfo_x86 *c)if (c->x86_vendor !=X86_VENDOR_INTEL )return 0 ; -if (!cpu_has (c,X86_FEATURE_MWAIT )) +if (!cpu_has (c,X86_FEATURE_MWAIT ) ||static_cpu_has_bug (X86_BUG_MONITOR ))return 0 ;return 1 ; --
Quoted 2 lines
2.7.4
It would be simpler to just force clear X86_FEATURE_MWAIT.
--
Brian Gerst
Quoted 1 line · On Mon, 18 Jul 2016 14:49:56 -0400 Brian Gerst <[email protected]> wrote:
It would be simpler to just force clear
X86_FEATURE_MWAIT.
Then we cannot use intel_idle driver. In addition, ACPI idle driver needs BIOS support which may or may not be there for all platforms.
Thanks,
Jacob
tip-bot for Peter Zijlstra
merge bot[tip:x86/cpu] x86/cpu: Add workaround for MONITOR instruction erratum on Goldmont based CPUs
In reply to Jacob Panx86/cpu: Add workaround for MONITOR instruction erratum on Goldmont based CPUs
Commit-ID: 08e237fa56a1d95c1372033bc29c4a2517b3c0fa Gitweb: http://git.kernel.org/tip/08e237fa56a1d95c1372033bc29c4a2517b3c0fa Author: Peter Zijlstra <[email protected]> AuthorDate: Mon, 18 Jul 2016 11:41:10 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 20 Jul 2016 09:48:40 +0200
x86/cpu: Add workaround for MONITOR instruction erratum on Goldmont based CPUs
Monitored cached line may not wake up from mwait on certain Goldmont based CPUs. This patch will avoid calling current_set_polling_and_test() and thereby not set the TIF_ flag. The result is that we'll always send IPIs for wakeups.
--- arch/x86/include/asm/cpufeatures.h | 2 +- arch/x86/include/asm/mwait.h | 2 +- arch/x86/kernel/cpu/intel.c | 5 +++++ arch/x86/kernel/process.c | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-)
arch/x86/include/asm/cpufeatures.h +1 -1
@@ -310,5 +310,5 @@#endif #define X86_BUG_NULL_SEG X86_BUG(10)/* Nulling a selector preserves the base */ #define X86_BUG_SWAPGS_FENCE X86_BUG(11)/* SWAPGS without input dep on GS */ - +#define X86_BUG_MONITOR X86_BUG(12)/* IPI required to wake up remote CPU */ #endif /* _ASM_X86_CPUFEATURES_H */
arch/x86/include/asm/mwait.h +1 -1
@@ -97,7 +97,7 @@ static inline void __sti_mwait(unsigned long eax, unsigned long ecx)*/ static inline void mwait_idle_with_hints (unsigned long eax,unsigned long ecx) { -if (!current_set_polling_and_test ()) { +if (static_cpu_has_bug (X86_BUG_MONITOR ) || !current_set_polling_and_test ()) {if (static_cpu_has_bug (X86_BUG_CLFLUSH_MONITOR )) {mb ();clflush ((void *)¤t_thread_info ()->flags);
arch/x86/kernel/cpu/intel.c +5 -0
@@ -13,6 +13,7 @@#include <asm/msr.h> #include <asm/bugs.h> #include <asm/cpu.h> +#include <asm/intel-family.h> #ifdef CONFIG_X86_64 #include <linux/topology.h>
@@ -508,6 +509,10 @@ static void init_intel(struct cpuinfo_x86 *c) (c->x86_model == 29 || c->x86_model == 46 || c->x86_model == 47))set_cpu_bug (c,X86_BUG_CLFLUSH_MONITOR ); +if (c->x86 ==6 &&boot_cpu_has (X86_FEATURE_MWAIT ) && + ((c->x86_model ==INTEL_FAM6_ATOM_GOLDMONT ))) +set_cpu_bug (c,X86_BUG_MONITOR ); +#ifdef CONFIG_X86_64 if (c->x86 ==15 ) c->x86_cache_alignment = c->x86_clflush_size *2 ;
arch/x86/kernel/process.c +1 -1
@@ -404,7 +404,7 @@ static int prefer_mwait_c1_over_halt(const struct cpuinfo_x86 *c)if (c->x86_vendor !=X86_VENDOR_INTEL )return 0 ; -if (!cpu_has (c,X86_FEATURE_MWAIT )) +if (!cpu_has (c,X86_FEATURE_MWAIT ) ||static_cpu_has_bug (X86_BUG_MONITOR ))return 0 ;return 1 ;