Commit 0cabf991 authored by Juergen Gross's avatar Juergen Gross Committed by Ingo Molnar
Browse files

x86/paravirt: Remove 32-bit support from CONFIG_PARAVIRT_XXL 



The last 32-bit user of stuff under CONFIG_PARAVIRT_XXL is gone.

Remove 32-bit specific parts.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200815100641.26362-2-jgross@suse.com
parent c9c9735c

arch/x86/entry/vdso/vdso32/vclock_gettime.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#undef CONFIG_ILLEGAL_POINTER_VALUE

#undef CONFIG_SPARSEMEM_VMEMMAP

#undef CONFIG_NR_CPUS

#undef CONFIG_PARAVIRT_XXL



#define CONFIG_X86_32 1

#define CONFIG_PGTABLE_LEVELS 2

arch/x86/include/asm/paravirt.h

+12 −108
Original line number Diff line number Diff line
@@ -160,8 +160,6 @@ static inline void wbinvd(void) 
	PVOP_VCALL0(cpu.wbinvd);

}



#define get_kernel_rpl()  (pv_info.kernel_rpl)



static inline u64 paravirt_read_msr(unsigned msr)

{

	return PVOP_CALL1(u64, cpu.read_msr, msr);
@@ -277,12 +275,10 @@ static inline void load_TLS(struct thread_struct *t, unsigned cpu) 
	PVOP_VCALL2(cpu.load_tls, t, cpu);

}



#ifdef CONFIG_X86_64

static inline void load_gs_index(unsigned int gs)

{

	PVOP_VCALL1(cpu.load_gs_index, gs);

}

#endif



static inline void write_ldt_entry(struct desc_struct *dt, int entry,

				   const void *desc)
@@ -375,52 +371,22 @@ static inline void paravirt_release_p4d(unsigned long pfn) 


static inline pte_t __pte(pteval_t val)

{

	pteval_t ret;



	if (sizeof(pteval_t) > sizeof(long))

		ret = PVOP_CALLEE2(pteval_t, mmu.make_pte, val, (u64)val >> 32);

	else

		ret = PVOP_CALLEE1(pteval_t, mmu.make_pte, val);



	return (pte_t) { .pte = ret };

	return (pte_t) { PVOP_CALLEE1(pteval_t, mmu.make_pte, val) };

}



static inline pteval_t pte_val(pte_t pte)

{

	pteval_t ret;



	if (sizeof(pteval_t) > sizeof(long))

		ret = PVOP_CALLEE2(pteval_t, mmu.pte_val,

				   pte.pte, (u64)pte.pte >> 32);

	else

		ret = PVOP_CALLEE1(pteval_t, mmu.pte_val, pte.pte);



	return ret;

	return PVOP_CALLEE1(pteval_t, mmu.pte_val, pte.pte);

}



static inline pgd_t __pgd(pgdval_t val)

{

	pgdval_t ret;



	if (sizeof(pgdval_t) > sizeof(long))

		ret = PVOP_CALLEE2(pgdval_t, mmu.make_pgd, val, (u64)val >> 32);

	else

		ret = PVOP_CALLEE1(pgdval_t, mmu.make_pgd, val);



	return (pgd_t) { ret };

	return (pgd_t) { PVOP_CALLEE1(pgdval_t, mmu.make_pgd, val) };

}



static inline pgdval_t pgd_val(pgd_t pgd)

{

	pgdval_t ret;



	if (sizeof(pgdval_t) > sizeof(long))

		ret =  PVOP_CALLEE2(pgdval_t, mmu.pgd_val,

				    pgd.pgd, (u64)pgd.pgd >> 32);

	else

		ret =  PVOP_CALLEE1(pgdval_t, mmu.pgd_val, pgd.pgd);



	return ret;

	return PVOP_CALLEE1(pgdval_t, mmu.pgd_val, pgd.pgd);

}



#define  __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION
@@ -438,78 +404,40 @@ static inline void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned 
					   pte_t *ptep, pte_t old_pte, pte_t pte)

{



	if (sizeof(pteval_t) > sizeof(long))

		/* 5 arg words */

		pv_ops.mmu.ptep_modify_prot_commit(vma, addr, ptep, pte);

	else

		PVOP_VCALL4(mmu.ptep_modify_prot_commit,

			    vma, addr, ptep, pte.pte);

	PVOP_VCALL4(mmu.ptep_modify_prot_commit, vma, addr, ptep, pte.pte);

}



static inline void set_pte(pte_t *ptep, pte_t pte)

{

	if (sizeof(pteval_t) > sizeof(long))

		PVOP_VCALL3(mmu.set_pte, ptep, pte.pte, (u64)pte.pte >> 32);

	else

	PVOP_VCALL2(mmu.set_pte, ptep, pte.pte);

}



static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,

			      pte_t *ptep, pte_t pte)

{

	if (sizeof(pteval_t) > sizeof(long))

		/* 5 arg words */

		pv_ops.mmu.set_pte_at(mm, addr, ptep, pte);

	else

	PVOP_VCALL4(mmu.set_pte_at, mm, addr, ptep, pte.pte);

}



static inline void set_pmd(pmd_t *pmdp, pmd_t pmd)

{

	pmdval_t val = native_pmd_val(pmd);



	if (sizeof(pmdval_t) > sizeof(long))

		PVOP_VCALL3(mmu.set_pmd, pmdp, val, (u64)val >> 32);

	else

		PVOP_VCALL2(mmu.set_pmd, pmdp, val);

	PVOP_VCALL2(mmu.set_pmd, pmdp, native_pmd_val(pmd));

}



#if CONFIG_PGTABLE_LEVELS >= 3

static inline pmd_t __pmd(pmdval_t val)

{

	pmdval_t ret;



	if (sizeof(pmdval_t) > sizeof(long))

		ret = PVOP_CALLEE2(pmdval_t, mmu.make_pmd, val, (u64)val >> 32);

	else

		ret = PVOP_CALLEE1(pmdval_t, mmu.make_pmd, val);



	return (pmd_t) { ret };

	return (pmd_t) { PVOP_CALLEE1(pmdval_t, mmu.make_pmd, val) };

}



static inline pmdval_t pmd_val(pmd_t pmd)

{

	pmdval_t ret;



	if (sizeof(pmdval_t) > sizeof(long))

		ret =  PVOP_CALLEE2(pmdval_t, mmu.pmd_val,

				    pmd.pmd, (u64)pmd.pmd >> 32);

	else

		ret =  PVOP_CALLEE1(pmdval_t, mmu.pmd_val, pmd.pmd);



	return ret;

	return PVOP_CALLEE1(pmdval_t, mmu.pmd_val, pmd.pmd);

}



static inline void set_pud(pud_t *pudp, pud_t pud)

{

	pudval_t val = native_pud_val(pud);



	if (sizeof(pudval_t) > sizeof(long))

		PVOP_VCALL3(mmu.set_pud, pudp, val, (u64)val >> 32);

	else

		PVOP_VCALL2(mmu.set_pud, pudp, val);

	PVOP_VCALL2(mmu.set_pud, pudp, native_pud_val(pud));

}

#if CONFIG_PGTABLE_LEVELS >= 4



static inline pud_t __pud(pudval_t val)

{

	pudval_t ret;
@@ -574,29 +502,6 @@ static inline void p4d_clear(p4d_t *p4dp) 
	set_p4d(p4dp, __p4d(0));

}



#endif	/* CONFIG_PGTABLE_LEVELS == 4 */



#endif	/* CONFIG_PGTABLE_LEVELS >= 3 */



#ifdef CONFIG_X86_PAE

/* Special-case pte-setting operations for PAE, which can't update a

   64-bit pte atomically */

static inline void set_pte_atomic(pte_t *ptep, pte_t pte)

{

	PVOP_VCALL3(mmu.set_pte_atomic, ptep, pte.pte, pte.pte >> 32);

}



static inline void pte_clear(struct mm_struct *mm, unsigned long addr,

			     pte_t *ptep)

{

	PVOP_VCALL3(mmu.pte_clear, mm, addr, ptep);

}



static inline void pmd_clear(pmd_t *pmdp)

{

	PVOP_VCALL1(mmu.pmd_clear, pmdp);

}

#else  /* !CONFIG_X86_PAE */

static inline void set_pte_atomic(pte_t *ptep, pte_t pte)

{

	set_pte(ptep, pte);
@@ -612,7 +517,6 @@ static inline void pmd_clear(pmd_t *pmdp) 
{

	set_pmd(pmdp, __pmd(0));

}

#endif	/* CONFIG_X86_PAE */



#define  __HAVE_ARCH_START_CONTEXT_SWITCH

static inline void arch_start_context_switch(struct task_struct *prev)

arch/x86/include/asm/paravirt_types.h

+0 −21
Original line number Diff line number Diff line
@@ -68,12 +68,7 @@ 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;
@@ -126,9 +121,7 @@ struct pv_cpu_ops { 
	void (*set_ldt)(const void *desc, unsigned entries);

	unsigned long (*store_tr)(void);

	void (*load_tls)(struct thread_struct *t, unsigned int cpu);

#ifdef CONFIG_X86_64

	void (*load_gs_index)(unsigned int idx);

#endif

	void (*write_ldt_entry)(struct desc_struct *ldt, int entrynum,

				const void *desc);

	void (*write_gdt_entry)(struct desc_struct *,
@@ -264,21 +257,11 @@ struct pv_mmu_ops { 
	struct paravirt_callee_save pgd_val;

	struct paravirt_callee_save make_pgd;



#if CONFIG_PGTABLE_LEVELS >= 3

#ifdef CONFIG_X86_PAE

	void (*set_pte_atomic)(pte_t *ptep, pte_t pteval);

	void (*pte_clear)(struct mm_struct *mm, unsigned long addr,

			  pte_t *ptep);

	void (*pmd_clear)(pmd_t *pmdp);



#endif	/* CONFIG_X86_PAE */



	void (*set_pud)(pud_t *pudp, pud_t pudval);



	struct paravirt_callee_save pmd_val;

	struct paravirt_callee_save make_pmd;



#if CONFIG_PGTABLE_LEVELS >= 4

	struct paravirt_callee_save pud_val;

	struct paravirt_callee_save make_pud;
@@ -291,10 +274,6 @@ struct pv_mmu_ops { 
	void (*set_pgd)(pgd_t *pgdp, pgd_t pgdval);

#endif	/* CONFIG_PGTABLE_LEVELS >= 5 */



#endif	/* CONFIG_PGTABLE_LEVELS >= 4 */



#endif	/* CONFIG_PGTABLE_LEVELS >= 3 */



	struct pv_lazy_ops lazy_mode;



	/* dom0 ops */

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

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

#endif	/* !__ASSEMBLY__ */



#ifdef CONFIG_PARAVIRT_XXL

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

				 (pv_info.shared_kernel_pmd)))

#else

#define SHARED_KERNEL_PMD	(!static_cpu_has(X86_FEATURE_PTI))

#endif



#define ARCH_PAGE_TABLE_SYNC_MASK	(SHARED_KERNEL_PMD ? 0 : PGTBL_PMD_MODIFIED)

arch/x86/include/asm/segment.h

+0 −4
Original line number Diff line number Diff line
@@ -222,10 +222,6 @@ 


#endif



#ifndef CONFIG_PARAVIRT_XXL

# define get_kernel_rpl()		0

#endif



#define IDT_ENTRIES			256

#define NUM_EXCEPTION_VECTORS		32

CRA Git | Maintained and supported by SUSTech CRA and CCSE