Commit 239f2e24 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Peter Zijlstra
Browse files

x86/paravirt: Make struct paravirt_call_site unconditionally available 



For the upcoming call thunk patching it's less ifdeffery when the data
structure is unconditionally available. The code can then be trivially
fenced off with IS_ENABLED().

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220915111147.367853167@infradead.org
parent c22cf380

arch/x86/include/asm/paravirt.h

+2 −2
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ 
/* Various instructions on x86 need to be replaced for

 * para-virtualization: those hooks are defined here. */



#include <asm/paravirt_types.h>



#ifdef CONFIG_PARAVIRT

#include <asm/pgtable_types.h>

#include <asm/asm.h>

#include <asm/nospec-branch.h>



#include <asm/paravirt_types.h>



#ifndef __ASSEMBLY__

#include <linux/bug.h>

#include <linux/types.h>

arch/x86/include/asm/paravirt_types.h

+12 −8
Original line number Diff line number Diff line
@@ -2,6 +2,17 @@ 
#ifndef _ASM_X86_PARAVIRT_TYPES_H

#define _ASM_X86_PARAVIRT_TYPES_H



#ifndef __ASSEMBLY__

/* These all sit in the .parainstructions section to tell us what to patch. */

struct paravirt_patch_site {

	u8 *instr;		/* original instructions */

	u8 type;		/* type of this instruction */

	u8 len;			/* length of original instruction */

};

#endif



#ifdef CONFIG_PARAVIRT



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

#define CLBR_EAX  (1 << 0)

#define CLBR_ECX  (1 << 1)
@@ -593,16 +604,9 @@ unsigned long paravirt_ret0(void); 


#define paravirt_nop	((void *)_paravirt_nop)



/* These all sit in the .parainstructions section to tell us what to patch. */

struct paravirt_patch_site {

	u8 *instr;		/* original instructions */

	u8 type;		/* type of this instruction */

	u8 len;			/* length of original instruction */

};



extern struct paravirt_patch_site __parainstructions[],

	__parainstructions_end[];



#endif	/* __ASSEMBLY__ */



#endif  /* CONFIG_PARAVIRT */

#endif	/* _ASM_X86_PARAVIRT_TYPES_H */