um/asm: Replace "REP; NOP" with PAUSE mnemonic
Subsystems (2)
PATCH 1/1 um/asm: Replace "REP; NOP" with PAUSE mnemonic
Current minimum required version of binutils is 2.25, which supports PAUSE instruction mnemonic.
Replace "REP; NOP" with this proper mnemonic.
No functional change intended.
--- arch/x86/um/asm/processor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/um/asm/processor.h +1 -1
@@ -24,7 +24,7 @@/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ static __always_inline void rep_nop(void) { - __asm__ __volatile__("rep;nop" : : :"memory" ); + __asm__ __volatile__("pause" : : :"memory" ); } static __always_inline void cpu_relax(void)
Signature · 1 line
2.42.0
Quoted 25 lines · On Mon, 14 Apr 2025 16:55:57 +0200 Uros Bizjak <[email protected]> wrote:
Current minimum required version of binutils is 2.25, which supports PAUSE instruction mnemonic.
Replace "REP; NOP" with this proper mnemonic.
No functional change intended.
Signed-off-by Uros Bizjak <[email protected]>Cc Richard Weinberger <[email protected]>Cc Anton Ivanov <[email protected]>Cc Johannes Berg <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc Dave Hansen <[email protected]>Cc "H. Peter Anvin" <[email protected]>--- arch/x86/um/asm/processor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/x86/um/asm/processor.h +0
-0
arch/x86/um/asm/processor.h line 29
Quoted 7 lines
arch/x86/um/asm/processor.h +1
-1@@ -24,7 +24,7 @@/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ static __always_inline void rep_nop(void) { - __asm__ __volatile__("rep;nop" : : :"memory" ); + __asm__ __volatile__("pause" : : :"memory" ); }
That only makes sense if you also change the function name.
David
Quoted 1 line
arch/x86/um/asm/processor.h +0
-0static __always_inline void cpu_relax(void)
Quoted 24 lines · David Laight
Quoted 20 lines · On Mon, 14 Apr 2025 16:55:57 +0200 Uros Bizjak <[email protected]> wrote:
Current minimum required version of binutils is 2.25, which supports PAUSE instruction mnemonic.
Replace "REP; NOP" with this proper mnemonic.
No functional change intended.
Signed-off-by Uros Bizjak <[email protected]>Cc Richard Weinberger <[email protected]>Cc Anton Ivanov <[email protected]>Cc Johannes Berg <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc Dave Hansen <[email protected]>Cc "H. Peter Anvin" <[email protected]>--- arch/x86/um/asm/processor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 14 lines
arch/x86/um/asm/processor.h line 29
Quoted 12 lines
arch/x86/um/asm/processor.h +1
-1@@ -24,7 +24,7 @@/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ static __always_inline void rep_nop(void) { - __asm__ __volatile__("rep;nop" : : :"memory" ); + __asm__ __volatile__("pause" : : :"memory" ); }That only makes sense if you also change the function name.
This function is used in several places, and is also defined for x86 in arch/x86/include/asm/vdso/processor.h. The renaming should be coordinated with x86 and should definitely be a separate patch.
Uros.
Quoted 42 lines · Uros Bizjak
Quoted 24 lines · David Laight
Quoted 20 lines · On Mon, 14 Apr 2025 16:55:57 +0200 Uros Bizjak <[email protected]> wrote:
Current minimum required version of binutils is 2.25, which supports PAUSE instruction mnemonic.
Replace "REP; NOP" with this proper mnemonic.
No functional change intended.
Signed-off-by Uros Bizjak <[email protected]>Cc Richard Weinberger <[email protected]>Cc Anton Ivanov <[email protected]>Cc Johannes Berg <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc Dave Hansen <[email protected]>Cc "H. Peter Anvin" <[email protected]>--- arch/x86/um/asm/processor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Quoted 14 lines
arch/x86/um/asm/processor.h line 29
Quoted 12 lines
arch/x86/um/asm/processor.h +1
-1@@ -24,7 +24,7 @@/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ static __always_inline void rep_nop(void) { - __asm__ __volatile__("rep;nop" : : :"memory" ); + __asm__ __volatile__("pause" : : :"memory" ); }That only makes sense if you also change the function name.
Quoted 3 lines
This function is used in several places, and is also defined for x86 in
arch/x86/include/asm/vdso/processor.h. The renaming should be coordinated with x86 and should definitely be a separate patch.
Something like the attached patch that also moves (duplicated) function definition to a shared place.
Uros.
arch/x86/include/asm/special_insns.h +6 -0
@@ -115,6 +115,12 @@ static inline void wrpkru(u32 pkru) }#endif +/* PAUSE is a good thing to insert into busy-wait loops. */ +static __always_inline void native_pause(void) +{ + asmvolatile ("pause" : : :"memory" ); +} + static __always_inline void wbinvd(void) { asmvolatile ("wbinvd" : : :"memory" );
arch/x86/include/asm/vdso/processor.h +2 -6
@@ -7,15 +7,11 @@#ifndef __ASSEMBLER__ -/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ -static __always_inline void rep_nop(void) -{ - asmvolatile ("rep; nop" :::"memory" ); -} +#include <asm/special_insns.h> static __always_inline void cpu_relax(void) { -rep_nop (); +native_pause (); }struct getcpu_cache ;
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -1486,7 +1486,7 @@ static void __init delay_with_tsc(void)* 1 GHz == 40 jiffies */ do { -rep_nop (); +native_pause (); now =rdtsc (); }while ((now - start) <40000000000ULL /HZ &&time_before_eq (jiffies, end)); }
arch/x86/lib/delay.c +1 -1
@@ -75,7 +75,7 @@ static void delay_tsc(u64 cycles)/* Allow RT tasks to run */ preempt_enable (); -rep_nop (); +native_pause ();preempt_disable ();/*
arch/x86/um/asm/processor.h +2 -7
@@ -19,21 +19,16 @@#define ARCH_IS_STACKGROW (address) \ (address + 65536 + 32 * sizeof(unsigned long) >= UPT_SP(¤t->thread.regs.regs)) +#include <asm/special_insns.h> #include <asm/user.h> -/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ -static __always_inline void rep_nop(void) -{ - __asm__ __volatile__("rep;nop" : : :"memory" ); -} - static __always_inline void cpu_relax(void) {if (time_travel_mode ==TT_MODE_INFCPU || time_travel_mode ==TT_MODE_EXTERNAL )time_travel_ndelay (1 );else -rep_nop (); +native_pause (); }#define task_pt_regs (t) (&(t)->thread.regs)