Commit 06f52524 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: Standardise pte_update() prototype between PPC32 and PPC64 



PPC64 takes 3 additional parameters compared to PPC32:
- mm
- address
- huge

These 3 parameters will be needed in order to perform different
action depending on the page size on the 8xx.

Make pte_update() prototype identical for PPC32 and PPC64.

This allows dropping an #ifdef in huge_ptep_get_and_clear().

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/38111acf6841047a8addde37c63e92d611ee38c2.1589866984.git.christophe.leroy@csgroup.eu
parent c7fa7701

arch/powerpc/include/asm/book3s/32/pgtable.h

+8 −7
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot); 
 */



#define pte_clear(mm, addr, ptep) \

	do { pte_update(ptep, ~_PAGE_HASHPTE, 0); } while (0)

	do { pte_update(mm, addr, ptep, ~_PAGE_HASHPTE, 0, 0); } while (0)



#define pmd_none(pmd)		(!pmd_val(pmd))

#define	pmd_bad(pmd)		(pmd_val(pmd) & _PMD_BAD)
@@ -254,7 +254,8 @@ extern void flush_hash_entry(struct mm_struct *mm, pte_t *ptep, 
 * when using atomic updates, only the low part of the PTE is

 * accessed atomically.

 */

static inline pte_basic_t pte_update(pte_t *p, unsigned long clr, unsigned long set)

static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, pte_t *p,

				     unsigned long clr, unsigned long set, int huge)

{

	pte_basic_t old;

	unsigned long tmp;
@@ -292,7 +293,7 @@ static inline int __ptep_test_and_clear_young(struct mm_struct *mm, 
					      unsigned long addr, pte_t *ptep)

{

	unsigned long old;

	old = pte_update(ptep, _PAGE_ACCESSED, 0);

	old = pte_update(mm, addr, ptep, _PAGE_ACCESSED, 0, 0);

	if (old & _PAGE_HASHPTE) {

		unsigned long ptephys = __pa(ptep) & PAGE_MASK;

		flush_hash_pages(mm->context.id, addr, ptephys, 1);
@@ -306,14 +307,14 @@ static inline int __ptep_test_and_clear_young(struct mm_struct *mm, 
static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,

				       pte_t *ptep)

{

	return __pte(pte_update(ptep, ~_PAGE_HASHPTE, 0));

	return __pte(pte_update(mm, addr, ptep, ~_PAGE_HASHPTE, 0, 0));

}



#define __HAVE_ARCH_PTEP_SET_WRPROTECT

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

				      pte_t *ptep)

{

	pte_update(ptep, _PAGE_RW, 0);

	pte_update(mm, addr, ptep, _PAGE_RW, 0, 0);

}



static inline void __ptep_set_access_flags(struct vm_area_struct *vma,
@@ -324,7 +325,7 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma, 
	unsigned long set = pte_val(entry) &

		(_PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_RW | _PAGE_EXEC);



	pte_update(ptep, 0, set);

	pte_update(vma->vm_mm, address, ptep, 0, set, 0);



	flush_tlb_page(vma, address);

}
@@ -522,7 +523,7 @@ static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr, 
		*ptep = __pte((pte_val(*ptep) & _PAGE_HASHPTE)

			      | (pte_val(pte) & ~_PAGE_HASHPTE));

	else

		pte_update(ptep, ~_PAGE_HASHPTE, pte_val(pte));

		pte_update(mm, addr, ptep, ~_PAGE_HASHPTE, pte_val(pte), 0);



#elif defined(CONFIG_PTE_64BIT)

	/* Second case is 32-bit with 64-bit PTE.  In this case, we

arch/powerpc/include/asm/hugetlb.h

+0 −4
Original line number Diff line number Diff line
@@ -40,11 +40,7 @@ void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr, 
static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,

					    unsigned long addr, pte_t *ptep)

{

#ifdef CONFIG_PPC64

	return __pte(pte_update(mm, addr, ptep, ~0UL, 0, 1));

#else

	return __pte(pte_update(ptep, ~0UL, 0));

#endif

}



#define __HAVE_ARCH_HUGE_PTEP_CLEAR_FLUSH

arch/powerpc/include/asm/nohash/32/pgtable.h

+7 −6
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot); 
#ifndef __ASSEMBLY__



#define pte_clear(mm, addr, ptep) \

	do { pte_update(ptep, ~0, 0); } while (0)

	do { pte_update(mm, addr, ptep, ~0, 0, 0); } while (0)



#ifndef pte_mkwrite

static inline pte_t pte_mkwrite(pte_t pte)
@@ -222,7 +222,8 @@ static inline void pmd_clear(pmd_t *pmdp) 
 * to properly flush the virtually tagged instruction cache of

 * those implementations.

 */

static inline pte_basic_t pte_update(pte_t *p, unsigned long clr, unsigned long set)

static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, pte_t *p,

				     unsigned long clr, unsigned long set, int huge)

{

#if defined(PTE_ATOMIC_UPDATES) && !defined(CONFIG_PTE_64BIT)

	unsigned long old, tmp;
@@ -260,7 +261,7 @@ static inline int __ptep_test_and_clear_young(struct mm_struct *mm, 
					      unsigned long addr, pte_t *ptep)

{

	unsigned long old;

	old = pte_update(ptep, _PAGE_ACCESSED, 0);

	old = pte_update(mm, addr, ptep, _PAGE_ACCESSED, 0, 0);

	return (old & _PAGE_ACCESSED) != 0;

}

#define ptep_test_and_clear_young(__vma, __addr, __ptep) \
@@ -270,7 +271,7 @@ static inline int __ptep_test_and_clear_young(struct mm_struct *mm, 
static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,

				       pte_t *ptep)

{

	return __pte(pte_update(ptep, ~0, 0));

	return __pte(pte_update(mm, addr, ptep, ~0, 0, 0));

}



#define __HAVE_ARCH_PTEP_SET_WRPROTECT
@@ -280,7 +281,7 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, 
	unsigned long clr = ~pte_val(pte_wrprotect(__pte(~0)));

	unsigned long set = pte_val(pte_wrprotect(__pte(0)));



	pte_update(ptep, clr, set);

	pte_update(mm, addr, ptep, clr, set, 0);

}



static inline void __ptep_set_access_flags(struct vm_area_struct *vma,
@@ -293,7 +294,7 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma, 
	unsigned long set = pte_val(entry) & pte_val(pte_set);

	unsigned long clr = ~pte_val(entry) & ~pte_val(pte_clr);



	pte_update(ptep, clr, set);

	pte_update(vma->vm_mm, address, ptep, clr, set, 0);



	flush_tlb_page(vma, address);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE