x86/paravirt: Remove trailing semicolons from alternative asm templates
Subsystems (3)
PATCH RESEND 1/2 x86/paravirt: Remove trailing semicolons from alternative asm templates
GCC inline asm treats semicolons as instruction separators, so a semicolon after the last instruction is not required.
--- arch/x86/include/asm/paravirt-spinlock.h | 4 ++-- arch/x86/include/asm/paravirt.h | 16 ++++++++-------- arch/x86/include/asm/paravirt_types.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-)
arch/x86/include/asm/paravirt-spinlock.h +2 -2
@@ -38,14 +38,14 @@ static __always_inline void pv_queued_spin_lock_slowpath(struct qspinlock *lock, static __always_inline void pv_queued_spin_unlock(struct qspinlock *lock) {PVOP_ALT_VCALLEE1 (pv_ops_lock, queued_spin_unlock, lock, -"movb $0, (%%" _ASM_ARG1");" , +"movb $0, (%%" _ASM_ARG1")" ,ALT_NOT (X86_FEATURE_PVUNLOCK )); } static __always_inline bool pv_vcpu_is_preempted(long cpu) {return PVOP_ALT_CALLEE1 (bool, pv_ops_lock, vcpu_is_preempted, cpu, -"xor %%" _ASM_AX", %%" _ASM_AX";" , +"xor %%" _ASM_AX", %%" _ASM_AX,ALT_NOT (X86_FEATURE_VCPUPREEMPT )); }
arch/x86/include/asm/paravirt.h +8 -8
@@ -117,7 +117,7 @@ static inline void write_cr0(unsigned long x)static __always_inline unsigned long read_cr2 (void ) { return PVOP_ALT_CALLEE0(unsigned long, pv_ops, mmu.read_cr2, -"mov %%cr2, %%rax;" ,ALT_NOT_XEN ); +"mov %%cr2, %%rax" ,ALT_NOT_XEN ); } static __always_inline void write_cr2(unsigned long x)
@@ -128,7 +128,7 @@ static __always_inline void write_cr2(unsigned long x)static inline unsigned long __read_cr3 (void ) { return PVOP_ALT_CALL0(unsigned long, pv_ops, mmu.read_cr3, -"mov %%cr3, %%rax;" ,ALT_NOT_XEN ); +"mov %%cr3, %%rax" ,ALT_NOT_XEN ); }static inline void write_cr3 (unsigned long x)
@@ -516,18 +516,18 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,static __always_inline unsigned long arch_local_save_flags (void ) { - return PVOP_ALT_CALLEE0(unsigned long, pv_ops, irq.save_fl, "pushf; pop %%rax;", + return PVOP_ALT_CALLEE0(unsigned long, pv_ops, irq.save_fl, "pushf; pop %%rax",ALT_NOT_XEN ); } static __always_inline void arch_local_irq_disable(void) { -PVOP_ALT_VCALLEE0 (pv_ops, irq.irq_disable,"cli;" ,ALT_NOT_XEN ); +PVOP_ALT_VCALLEE0 (pv_ops, irq.irq_disable,"cli" ,ALT_NOT_XEN ); } static __always_inline void arch_local_irq_enable(void) { -PVOP_ALT_VCALLEE0 (pv_ops, irq.irq_enable,"sti;" ,ALT_NOT_XEN ); +PVOP_ALT_VCALLEE0 (pv_ops, irq.irq_enable,"sti" ,ALT_NOT_XEN ); }static __always_inline unsigned long arch_local_irq_save (void )
@@ -553,9 +553,9 @@ static __always_inline unsigned long arch_local_irq_save(void) call PARA_INDIRECT(pv_ops+PV_IRQ_save_fl); .endm -#define SAVE_FLAGS ALTERNATIVE_2 "PARA_IRQ_save_fl;", \ - "ALT_CALL_INSTR;", ALT_CALL_ALWAYS, \ - "pushf; pop %rax;", ALT_NOT_XEN +#define SAVE_FLAGS ALTERNATIVE_2 "PARA_IRQ_save_fl", \ + "ALT_CALL_INSTR", ALT_CALL_ALWAYS, \ + "pushf; pop %rax", ALT_NOT_XEN#endif #endif /* CONFIG_PARAVIRT_XXL */ #endif /* CONFIG_X86_64 */
arch/x86/include/asm/paravirt_types.h +1 -1
@@ -210,7 +210,7 @@ extern struct paravirt_patch_template pv_ops;*/ #define PARAVIRT_CALL \ ANNOTATE_RETPOLINE_SAFE "\n\t" \ - "call *%[paravirt_opptr];" + "call *%[paravirt_opptr]"/* * These macros are intended to wrap calls through one of the paravirt
Signature · 1 line
2.52.0
PATCH RESEND 2/2 x86/paravirt: Use XOR r32,r32 to clear register in pv_vcpu_is_preempted()
x86_64 zero extends 32bit operations, so for 64bit operands, XOR r32,r32 is functionally equal to XOR r64,r64, but avoids a REX prefix byte when legacy registers are used.
--- arch/x86/include/asm/paravirt-spinlock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/paravirt-spinlock.h +1 -1
@@ -45,7 +45,7 @@ static __always_inline void pv_queued_spin_unlock(struct qspinlock *lock) static __always_inline bool pv_vcpu_is_preempted(long cpu) {return PVOP_ALT_CALLEE1 (bool, pv_ops_lock, vcpu_is_preempted, cpu, -"xor %%" _ASM_AX", %%" _ASM_AX, +"xor %%eax, %%eax" ,ALT_NOT (X86_FEATURE_VCPUPREEMPT )); }
Signature · 1 line
2.52.0
[tip: x86/paravirt] x86/paravirt: Use XOR r32,r32 to clear register in pv_vcpu_is_preempted()
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: 31911d3c394d6556a67ff63cf0093049ef6dcdd7 Gitweb: https://git.kernel.org/tip/31911d3c394d6556a67ff63cf0093049ef6dcdd7 Author: Uros Bizjak <[email protected]> AuthorDate: Wed, 14 Jan 2026 22:18:15 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Thu, 15 Jan 2026 11:44:29 +01:00
x86/paravirt: Use XOR r32,r32 to clear register in pv_vcpu_is_preempted()
x86_64 zero extends 32bit operations, so for 64bit operands, XOR r32,r32 is functionally equal to XOR r64,r64, but avoids a REX prefix byte when legacy registers are used.
--- arch/x86/include/asm/paravirt-spinlock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/include/asm/paravirt-spinlock.h +1 -1
@@ -45,7 +45,7 @@ static __always_inline void pv_queued_spin_unlock(struct qspinlock *lock) static __always_inline bool pv_vcpu_is_preempted(long cpu) {return PVOP_ALT_CALLEE1 (bool, pv_ops_lock, vcpu_is_preempted, cpu, -"xor %%" _ASM_AX", %%" _ASM_AX, +"xor %%eax, %%eax" ,ALT_NOT (X86_FEATURE_VCPUPREEMPT )); }
The following commit has been merged into the x86/paravirt branch of tip:
The following commit has been merged into the x86/paravirt branch of tip:
Commit-ID: baea32b242be8ff857cc27b910c6c325c24a7247 Gitweb: https://git.kernel.org/tip/baea32b242be8ff857cc27b910c6c325c24a7247 Author: Uros Bizjak <[email protected]> AuthorDate: Wed, 14 Jan 2026 22:18:14 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Thu, 15 Jan 2026 11:14:47 +01:00
x86/paravirt: Remove trailing semicolons from alternative asm templates
GCC inline asm treats semicolons as instruction separators, so a semicolon after the last instruction is not required.
--- arch/x86/include/asm/paravirt-spinlock.h | 4 ++-- arch/x86/include/asm/paravirt.h | 16 ++++++++-------- arch/x86/include/asm/paravirt_types.h | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-)
arch/x86/include/asm/paravirt-spinlock.h +2 -2
@@ -38,14 +38,14 @@ static __always_inline void pv_queued_spin_lock_slowpath(struct qspinlock *lock, static __always_inline void pv_queued_spin_unlock(struct qspinlock *lock) {PVOP_ALT_VCALLEE1 (pv_ops_lock, queued_spin_unlock, lock, -"movb $0, (%%" _ASM_ARG1");" , +"movb $0, (%%" _ASM_ARG1")" ,ALT_NOT (X86_FEATURE_PVUNLOCK )); } static __always_inline bool pv_vcpu_is_preempted(long cpu) {return PVOP_ALT_CALLEE1 (bool, pv_ops_lock, vcpu_is_preempted, cpu, -"xor %%" _ASM_AX", %%" _ASM_AX";" , +"xor %%" _ASM_AX", %%" _ASM_AX,ALT_NOT (X86_FEATURE_VCPUPREEMPT )); }
arch/x86/include/asm/paravirt.h +8 -8
@@ -117,7 +117,7 @@ static inline void write_cr0(unsigned long x)static __always_inline unsigned long read_cr2 (void ) { return PVOP_ALT_CALLEE0(unsigned long, pv_ops, mmu.read_cr2, -"mov %%cr2, %%rax;" ,ALT_NOT_XEN ); +"mov %%cr2, %%rax" ,ALT_NOT_XEN ); } static __always_inline void write_cr2(unsigned long x)
@@ -128,7 +128,7 @@ static __always_inline void write_cr2(unsigned long x)static inline unsigned long __read_cr3 (void ) { return PVOP_ALT_CALL0(unsigned long, pv_ops, mmu.read_cr3, -"mov %%cr3, %%rax;" ,ALT_NOT_XEN ); +"mov %%cr3, %%rax" ,ALT_NOT_XEN ); }static inline void write_cr3 (unsigned long x)
@@ -516,18 +516,18 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,static __always_inline unsigned long arch_local_save_flags (void ) { - return PVOP_ALT_CALLEE0(unsigned long, pv_ops, irq.save_fl, "pushf; pop %%rax;", + return PVOP_ALT_CALLEE0(unsigned long, pv_ops, irq.save_fl, "pushf; pop %%rax",ALT_NOT_XEN ); } static __always_inline void arch_local_irq_disable(void) { -PVOP_ALT_VCALLEE0 (pv_ops, irq.irq_disable,"cli;" ,ALT_NOT_XEN ); +PVOP_ALT_VCALLEE0 (pv_ops, irq.irq_disable,"cli" ,ALT_NOT_XEN ); } static __always_inline void arch_local_irq_enable(void) { -PVOP_ALT_VCALLEE0 (pv_ops, irq.irq_enable,"sti;" ,ALT_NOT_XEN ); +PVOP_ALT_VCALLEE0 (pv_ops, irq.irq_enable,"sti" ,ALT_NOT_XEN ); }static __always_inline unsigned long arch_local_irq_save (void )
@@ -553,9 +553,9 @@ static __always_inline unsigned long arch_local_irq_save(void) call PARA_INDIRECT(pv_ops+PV_IRQ_save_fl); .endm -#define SAVE_FLAGS ALTERNATIVE_2 "PARA_IRQ_save_fl;", \ - "ALT_CALL_INSTR;", ALT_CALL_ALWAYS, \ - "pushf; pop %rax;", ALT_NOT_XEN +#define SAVE_FLAGS ALTERNATIVE_2 "PARA_IRQ_save_fl", \ + "ALT_CALL_INSTR", ALT_CALL_ALWAYS, \ + "pushf; pop %rax", ALT_NOT_XEN#endif #endif /* CONFIG_PARAVIRT_XXL */ #endif /* CONFIG_X86_64 */
arch/x86/include/asm/paravirt_types.h +1 -1
@@ -210,7 +210,7 @@ extern struct paravirt_patch_template pv_ops;*/ #define PARAVIRT_CALL \ ANNOTATE_RETPOLINE_SAFE "\n\t" \ - "call *%[paravirt_opptr];" + "call *%[paravirt_opptr]"/* * These macros are intended to wrap calls through one of the paravirt