Commit 40181646 authored by Juergen Gross's avatar Juergen Gross Committed by Thomas Gleixner
Browse files

x86/paravirt: Move items in pv_info under PARAVIRT_XXL umbrella 



All items but name in pv_info are needed by Xen PV only. Define them
with CONFIG_PARAVIRT_XXL set only.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: xen-devel@lists.xenproject.org
Cc: virtualization@lists.linux-foundation.org
Cc: akataria@vmware.com
Cc: rusty@rustcorp.com.au
Cc: boris.ostrovsky@oracle.com
Cc: hpa@zytor.com
Link: https://lkml.kernel.org/r/20180828074026.820-12-jgross@suse.com
parent c00a280a

arch/x86/include/asm/paravirt.h

+2 −0
Original line number Diff line number Diff line
@@ -104,7 +104,9 @@ static inline void wbinvd(void) 
	PVOP_VCALL0(cpu.wbinvd);

}



#ifdef CONFIG_PARAVIRT_XXL

#define get_kernel_rpl()  (pv_info.kernel_rpl)

#endif



static inline u64 paravirt_read_msr(unsigned msr)

{

arch/x86/include/asm/paravirt_types.h

+2 −0
Original line number Diff line number Diff line
@@ -66,11 +66,13 @@ struct paravirt_callee_save { 


/* general info */

struct pv_info {

#ifdef CONFIG_PARAVIRT_XXL

	unsigned int kernel_rpl;

	int shared_kernel_pmd;



#ifdef CONFIG_X86_64

	u16 extra_user_64bit_cs;  /* __USER_CS if none */

#endif

#endif



	const char *name;

arch/x86/include/asm/pgtable-3level_types.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ typedef union { 
} pte_t;

#endif	/* !__ASSEMBLY__ */



#ifdef CONFIG_PARAVIRT

#ifdef CONFIG_PARAVIRT_XXL

#define SHARED_KERNEL_PMD	((!static_cpu_has(X86_FEATURE_PTI) &&	\

				 (pv_info.shared_kernel_pmd)))

#else

arch/x86/include/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static inline int v8086_mode(struct pt_regs *regs) 
static inline bool user_64bit_mode(struct pt_regs *regs)

{

#ifdef CONFIG_X86_64

#ifndef CONFIG_PARAVIRT

#ifndef CONFIG_PARAVIRT_XXL

	/*

	 * On non-paravirt systems, this is the only long mode CPL 3

	 * selector.  We do not allow long mode selectors in the LDT.

arch/x86/include/asm/segment.h

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ 


#endif



#ifndef CONFIG_PARAVIRT

#ifndef CONFIG_PARAVIRT_XXL

# define get_kernel_rpl()		0

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE