Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 658be9d3 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

x86: change assembly definition of paravirt_patch_site 



To account for differences in x86_64, we change the macros that
create raw instances of the paravirt_patch_site struct.
We need to align 64-pointers to 64-bit boundaries, so we add an alignment
directive. Also, we need to make room for a word-sized pointer,
instead of a fixed 32-bit one

Signed-off-by: default avatarGlauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent e5aaac44

include/asm-x86/paravirt.h

+13 −3
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#ifdef CONFIG_PARAVIRT

#include <asm/page.h>

#include <asm/asm.h>



/* Bitmask of what can be clobbered: usually at least eax. */

#define CLBR_NONE 0x0
@@ -281,7 +282,8 @@ extern struct pv_mmu_ops pv_mmu_ops; 
#define _paravirt_alt(insn_string, type, clobber)	\

	"771:\n\t" insn_string "\n" "772:\n"		\

	".pushsection .parainstructions,\"a\"\n"	\

	"  .long 771b\n"				\

	_ASM_ALIGN "\n"					\

	_ASM_PTR " 771b\n"				\

	"  .byte " type "\n"				\

	"  .byte 772b-771b\n"				\

	"  .short " clobber "\n"			\
@@ -1159,17 +1161,25 @@ static inline unsigned long __raw_local_irq_save(void) 


#define PARA_PATCH(struct, off)	((PARAVIRT_PATCH_##struct + (off)) / 4)



#define PARA_SITE(ptype, clobbers, ops)		\

#define _PVSITE(ptype, clobbers, ops, word, algn)	\

771:;						\

	ops;					\

772:;						\

	.pushsection .parainstructions,"a";	\

	 .long 771b;				\

	 .align	algn;				\

	 word 771b;				\

	 .byte ptype;				\

	 .byte 772b-771b;			\

	 .short clobbers;			\

	.popsection





#ifdef CONFIG_X86_64

#define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .quad, 8)

#else

#define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)

#endif



#define INTERRUPT_RETURN						\

	PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_iret), CLBR_NONE,	\

		  jmp *%cs:pv_cpu_ops+PV_CPU_iret)