x86/idle: Use MONITOR and MWAIT mnemonics in <asm/mwait.h>
PATCH v3 1/1 x86/idle: Use MONITOR and MWAIT mnemonics in <asm/mwait.h>
Current minimum required version of binutils is 2.25, which supports MONITOR and MWAIT instruction mnemonics.
Replace the byte-wise specification of MONITOR and MWAIT with these proper mnemonics.
No functional change intended.
Note: LLVM assembler is not able to assemble correct forms of MONITOR and MWAIT instructions with explicit operands and reports [1]:
error: invalid operand for instruction
monitor %rax,%ecx,%edx
^~~~Use instruction mnemonics with implicit operands to work around this issue.
[1] https://lore.kernel.org/oe-kbuild-all/[email protected]/
---
v3: Use instruction mnemonics with implicit operands.
--- arch/x86/include/asm/mwait.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
arch/x86/include/asm/mwait.h +8 -9
@@ -27,9 +27,9 @@ static __always_inline void __monitor(const void *eax, u32 ecx, u32 edx) { -/* "monitor %eax, %ecx, %edx;" */ - asmvolatile (".byte 0x0f, 0x01, 0xc8;" - ::"a" (eax),"c" (ecx),"d" (edx)); +/* Use the instruction mnemonic with implicit operands, as the LLVM +assembler fails to assemble the mnemonic with explicit operands. */ + asmvolatile ("monitor" ::"a" (eax),"c" (ecx),"d" (edx)); } static __always_inline void __monitorx(const void *eax, u32 ecx, u32 edx)
@@ -43,9 +43,9 @@ static __always_inline void __mwait(u32 eax, u32 ecx) {mds_idle_clear_cpu_buffers (); -/* "mwait %eax, %ecx;" */ - asmvolatile (".byte 0x0f, 0x01, 0xc9;" - ::"a" (eax),"c" (ecx)); +/* Use the instruction mnemonic with implicit operands, as the LLVM +assembler fails to assemble the mnemonic with explicit operands. */ + asmvolatile ("mwait" ::"a" (eax),"c" (ecx)); }/*
@@ -95,9 +95,8 @@ static __always_inline void __mwaitx(u32 eax, u32 ebx, u32 ecx) static __always_inline void __sti_mwait(u32 eax, u32 ecx) {mds_idle_clear_cpu_buffers (); -/* "mwait %eax, %ecx;" */ - asmvolatile ("sti; .byte 0x0f, 0x01, 0xc9;" - ::"a" (eax),"c" (ecx)); + + asmvolatile ("sti; mwait" ::"a" (eax),"c" (ecx)); }/*
Signature · 1 line
2.49.0
arch/x86/include/asm/mwait.h line 31
Quoted 7 lines · Uros Bizjak
static
__always_inlinevoid__monitor(const void *eax, u32 ecx, u32 edx){arch/x86/include/asm/mwait.h +2
-3-/* "monitor %eax, %ecx, %edx;" */ - asmvolatile (".byte 0x0f, 0x01, 0xc8;" - ::"a" (eax),"c" (ecx),"d" (edx)); +/* Use the instruction mnemonic with implicit operands, as the LLVM +assembler fails to assemble the mnemonic with explicit operands. */
mingo, pls fix up that comment style and in the other spot when applying.
Other than that:
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteThe following commit has been merged into the x86/mm branch of tip:
The following commit has been merged into the x86/mm branch of tip:
Commit-ID: defea9e60d3f440ca8da070a478f668fec0ba659 Gitweb: https://git.kernel.org/tip/defea9e60d3f440ca8da070a478f668fec0ba659 Author: Uros Bizjak <[email protected]> AuthorDate: Thu, 03 Apr 2025 14:50:45 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Thu, 03 Apr 2025 15:27:50 +02:00
x86/idle: Use MONITOR and MWAIT mnemonics in <asm/mwait.h>
Current minimum required version of binutils is 2.25, which supports MONITOR and MWAIT instruction mnemonics.
Replace the byte-wise specification of MONITOR and MWAIT with these proper mnemonics.
No functional change intended.
Note: LLVM assembler is not able to assemble correct forms of MONITOR and MWAIT instructions with explicit operands and reports:
error: invalid operand for instruction
monitor %rax,%ecx,%edx
^~~~# https://lore.kernel.org/oe-kbuild-all/[email protected]/
Use instruction mnemonics with implicit operands to work around this issue.
--- arch/x86/include/asm/mwait.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
arch/x86/include/asm/mwait.h +8 -9
@@ -27,9 +27,9 @@ static __always_inline void __monitor(const void *eax, u32 ecx, u32 edx) { -/* "monitor %eax, %ecx, %edx;" */ - asmvolatile (".byte 0x0f, 0x01, 0xc8;" - ::"a" (eax),"c" (ecx),"d" (edx)); +/* Use the instruction mnemonic with implicit operands, as the LLVM +assembler fails to assemble the mnemonic with explicit operands. */ + asmvolatile ("monitor" ::"a" (eax),"c" (ecx),"d" (edx)); } static __always_inline void __monitorx(const void *eax, u32 ecx, u32 edx)
@@ -43,9 +43,9 @@ static __always_inline void __mwait(u32 eax, u32 ecx) {mds_idle_clear_cpu_buffers (); -/* "mwait %eax, %ecx;" */ - asmvolatile (".byte 0x0f, 0x01, 0xc9;" - ::"a" (eax),"c" (ecx)); +/* Use the instruction mnemonic with implicit operands, as the LLVM +assembler fails to assemble the mnemonic with explicit operands. */ + asmvolatile ("mwait" ::"a" (eax),"c" (ecx)); }/*
@@ -95,9 +95,8 @@ static __always_inline void __mwaitx(u32 eax, u32 ebx, u32 ecx) static __always_inline void __sti_mwait(u32 eax, u32 ecx) {mds_idle_clear_cpu_buffers (); -/* "mwait %eax, %ecx;" */ - asmvolatile ("sti; .byte 0x0f, 0x01, 0xc9;" - ::"a" (eax),"c" (ecx)); + + asmvolatile ("sti; mwait" ::"a" (eax),"c" (ecx)); }/*
The following commit has been merged into the x86/mm branch of tip:
The following commit has been merged into the x86/mm branch of tip:
Commit-ID: fc1cd60042b3df1d162278461c7a87f0362502b8 Gitweb: https://git.kernel.org/tip/fc1cd60042b3df1d162278461c7a87f0362502b8 Author: Uros Bizjak <[email protected]> AuthorDate: Thu, 03 Apr 2025 14:50:45 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Thu, 03 Apr 2025 16:28:38 +02:00
x86/idle: Use MONITOR and MWAIT mnemonics in <asm/mwait.h>
Current minimum required version of binutils is 2.25, which supports MONITOR and MWAIT instruction mnemonics.
Replace the byte-wise specification of MONITOR and MWAIT with these proper mnemonics.
No functional change intended.
Note: LLVM assembler is not able to assemble correct forms of MONITOR and MWAIT instructions with explicit operands and reports:
error: invalid operand for instruction
monitor %rax,%ecx,%edx
^~~~# https://lore.kernel.org/oe-kbuild-all/[email protected]/
Use instruction mnemonics with implicit operands to work around this issue.
--- arch/x86/include/asm/mwait.h | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
arch/x86/include/asm/mwait.h +12 -9
@@ -27,9 +27,11 @@ static __always_inline void __monitor(const void *eax, u32 ecx, u32 edx) { -/* "monitor %eax, %ecx, %edx;" */ - asmvolatile (".byte 0x0f, 0x01, 0xc8;" - ::"a" (eax),"c" (ecx),"d" (edx)); +/* +* Use the instruction mnemonic with implicit operands, as the LLVM +* assembler fails to assemble the mnemonic with explicit operands: +*/ + asmvolatile ("monitor" ::"a" (eax),"c" (ecx),"d" (edx)); } static __always_inline void __monitorx(const void *eax, u32 ecx, u32 edx)
@@ -43,9 +45,11 @@ static __always_inline void __mwait(u32 eax, u32 ecx) {mds_idle_clear_cpu_buffers (); -/* "mwait %eax, %ecx;" */ - asmvolatile (".byte 0x0f, 0x01, 0xc9;" - ::"a" (eax),"c" (ecx)); +/* +* Use the instruction mnemonic with implicit operands, as the LLVM +* assembler fails to assemble the mnemonic with explicit operands: +*/ + asmvolatile ("mwait" ::"a" (eax),"c" (ecx)); }/*
@@ -95,9 +99,8 @@ static __always_inline void __mwaitx(u32 eax, u32 ebx, u32 ecx) static __always_inline void __sti_mwait(u32 eax, u32 ecx) {mds_idle_clear_cpu_buffers (); -/* "mwait %eax, %ecx;" */ - asmvolatile ("sti; .byte 0x0f, 0x01, 0xc9;" - ::"a" (eax),"c" (ecx)); + + asmvolatile ("sti; mwait" ::"a" (eax),"c" (ecx)); }/*