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

Commit 6522869c authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86: add pte_set_flags/clear_flags for pte flag manipulation 



It's not necessary to deconstruct and reconstruct a pte every time its
flags are being updated.  Introduce pte_set_flags and pte_clear_flags
to set and clear flags in a pte.  This allows the flag manipulation
code to be inlined, and avoids calls via paravirt-ops.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ab897d20

arch/x86/include/asm/pgtable.h

+26 −12
Original line number Diff line number Diff line
@@ -240,64 +240,78 @@ static inline int pmd_large(pmd_t pte) 
		(_PAGE_PSE | _PAGE_PRESENT);

}



static inline pte_t pte_set_flags(pte_t pte, pteval_t set)

{

	pteval_t v = native_pte_val(pte);



	return native_make_pte(v | set);

}



static inline pte_t pte_clear_flags(pte_t pte, pteval_t clear)

{

	pteval_t v = native_pte_val(pte);



	return native_make_pte(v & ~clear);

}



static inline pte_t pte_mkclean(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_DIRTY);

	return pte_clear_flags(pte, _PAGE_DIRTY);

}



static inline pte_t pte_mkold(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_ACCESSED);

	return pte_clear_flags(pte, _PAGE_ACCESSED);

}



static inline pte_t pte_wrprotect(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_RW);

	return pte_clear_flags(pte, _PAGE_RW);

}



static inline pte_t pte_mkexec(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_NX);

	return pte_clear_flags(pte, _PAGE_NX);

}



static inline pte_t pte_mkdirty(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_DIRTY);

	return pte_set_flags(pte, _PAGE_DIRTY);

}



static inline pte_t pte_mkyoung(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_ACCESSED);

	return pte_set_flags(pte, _PAGE_ACCESSED);

}



static inline pte_t pte_mkwrite(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_RW);

	return pte_set_flags(pte, _PAGE_RW);

}



static inline pte_t pte_mkhuge(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_PSE);

	return pte_set_flags(pte, _PAGE_PSE);

}



static inline pte_t pte_clrhuge(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_PSE);

	return pte_clear_flags(pte, _PAGE_PSE);

}



static inline pte_t pte_mkglobal(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_GLOBAL);

	return pte_set_flags(pte, _PAGE_GLOBAL);

}



static inline pte_t pte_clrglobal(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_GLOBAL);

	return pte_clear_flags(pte, _PAGE_GLOBAL);

}



static inline pte_t pte_mkspecial(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_SPECIAL);

	return pte_set_flags(pte, _PAGE_SPECIAL);

}



extern pteval_t __supported_pte_mask;