Commit 4eed80cd authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86/paravirt: make set_pte operations common 



Remove duplicate set_pte* operations.  PAE still needs to have special
variants of some of these because it can't atomically update a 64-bit
pte, so there's still some duplication.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy@xensource.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent a632da2f

include/asm-x86/paravirt.h

+60 −56
Original line number Diff line number Diff line
@@ -978,6 +978,66 @@ static inline pgdval_t pgd_val(pgd_t pgd) 
	return ret;

}



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

{

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

		PVOP_VCALL3(pv_mmu_ops.set_pte, ptep,

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

	else

		PVOP_VCALL2(pv_mmu_ops.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_mmu_ops.set_pte_at(mm, addr, ptep, pte);

	else

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

}



#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(pv_mmu_ops.set_pte_atomic, ptep,

		    pte.pte, pte.pte >> 32);

}



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

				   pte_t *ptep, pte_t pte)

{

	/* 5 arg words */

	pv_mmu_ops.set_pte_present(mm, addr, ptep, pte);

}



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

			     pte_t *ptep)

{

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

}

#else  /* !CONFIG_X86_PAE */

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

{

	set_pte(ptep, pte);

}



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

				   pte_t *ptep, pte_t pte)

{

	set_pte(ptep, pte);

}



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

			     pte_t *ptep)

{

	set_pte_at(mm, addr, ptep, __pte(0));

}

#endif	/* CONFIG_X86_PAE */



#if PAGETABLE_LEVELS >= 3

static inline pmd_t __pmd(pmdval_t val)

{
@@ -1010,31 +1070,6 @@ static inline pmdval_t pmd_val(pmd_t pmd) 


#ifdef CONFIG_X86_PAE



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

{

	PVOP_VCALL3(pv_mmu_ops.set_pte, ptep, pteval.pte_low, pteval.pte_high);

}



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

			      pte_t *ptep, pte_t pteval)

{

	/* 5 arg words */

	pv_mmu_ops.set_pte_at(mm, addr, ptep, pteval);

}



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

{

	PVOP_VCALL3(pv_mmu_ops.set_pte_atomic, ptep,

		    pteval.pte_low, pteval.pte_high);

}



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

				   pte_t *ptep, pte_t pte)

{

	/* 5 arg words */

	pv_mmu_ops.set_pte_present(mm, addr, ptep, pte);

}



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

{

	PVOP_VCALL3(pv_mmu_ops.set_pmd, pmdp,
@@ -1047,11 +1082,6 @@ static inline void set_pud(pud_t *pudp, pud_t pudval) 
		    pudval.pgd.pgd, pudval.pgd.pgd >> 32);

}



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

{

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

}



static inline void pmd_clear(pmd_t *pmdp)

{

	PVOP_VCALL1(pv_mmu_ops.pmd_clear, pmdp);
@@ -1059,17 +1089,6 @@ static inline void pmd_clear(pmd_t *pmdp) 


#else  /* !CONFIG_X86_PAE */



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

{

	PVOP_VCALL2(pv_mmu_ops.set_pte, ptep, pteval.pte_low);

}



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

			      pte_t *ptep, pte_t pteval)

{

	PVOP_VCALL4(pv_mmu_ops.set_pte_at, mm, addr, ptep, pteval.pte_low);

}



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

{

	PVOP_VCALL2(pv_mmu_ops.set_pmd, pmdp, pmdval.pud.pgd.pgd);
@@ -1080,21 +1099,6 @@ static inline void pmd_clear(pmd_t *pmdp) 
	set_pmd(pmdp, __pmd(0));

}



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

{

	set_pte_at(mm, addr, ptep, __pte(0));

}



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

{

	set_pte(ptep, pte);

}



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

				   pte_t *ptep, pte_t pte)

{

	set_pte(ptep, pte);

}

#endif	/* CONFIG_X86_PAE */



/* Lazy mode for batching updates / context switch */

CRA Git | Maintained and supported by SUSTech CRA and CCSE