x86/asm: Rename rep_nop() to native_pause()
PATCH v2 1/2 x86/asm: Rename rep_nop() to native_pause()
Rename rep_nop() function to what it really does.
No functional change intended.
---
v2: Rename rep_nop() to native_pause() first.
--- arch/x86/include/asm/vdso/processor.h | 4 ++-- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/lib/delay.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/include/asm/vdso/processor.h +2 -2
@@ -8,14 +8,14 @@#ifndef __ASSEMBLER__/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ -static __always_inline void rep_nop(void) +static __always_inline void native_pause(void) { asmvolatile ("rep; nop" :::"memory" ); } 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 ();/*
Signature · 1 line
2.49.0
PATCH v2 2/2 x86/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.
---
v2: Rename rep_nop() to native_pause() first.
--- arch/x86/boot/boot.h | 2 +- arch/x86/include/asm/vdso/processor.h | 4 ++-- arch/x86/kernel/relocate_kernel_64.S | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/x86/boot/boot.h +1 -1
@@ -34,7 +34,7 @@extern struct setup_header hdr;extern struct boot_params boot_params; -#define cpu_relax () asm volatile("rep; nop") +#define cpu_relax () asm volatile("pause")static inline void io_delay (void ) {
arch/x86/include/asm/vdso/processor.h +2 -2
@@ -7,10 +7,10 @@#ifndef __ASSEMBLER__ -/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ +/* PAUSE is a good thing to insert into busy-wait loops. */ static __always_inline void native_pause(void) { - asmvolatile ("rep; nop" :::"memory" ); + asmvolatile ("pause" :::"memory" ); } static __always_inline void cpu_relax(void)
arch/x86/kernel/relocate_kernel_64.S +2 -2
@@ -405,7 +405,7 @@ SYM_CODE_START_LOCAL_NOALIGN(pr_char_8250) inb %dx, %al testb $XMTRDY, %al jnz .Lready - rep nop + pause jmp .Lxmtrdy_loop .Lready:
@@ -426,7 +426,7 @@ SYM_CODE_START_LOCAL_NOALIGN(pr_char_8250_mmio32) movb (LSR*4)(%rdx), %ah testb $XMTRDY, %ah jnz .Lready_mmio - rep nop + pause jmp .Lxmtrdy_loop_mmio .Lready_mmio:
Signature · 1 line
2.49.0
[tip: x86/asm] x86/asm: Replace "REP; NOP" with PAUSE mnemonic
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: d109ff4f0bc32de354247a6e8ede3ffc8ef14cd0 Gitweb: https://git.kernel.org/tip/d109ff4f0bc32de354247a6e8ede3ffc8ef14cd0 Author: Uros Bizjak <[email protected]> AuthorDate: Fri, 18 Apr 2025 10:07:44 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 18 Apr 2025 10:19:25 +02:00
x86/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/boot/boot.h | 2 +- arch/x86/include/asm/vdso/processor.h | 4 ++-- arch/x86/kernel/relocate_kernel_64.S | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
arch/x86/boot/boot.h +1 -1
@@ -34,7 +34,7 @@extern struct setup_header hdr;extern struct boot_params boot_params; -#define cpu_relax () asm volatile("rep; nop") +#define cpu_relax () asm volatile("pause")static inline void io_delay (void ) {
arch/x86/include/asm/vdso/processor.h +2 -2
@@ -7,10 +7,10 @@#ifndef __ASSEMBLER__ -/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ +/* PAUSE is a good thing to insert into busy-wait loops. */ static __always_inline void rep_nop(void) { - asmvolatile ("rep; nop" :::"memory" ); + asmvolatile ("pause" :::"memory" ); } static __always_inline void cpu_relax(void)
arch/x86/kernel/relocate_kernel_64.S +2 -2
@@ -405,7 +405,7 @@ SYM_CODE_START_LOCAL_NOALIGN(pr_char_8250) inb %dx, %al testb $XMTRDY, %al jnz .Lready - rep nop + pause jmp .Lxmtrdy_loop .Lready:
@@ -426,7 +426,7 @@ SYM_CODE_START_LOCAL_NOALIGN(pr_char_8250_mmio32) movb (LSR*4)(%rdx), %ah testb $XMTRDY, %ah jnz .Lready_mmio - rep nop + pause jmp .Lxmtrdy_loop_mmio .Lready_mmio:
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: 3ce4b1f1f24bbd9f1c349ecb6641dfa038bd0b5a Gitweb: https://git.kernel.org/tip/3ce4b1f1f24bbd9f1c349ecb6641dfa038bd0b5a Author: Uros Bizjak <[email protected]> AuthorDate: Fri, 18 Apr 2025 10:07:43 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 18 Apr 2025 10:19:26 +02:00
x86/asm: Rename rep_nop() to native_pause()
Rename rep_nop() function to what it really does.
No functional change intended.
--- arch/x86/include/asm/vdso/processor.h | 4 ++-- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/lib/delay.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/include/asm/vdso/processor.h +2 -2
@@ -8,14 +8,14 @@#ifndef __ASSEMBLER__/* PAUSE is a good thing to insert into busy-wait loops. */ -static __always_inline void rep_nop(void) +static __always_inline void native_pause(void) { asmvolatile ("pause" :::"memory" ); } 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 ();/*