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

Commit c489f125 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

thp: add pmd_modify 



Add pmd_modify() for use with mprotect() on huge pmds.

Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Signed-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0ca1634d

arch/x86/include/asm/pgtable.h

+10 −0
Original line number Diff line number Diff line
@@ -325,6 +325,16 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
	return __pte(val);

}



static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)

{

	pmdval_t val = pmd_val(pmd);



	val &= _HPAGE_CHG_MASK;

	val |= massage_pgprot(newprot) & ~_HPAGE_CHG_MASK;



	return __pmd(val);

}



/* mprotect needs to preserve PAT bits when updating vm_page_prot */

#define pgprot_modify pgprot_modify

static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)

arch/x86/include/asm/pgtable_types.h

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ 
/* Set of bits not changed in pte_modify */

#define _PAGE_CHG_MASK	(PTE_PFN_MASK | _PAGE_PCD | _PAGE_PWT |		\

			 _PAGE_SPECIAL | _PAGE_ACCESSED | _PAGE_DIRTY)

#define _HPAGE_CHG_MASK (_PAGE_CHG_MASK | _PAGE_PSE)



#define _PAGE_CACHE_MASK	(_PAGE_PCD | _PAGE_PWT)

#define _PAGE_CACHE_WB		(0)