x86: Remove __FORCE_ORDER workaround
PATCH 1/1 x86: Remove __FORCE_ORDER workaround
GCC PR82602 that caused invalid scheduling of volatile asms:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82602
was fixed for gcc-8.1.0, the current minimum version of the compiler, required to compile the kernel. Remove workaround that prevented invalid scheduling for compilers, affected by PR82602.
There were no differences between old and new kernel object file when compiled for x86_64 defconfig with gcc-8.1.0.
--- arch/x86/include/asm/debugreg.h | 12 ++++++------ arch/x86/include/asm/special_insns.h | 21 +++++---------------- 2 files changed, 11 insertions(+), 22 deletions(-)
arch/x86/include/asm/debugreg.h +6 -6
@@ -23,7 +23,7 @@ DECLARE_PER_CPU(unsigned long, cpu_dr7);static __always_inline unsigned long native_get_debugreg (int regno) { -unsigned long val =0 ;/* Damn you, gcc! */ +unsigned long val;switch (regno) {case 0 :
@@ -43,7 +43,7 @@ static __always_inline unsigned long native_get_debugreg(int regno)break ;case 7 :/* -* Apply __FORCE_ORDER to DR7 reads to forbid re-ordering them +* Use "asm volatile" for DR7 reads to forbid re-ordering them * with other code. * * This is needed because a DR7 access can cause a #VC exception
@@ -55,7 +55,7 @@ static __always_inline unsigned long native_get_debugreg(int regno)* re-ordered to happen before the call to sev_es_ist_enter(), * causing stack recursion. */ - asm volatile("mov %%db7, %0" : "=r" (val) : __FORCE_ORDER); + asmvolatile ("mov %%db7, %0" :"=r" (val));break ;default :BUG ();
@@ -83,15 +83,15 @@ static __always_inline void native_set_debugreg(int regno, unsigned long value)break ;case 7 :/* -* Apply __FORCE_ORDER to DR7 writes to forbid re-ordering them +* Use "asm volatile" for DR7 writes to forbid re-ordering them * with other code. * * While is didn't happen with a DR7 write (see the DR7 read * comment above which explains where it happened), add the -* __FORCE_ORDER here too to avoid similar problems in the +* "asm volatile" here too to avoid similar problems in the * future. */ - asm volatile("mov %0, %%db7" ::"r" (value), __FORCE_ORDER); + asmvolatile ("mov %0, %%db7" ::"r" (value));break ;default :BUG ();
arch/x86/include/asm/special_insns.h +5 -16
@@ -10,30 +10,19 @@#include <linux/irqflags.h> #include <linux/jump_label.h> -/* -* The compiler should not reorder volatile asm statements with respect to each -* other: they should execute in program order. However GCC 4.9.x and 5.x have -* a bug (which was fixed in 8.1, 7.3 and 6.5) where they might reorder -* volatile asm. The write functions are not affected since they have memory -* clobbers preventing reordering. To prevent reads from being reordered with -* respect to writes, use a dummy memory operand. -*/ - -#define __FORCE_ORDER "m"(*(unsigned int *)0x1000UL) -void native_write_cr0 (unsigned long val);static inline unsigned long native_read_cr0 (void ) {unsigned long val; - asm volatile("mov %%cr0,%0\n\t" : "=r" (val) : __FORCE_ORDER); + asmvolatile ("mov %%cr0,%0" :"=r" (val));return val; }static __always_inline unsigned long native_read_cr2 (void ) {unsigned long val; - asm volatile("mov %%cr2,%0\n\t" : "=r" (val) : __FORCE_ORDER); + asmvolatile ("mov %%cr2,%0" :"=r" (val));return val; }
@@ -45,7 +34,7 @@ static __always_inline void native_write_cr2(unsigned long val)static __always_inline unsigned long __native_read_cr3 (void ) {unsigned long val; - asm volatile("mov %%cr3,%0\n\t" : "=r" (val) : __FORCE_ORDER); + asmvolatile ("mov %%cr3,%0" :"=r" (val));return val; }
@@ -66,10 +55,10 @@ static inline unsigned long native_read_cr4(void) asm volatile("1: mov %%cr4, %0\n" "2:\n" _ASM_EXTABLE(1b, 2b) - : "=r" (val) : "0" (0), __FORCE_ORDER); + : "=r" (val) : "0" (0)); #else/* CR4 always exists on x86_64. */ - asm volatile("mov %%cr4,%0\n\t" : "=r" (val) : __FORCE_ORDER); + asmvolatile ("mov %%cr4,%0" :"=r" (val));#endif return val; }
Signature · 1 line
2.49.0
The following commit has been merged into the x86/asm branch of tip:
The following commit has been merged into the x86/asm branch of tip:
Commit-ID: a23be6ccd8b966ae2483bfc873720b2868ad63c3 Gitweb: https://git.kernel.org/tip/a23be6ccd8b966ae2483bfc873720b2868ad63c3 Author: Uros Bizjak <[email protected]> AuthorDate: Mon, 07 Apr 2025 13:23:01 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Thu, 10 Apr 2025 08:42:26 +02:00
x86: Remove __FORCE_ORDER workaround
GCC PR82602 that caused invalid scheduling of volatile asms:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82602
was fixed for gcc-8.1.0, the current minimum version of the compiler required to compile the kernel.
Remove workaround that prevented invalid scheduling for compilers, affected by PR82602.
There were no differences between old and new kernel object file when compiled for x86_64 defconfig with gcc-8.1.0.
--- arch/x86/include/asm/debugreg.h | 12 ++++++------ arch/x86/include/asm/special_insns.h | 21 +++++---------------- 2 files changed, 11 insertions(+), 22 deletions(-)
arch/x86/include/asm/debugreg.h +6 -6
@@ -23,7 +23,7 @@ DECLARE_PER_CPU(unsigned long, cpu_dr7);static __always_inline unsigned long native_get_debugreg (int regno) { -unsigned long val =0 ;/* Damn you, gcc! */ +unsigned long val;switch (regno) {case 0 :
@@ -43,7 +43,7 @@ static __always_inline unsigned long native_get_debugreg(int regno)break ;case 7 :/* -* Apply __FORCE_ORDER to DR7 reads to forbid re-ordering them +* Use "asm volatile" for DR7 reads to forbid re-ordering them * with other code. * * This is needed because a DR7 access can cause a #VC exception
@@ -55,7 +55,7 @@ static __always_inline unsigned long native_get_debugreg(int regno)* re-ordered to happen before the call to sev_es_ist_enter(), * causing stack recursion. */ - asm volatile("mov %%db7, %0" : "=r" (val) : __FORCE_ORDER); + asmvolatile ("mov %%db7, %0" :"=r" (val));break ;default :BUG ();
@@ -83,15 +83,15 @@ static __always_inline void native_set_debugreg(int regno, unsigned long value)break ;case 7 :/* -* Apply __FORCE_ORDER to DR7 writes to forbid re-ordering them +* Use "asm volatile" for DR7 writes to forbid re-ordering them * with other code. * * While is didn't happen with a DR7 write (see the DR7 read * comment above which explains where it happened), add the -* __FORCE_ORDER here too to avoid similar problems in the +* "asm volatile" here too to avoid similar problems in the * future. */ - asm volatile("mov %0, %%db7" ::"r" (value), __FORCE_ORDER); + asmvolatile ("mov %0, %%db7" ::"r" (value));break ;default :BUG ();
arch/x86/include/asm/special_insns.h +5 -16
@@ -10,30 +10,19 @@#include <linux/irqflags.h> #include <linux/jump_label.h> -/* -* The compiler should not reorder volatile asm statements with respect to each -* other: they should execute in program order. However GCC 4.9.x and 5.x have -* a bug (which was fixed in 8.1, 7.3 and 6.5) where they might reorder -* volatile asm. The write functions are not affected since they have memory -* clobbers preventing reordering. To prevent reads from being reordered with -* respect to writes, use a dummy memory operand. -*/ - -#define __FORCE_ORDER "m"(*(unsigned int *)0x1000UL) -void native_write_cr0 (unsigned long val);static inline unsigned long native_read_cr0 (void ) {unsigned long val; - asm volatile("mov %%cr0,%0\n\t" : "=r" (val) : __FORCE_ORDER); + asmvolatile ("mov %%cr0,%0" :"=r" (val));return val; }static __always_inline unsigned long native_read_cr2 (void ) {unsigned long val; - asm volatile("mov %%cr2,%0\n\t" : "=r" (val) : __FORCE_ORDER); + asmvolatile ("mov %%cr2,%0" :"=r" (val));return val; }
@@ -45,7 +34,7 @@ static __always_inline void native_write_cr2(unsigned long val)static __always_inline unsigned long __native_read_cr3 (void ) {unsigned long val; - asm volatile("mov %%cr3,%0\n\t" : "=r" (val) : __FORCE_ORDER); + asmvolatile ("mov %%cr3,%0" :"=r" (val));return val; }
@@ -66,10 +55,10 @@ static inline unsigned long native_read_cr4(void) asm volatile("1: mov %%cr4, %0\n" "2:\n" _ASM_EXTABLE(1b, 2b) - : "=r" (val) : "0" (0), __FORCE_ORDER); + : "=r" (val) : "0" (0)); #else/* CR4 always exists on x86_64. */ - asm volatile("mov %%cr4,%0\n\t" : "=r" (val) : __FORCE_ORDER); + asmvolatile ("mov %%cr4,%0" :"=r" (val));#endif return val; }