Commit e59451fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_paravirt_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 paravirtualization fix from Borislav Petkov:
 "Define the INTERRUPT_RETURN macro only when CONFIG_XEN_PV is enabled
  as it is its only user"

* tag 'x86_paravirt_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/paravirt: Fix build PARAVIRT_XXL=y without XEN_PV
parents 191cf7fa 6da5175d

arch/x86/include/asm/irqflags.h

+5 −2
Original line number Diff line number Diff line
@@ -114,8 +114,6 @@ static __always_inline unsigned long arch_local_irq_save(void) 
#define SAVE_FLAGS		pushfq; popq %rax

#endif



#define INTERRUPT_RETURN	jmp native_iret



#endif



#endif /* __ASSEMBLY__ */
@@ -143,8 +141,13 @@ static __always_inline void arch_local_irq_restore(unsigned long flags) 
#ifdef CONFIG_X86_64

#ifdef CONFIG_XEN_PV

#define SWAPGS	ALTERNATIVE "swapgs", "", X86_FEATURE_XENPV

#define INTERRUPT_RETURN						\

	ANNOTATE_RETPOLINE_SAFE;					\

	ALTERNATIVE_TERNARY("jmp *paravirt_iret(%rip);",		\

		X86_FEATURE_XENPV, "jmp xen_iret;", "jmp native_iret;")

#else

#define SWAPGS	swapgs

#define INTERRUPT_RETURN	jmp native_iret

#endif

#endif

#endif /* !__ASSEMBLY__ */

arch/x86/include/asm/paravirt.h

+0 −5
Original line number Diff line number Diff line
@@ -752,11 +752,6 @@ extern void default_banner(void); 
#define PARA_SITE(ptype, ops)	_PVSITE(ptype, ops, .quad, 8)

#define PARA_INDIRECT(addr)	*addr(%rip)



#define INTERRUPT_RETURN						\

	ANNOTATE_RETPOLINE_SAFE;					\

	ALTERNATIVE_TERNARY("jmp *paravirt_iret(%rip);",		\

		X86_FEATURE_XENPV, "jmp xen_iret;", "jmp native_iret;")



#ifdef CONFIG_DEBUG_ENTRY

.macro PARA_IRQ_save_fl

	PARA_SITE(PARA_PATCH(PV_IRQ_save_fl),