Commit b8e3b379 authored by Heiko Carstens's avatar Heiko Carstens Committed by Vasily Gorbik
Browse files

s390/mm: use set_pXd()/set_pte() helper functions everywhere 



Use the new set_pXd()/set_pte() helper functions at all places where
page table entries are modified.

Reviewed-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent f29111f1

arch/s390/include/asm/hugetlb.h

+2 −2
Original line number Diff line number Diff line
@@ -45,9 +45,9 @@ static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr, 
				  pte_t *ptep, unsigned long sz)

{

	if ((pte_val(*ptep) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R3)

		pte_val(*ptep) = _REGION3_ENTRY_EMPTY;

		set_pte(ptep, __pte(_REGION3_ENTRY_EMPTY));

	else

		pte_val(*ptep) = _SEGMENT_ENTRY_EMPTY;

		set_pte(ptep, __pte(_SEGMENT_ENTRY_EMPTY));

}



static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,

arch/s390/include/asm/pgalloc.h

+4 −4
Original line number Diff line number Diff line
@@ -103,17 +103,17 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) 


static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, p4d_t *p4d)

{

	pgd_val(*pgd) = _REGION1_ENTRY | __pa(p4d);

	set_pgd(pgd, __pgd(_REGION1_ENTRY | __pa(p4d)));

}



static inline void p4d_populate(struct mm_struct *mm, p4d_t *p4d, pud_t *pud)

{

	p4d_val(*p4d) = _REGION2_ENTRY | __pa(pud);

	set_p4d(p4d, __p4d(_REGION2_ENTRY | __pa(pud)));

}



static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)

{

	pud_val(*pud) = _REGION3_ENTRY | __pa(pmd);

	set_pud(pud, __pud(_REGION3_ENTRY | __pa(pmd)));

}



static inline pgd_t *pgd_alloc(struct mm_struct *mm)
@@ -129,7 +129,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd) 
static inline void pmd_populate(struct mm_struct *mm,

				pmd_t *pmd, pgtable_t pte)

{

	pmd_val(*pmd) = _SEGMENT_ENTRY + __pa(pte);

	set_pmd(pmd, __pmd(_SEGMENT_ENTRY | __pa(pte)));

}



#define pmd_populate_kernel(mm, pmd, pte) pmd_populate(mm, pmd, pte)

arch/s390/include/asm/pgtable.h

+9 −9
Original line number Diff line number Diff line
@@ -939,29 +939,29 @@ static inline void set_pte(pte_t *ptep, pte_t pte) 
static inline void pgd_clear(pgd_t *pgd)

{

	if ((pgd_val(*pgd) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R1)

		pgd_val(*pgd) = _REGION1_ENTRY_EMPTY;

		set_pgd(pgd, __pgd(_REGION1_ENTRY_EMPTY));

}



static inline void p4d_clear(p4d_t *p4d)

{

	if ((p4d_val(*p4d) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R2)

		p4d_val(*p4d) = _REGION2_ENTRY_EMPTY;

		set_p4d(p4d, __p4d(_REGION2_ENTRY_EMPTY));

}



static inline void pud_clear(pud_t *pud)

{

	if ((pud_val(*pud) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R3)

		pud_val(*pud) = _REGION3_ENTRY_EMPTY;

		set_pud(pud, __pud(_REGION3_ENTRY_EMPTY));

}



static inline void pmd_clear(pmd_t *pmdp)

{

	pmd_val(*pmdp) = _SEGMENT_ENTRY_EMPTY;

	set_pmd(pmdp, __pmd(_SEGMENT_ENTRY_EMPTY));

}



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

{

	pte_val(*ptep) = _PAGE_INVALID;

	set_pte(ptep, __pte(_PAGE_INVALID));

}



/*
@@ -1169,7 +1169,7 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, 


	if (full) {

		res = *ptep;

		*ptep = __pte(_PAGE_INVALID);

		set_pte(ptep, __pte(_PAGE_INVALID));

	} else {

		res = ptep_xchg_lazy(mm, addr, ptep, __pte(_PAGE_INVALID));

	}
@@ -1257,7 +1257,7 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, 
	if (mm_has_pgste(mm))

		ptep_set_pte_at(mm, addr, ptep, entry);

	else

		*ptep = entry;

		set_pte(ptep, entry);

}



/*
@@ -1641,7 +1641,7 @@ static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr, 
{

	if (!MACHINE_HAS_NX)

		pmd_val(entry) &= ~_SEGMENT_ENTRY_NOEXEC;

	*pmdp = entry;

	set_pmd(pmdp, entry);

}



static inline pmd_t pmd_mkhuge(pmd_t pmd)
@@ -1666,7 +1666,7 @@ static inline pmd_t pmdp_huge_get_and_clear_full(struct vm_area_struct *vma, 
{

	if (full) {

		pmd_t pmd = *pmdp;

		*pmdp = __pmd(_SEGMENT_ENTRY_EMPTY);

		set_pmd(pmdp, __pmd(_SEGMENT_ENTRY_EMPTY));

		return pmd;

	}

	return pmdp_xchg_lazy(vma->vm_mm, addr, pmdp, __pmd(_SEGMENT_ENTRY_EMPTY));

arch/s390/mm/gmap.c

+6 −6
Original line number Diff line number Diff line
@@ -985,7 +985,7 @@ static int gmap_protect_pmd(struct gmap *gmap, unsigned long gaddr, 
	}



	if (bits & GMAP_NOTIFY_MPROT)

		pmd_val(*pmdp) |= _SEGMENT_ENTRY_GMAP_IN;

		set_pmd(pmdp, set_pmd_bit(*pmdp, __pgprot(_SEGMENT_ENTRY_GMAP_IN)));



	/* Shadow GMAP protection needs split PMDs */

	if (bits & GMAP_NOTIFY_SHADOW)
@@ -1151,7 +1151,7 @@ int gmap_read_table(struct gmap *gmap, unsigned long gaddr, unsigned long *val) 
				address = pte_val(pte) & PAGE_MASK;

				address += gaddr & ~PAGE_MASK;

				*val = *(unsigned long *) address;

				pte_val(*ptep) |= _PAGE_YOUNG;

				set_pte(ptep, set_pte_bit(*ptep, __pgprot(_PAGE_YOUNG)));

				/* Do *NOT* clear the _PAGE_INVALID bit! */

				rc = 0;

			}
@@ -2275,7 +2275,7 @@ EXPORT_SYMBOL_GPL(ptep_notify); 
static void pmdp_notify_gmap(struct gmap *gmap, pmd_t *pmdp,

			     unsigned long gaddr)

{

	pmd_val(*pmdp) &= ~_SEGMENT_ENTRY_GMAP_IN;

	set_pmd(pmdp, clear_pmd_bit(*pmdp, __pgprot(_SEGMENT_ENTRY_GMAP_IN)));

	gmap_call_notifier(gmap, gaddr, gaddr + HPAGE_SIZE - 1);

}
@@ -2302,7 +2302,7 @@ static void gmap_pmdp_xchg(struct gmap *gmap, pmd_t *pmdp, pmd_t new, 
		__pmdp_idte(gaddr, (pmd_t *)pmdp, 0, 0, IDTE_GLOBAL);

	else

		__pmdp_csp(pmdp);

	*pmdp = new;

	set_pmd(pmdp, new);

}



static void gmap_pmdp_clear(struct mm_struct *mm, unsigned long vmaddr,
@@ -2324,7 +2324,7 @@ static void gmap_pmdp_clear(struct mm_struct *mm, unsigned long vmaddr, 
						   _SEGMENT_ENTRY_GMAP_UC));

			if (purge)

				__pmdp_csp(pmdp);

			pmd_val(*pmdp) = _SEGMENT_ENTRY_EMPTY;

			set_pmd(pmdp, __pmd(_SEGMENT_ENTRY_EMPTY));

		}

		spin_unlock(&gmap->guest_table_lock);

	}
@@ -2447,7 +2447,7 @@ static bool gmap_test_and_clear_dirty_pmd(struct gmap *gmap, pmd_t *pmdp, 
		return false;



	/* Clear UC indication and reset protection */

	pmd_val(*pmdp) &= ~_SEGMENT_ENTRY_GMAP_UC;

	set_pmd(pmdp, clear_pmd_bit(*pmdp, __pgprot(_SEGMENT_ENTRY_GMAP_UC)));

	gmap_protect_pmd(gmap, gaddr, pmdp, PROT_READ, 0);

	return true;

}

arch/s390/mm/hugetlbpage.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, 
		rste |= _SEGMENT_ENTRY_LARGE;



	clear_huge_pte_skeys(mm, rste);

	pte_val(*ptep) = rste;

	set_pte(ptep, __pte(rste));

}



pte_t huge_ptep_get(pte_t *ptep)