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

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

x86/pgtable: unify pagetable accessors, #6 



Unify functions to test and set bits in pagetable entries.

NOP: only moves existing code around, without any change to it.

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 e8a48524

include/asm-x86/pgtable.h

+28 −0
Original line number Diff line number Diff line
@@ -115,6 +115,34 @@ extern unsigned long long __PAGE_KERNEL, __PAGE_KERNEL_EXEC; 
#define __S110	PAGE_SHARED_EXEC

#define __S111	PAGE_SHARED_EXEC



#ifndef __ASSEMBLY__

/*

 * The following only work if pte_present() is true.

 * Undefined behaviour if not..

 */

static inline int pte_dirty(pte_t pte)		{ return pte_val(pte) & _PAGE_DIRTY; }

static inline int pte_young(pte_t pte)		{ return pte_val(pte) & _PAGE_ACCESSED; }

static inline int pte_write(pte_t pte)		{ return pte_val(pte) & _PAGE_RW; }

static inline int pte_file(pte_t pte)		{ return pte_val(pte) & _PAGE_FILE; }

static inline int pte_huge(pte_t pte)		{ return pte_val(pte) & _PAGE_PSE; }



static inline int pmd_large(pmd_t pte) {

	return (pmd_val(pte) & (_PAGE_PSE|_PAGE_PRESENT)) ==

		(_PAGE_PSE|_PAGE_PRESENT);

}



static inline pte_t pte_mkclean(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_DIRTY); }

static inline pte_t pte_mkold(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_ACCESSED); }

static inline pte_t pte_wrprotect(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_RW); }

static inline pte_t pte_mkexec(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_NX); }

static inline pte_t pte_mkdirty(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_DIRTY); }

static inline pte_t pte_mkyoung(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_ACCESSED); }

static inline pte_t pte_mkwrite(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_RW); }

static inline pte_t pte_mkhuge(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_PSE); }

static inline pte_t pte_clrhuge(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_PSE); }



#endif	/* __ASSEMBLY__ */



#ifdef CONFIG_X86_32

# include "pgtable_32.h"

#else

include/asm-x86/pgtable_32.h

+0 −28
Original line number Diff line number Diff line
@@ -101,31 +101,6 @@ extern unsigned long pg0[]; 


#define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT))



/*

 * The following only work if pte_present() is true.

 * Undefined behaviour if not..

 */

static inline int pte_dirty(pte_t pte)		{ return pte_val(pte) & _PAGE_DIRTY; }

static inline int pte_young(pte_t pte)		{ return pte_val(pte) & _PAGE_ACCESSED; }

static inline int pte_write(pte_t pte)		{ return pte_val(pte) & _PAGE_RW; }

static inline int pte_file(pte_t pte)		{ return pte_val(pte) & _PAGE_FILE; }

static inline int pte_huge(pte_t pte)		{ return pte_val(pte) & _PAGE_PSE; }



static inline int pmd_large(pmd_t pte) {

	return (pmd_val(pte) & (_PAGE_PSE|_PAGE_PRESENT)) ==

		(_PAGE_PSE|_PAGE_PRESENT);

}



static inline pte_t pte_mkclean(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_DIRTY); }

static inline pte_t pte_mkold(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_ACCESSED); }

static inline pte_t pte_wrprotect(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_RW); }

static inline pte_t pte_mkexec(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_NX); }

static inline pte_t pte_mkdirty(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_DIRTY); }

static inline pte_t pte_mkyoung(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_ACCESSED); }

static inline pte_t pte_mkwrite(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_RW); }

static inline pte_t pte_mkhuge(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_PSE); }

static inline pte_t pte_clrhuge(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_PSE); }



#ifdef CONFIG_X86_PAE

# include <asm/pgtable-3level.h>

#else
@@ -276,9 +251,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
	return pte;

}



#define pmd_large(pmd) \

((pmd_val(pmd) & (_PAGE_PSE|_PAGE_PRESENT)) == (_PAGE_PSE|_PAGE_PRESENT))



/*

 * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]

 *

include/asm-x86/pgtable_64.h

+0 −32
Original line number Diff line number Diff line
@@ -173,34 +173,6 @@ static inline pte_t pfn_pte(unsigned long page_nr, pgprot_t pgprot) 
	pte_val(pte) &= __supported_pte_mask;

	return pte;

}



/*

 * The following only work if pte_present() is true.

 * Undefined behaviour if not..

 */

#define __LARGE_PTE (_PAGE_PSE|_PAGE_PRESENT)



static inline int pte_dirty(pte_t pte)		{ return pte_val(pte) & _PAGE_DIRTY; }

static inline int pte_young(pte_t pte)		{ return pte_val(pte) & _PAGE_ACCESSED; }

static inline int pte_write(pte_t pte)		{ return pte_val(pte) & _PAGE_RW; }

static inline int pte_file(pte_t pte)		{ return pte_val(pte) & _PAGE_FILE; }

static inline int pte_huge(pte_t pte)		{ return pte_val(pte) & _PAGE_PSE; }



static inline int pmd_large(pmd_t pte) {

	return (pmd_val(pte) & (_PAGE_PSE|_PAGE_PRESENT)) ==

		(_PAGE_PSE|_PAGE_PRESENT);

}



static inline pte_t pte_mkclean(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_DIRTY); }

static inline pte_t pte_mkold(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_ACCESSED); }

static inline pte_t pte_wrprotect(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_RW); }

static inline pte_t pte_mkexec(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_NX); }

static inline pte_t pte_mkdirty(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_DIRTY); }

static inline pte_t pte_mkyoung(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_ACCESSED); }

static inline pte_t pte_mkwrite(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_RW); }

static inline pte_t pte_mkhuge(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_PSE); }

static inline pte_t pte_clrhuge(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_PSE); }



struct vm_area_struct;



static inline int ptep_test_and_clear_young(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep)
@@ -220,10 +192,6 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, 
 */

#define pgprot_noncached(prot)	(__pgprot(pgprot_val(prot) | _PAGE_PCD | _PAGE_PWT))



static inline int pmd_large(pmd_t pte) { 

	return (pmd_val(pte) & __LARGE_PTE) == __LARGE_PTE; 

} 	





/*

 * Conversion functions: convert a page and protection to a page entry,