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

Commit 945537df authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc/mm/book3s: Rename hash specific PTE bits to carry H_ prefix 



This helps to make following hash only pte bits easier.

We have kept _PAGE_CHG_MASK, _HPAGE_CHG_MASK and _PAGE_PROT_BITS as it
is in this patch eventhough they use hash specific bits. Using them in
radix as it is should be ok, because with radix we expect those bit
positions to be zero.

Only renames in this patch, no change in functionality.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent eee24b5a

arch/powerpc/include/asm/book3s/64/hash-4k.h

+8 −4
Original line number Diff line number Diff line
@@ -48,10 +48,14 @@ 
#define PGD_MASKED_BITS		0



/* PTE flags to conserve for HPTE identification */

#define _PAGE_HPTEFLAGS (_PAGE_BUSY | _PAGE_HASHPTE | \

			 _PAGE_F_SECOND | _PAGE_F_GIX)



#define _PAGE_4K_PFN		0

#define _PAGE_HPTEFLAGS (H_PAGE_BUSY | H_PAGE_HASHPTE | \

			 H_PAGE_F_SECOND | H_PAGE_F_GIX)

/*

 * Not supported by 4k linux page size

 */

#define H_PAGE_4K_PFN	0x0

#define H_PAGE_THP_HUGE 0x0

#define H_PAGE_COMBO	0x0

#ifndef __ASSEMBLY__

/*

 * On all 4K setups, remap_4k_pfn() equates to remap_pfn_range()

arch/powerpc/include/asm/book3s/64/hash-64k.h

+22 −16
Original line number Diff line number Diff line
@@ -29,17 +29,23 @@ 
#define PGDIR_SIZE	(1UL << PGDIR_SHIFT)

#define PGDIR_MASK	(~(PGDIR_SIZE-1))



#define _PAGE_COMBO	0x00001000 /* this is a combo 4k page */

#define _PAGE_4K_PFN	0x00002000 /* PFN is for a single 4k page */

#define H_PAGE_COMBO	0x00001000 /* this is a combo 4k page */

#define H_PAGE_4K_PFN	0x00002000 /* PFN is for a single 4k page */

/*

 * Used to track subpage group valid if _PAGE_COMBO is set

 * This overloads _PAGE_F_GIX and _PAGE_F_SECOND

 * We need to differentiate between explicit huge page and THP huge

 * page, since THP huge page also need to track real subpage details

 */

#define _PAGE_COMBO_VALID	(_PAGE_F_GIX | _PAGE_F_SECOND)

#define H_PAGE_THP_HUGE  H_PAGE_4K_PFN



/*

 * Used to track subpage group valid if H_PAGE_COMBO is set

 * This overloads H_PAGE_F_GIX and H_PAGE_F_SECOND

 */

#define H_PAGE_COMBO_VALID	(H_PAGE_F_GIX | H_PAGE_F_SECOND)



/* PTE flags to conserve for HPTE identification */

#define _PAGE_HPTEFLAGS (_PAGE_BUSY | _PAGE_F_SECOND | \

			 _PAGE_F_GIX | _PAGE_HASHPTE | _PAGE_COMBO)

#define _PAGE_HPTEFLAGS (H_PAGE_BUSY | H_PAGE_F_SECOND | \

			 H_PAGE_F_GIX | H_PAGE_HASHPTE | H_PAGE_COMBO)

/*

 * we support 16 fragments per PTE page of 64K size.

 */
@@ -75,9 +81,9 @@ static inline real_pte_t __real_pte(pte_t pte, pte_t *ptep) 


	rpte.pte = pte;

	rpte.hidx = 0;

	if (pte_val(pte) & _PAGE_COMBO) {

	if (pte_val(pte) & H_PAGE_COMBO) {

		/*

		 * Make sure we order the hidx load against the _PAGE_COMBO

		 * Make sure we order the hidx load against the H_PAGE_COMBO

		 * check. The store side ordering is done in __hash_page_4K

		 */

		smp_rmb();
@@ -89,9 +95,9 @@ static inline real_pte_t __real_pte(pte_t pte, pte_t *ptep) 


static inline unsigned long __rpte_to_hidx(real_pte_t rpte, unsigned long index)

{

	if ((pte_val(rpte.pte) & _PAGE_COMBO))

	if ((pte_val(rpte.pte) & H_PAGE_COMBO))

		return (rpte.hidx >> (index<<2)) & 0xf;

	return (pte_val(rpte.pte) >> _PAGE_F_GIX_SHIFT) & 0xf;

	return (pte_val(rpte.pte) >> H_PAGE_F_GIX_SHIFT) & 0xf;

}



#define __rpte_to_pte(r)	((r).pte)
@@ -114,7 +120,7 @@ extern bool __rpte_sub_valid(real_pte_t rpte, unsigned long index); 
#define pte_iterate_hashed_end() } while(0); } } while(0)



#define pte_pagesize_index(mm, addr, pte)	\

	(((pte) & _PAGE_COMBO)? MMU_PAGE_4K: MMU_PAGE_64K)

	(((pte) & H_PAGE_COMBO)? MMU_PAGE_4K: MMU_PAGE_64K)



extern int remap_pfn_range(struct vm_area_struct *, unsigned long addr,

			   unsigned long pfn, unsigned long size, pgprot_t);
@@ -126,7 +132,7 @@ static inline int remap_4k_pfn(struct vm_area_struct *vma, unsigned long addr, 
		return -EINVAL;

	}

	return remap_pfn_range(vma, addr, pfn, PAGE_SIZE,

			       __pgprot(pgprot_val(prot) | _PAGE_4K_PFN));

			       __pgprot(pgprot_val(prot) | H_PAGE_4K_PFN));

}



#define PTE_TABLE_SIZE	PTE_FRAG_SIZE
@@ -255,8 +261,8 @@ static inline void mark_hpte_slot_valid(unsigned char *hpte_slot_array, 
 */

static inline int pmd_trans_huge(pmd_t pmd)

{

	return !!((pmd_val(pmd) & (_PAGE_PTE | _PAGE_THP_HUGE)) ==

		  (_PAGE_PTE | _PAGE_THP_HUGE));

	return !!((pmd_val(pmd) & (_PAGE_PTE | H_PAGE_THP_HUGE)) ==

		  (_PAGE_PTE | H_PAGE_THP_HUGE));

}



static inline int pmd_large(pmd_t pmd)
@@ -280,7 +286,7 @@ static inline int __pmdp_test_and_clear_young(struct mm_struct *mm, 
{

	unsigned long old;



	if ((pmd_val(*pmdp) & (_PAGE_ACCESSED | _PAGE_HASHPTE)) == 0)

	if ((pmd_val(*pmdp) & (_PAGE_ACCESSED | H_PAGE_HASHPTE)) == 0)

		return 0;

	old = pmd_hugepage_update(mm, addr, pmdp, _PAGE_ACCESSED, 0);

	return ((old & _PAGE_ACCESSED) != 0);

arch/powerpc/include/asm/book3s/64/hash.h

+18 −20
Original line number Diff line number Diff line
@@ -26,19 +26,22 @@ 
#define _PAGE_TOLERANT		0x00030 /* tolerant memory, cache inhibited */

#define _PAGE_DIRTY		0x00080 /* C: page changed */

#define _PAGE_ACCESSED		0x00100 /* R: page referenced */

#define _PAGE_SPECIAL		0x00400 /* software: special page */

#define _PAGE_BUSY		0x00800 /* software: PTE & hash are busy */



/*

 * Software bits

 */

#ifdef CONFIG_MEM_SOFT_DIRTY

#define _PAGE_SOFT_DIRTY	0x200 /* software: software dirty tracking */

#define _PAGE_SOFT_DIRTY	0x00200 /* software: software dirty tracking */

#else

#define _PAGE_SOFT_DIRTY	0x000

#define _PAGE_SOFT_DIRTY	0x00000

#endif

#define _PAGE_SPECIAL		0x00400 /* software: special page */

#define H_PAGE_BUSY		0x00800 /* software: PTE & hash are busy */





#define _PAGE_F_GIX_SHIFT	57

#define _PAGE_F_GIX		(7ul << 57)	/* HPTE index within HPTEG */

#define _PAGE_F_SECOND		(1ul << 60)	/* HPTE is in 2ndary HPTEG */

#define _PAGE_HASHPTE		(1ul << 61)	/* PTE has associated HPTE */

#define H_PAGE_F_GIX_SHIFT	57

#define H_PAGE_F_GIX		(7ul << 57)	/* HPTE index within HPTEG */

#define H_PAGE_F_SECOND		(1ul << 60)	/* HPTE is in 2ndary HPTEG */

#define H_PAGE_HASHPTE		(1ul << 61)	/* PTE has associated HPTE */

#define _PAGE_PTE		(1ul << 62)	/* distinguishes PTEs from pointers */

#define _PAGE_PRESENT		(1ul << 63)	/* pte contains a translation */

/*
@@ -47,11 +50,6 @@ 
 * maps CI pte mapping.

 */

#define _PAGE_NO_CACHE		_PAGE_TOLERANT

/*

 * We need to differentiate between explicit huge page and THP huge

 * page, since THP huge page also need to track real subpage details

 */

#define _PAGE_THP_HUGE  _PAGE_4K_PFN

/*

 * We support 57 bit real address in pte. Clear everything above 57, and

 * every thing below PAGE_SHIFT;
@@ -61,7 +59,7 @@ 
 * set of bits not changed in pmd_modify.

 */

#define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | \

			 _PAGE_ACCESSED | _PAGE_THP_HUGE | _PAGE_PTE | \

			 _PAGE_ACCESSED | H_PAGE_THP_HUGE | _PAGE_PTE | \

			 _PAGE_SOFT_DIRTY)
@@ -148,7 +146,7 @@ 
 * Mask of bits returned by pte_pgprot()

 */

#define PAGE_PROT_BITS  (_PAGE_SAO | _PAGE_NON_IDEMPOTENT | _PAGE_TOLERANT | \

			 _PAGE_4K_PFN | _PAGE_PRIVILEGED | _PAGE_ACCESSED | \

			 H_PAGE_4K_PFN | _PAGE_PRIVILEGED | _PAGE_ACCESSED | \

			 _PAGE_READ | _PAGE_WRITE |  _PAGE_DIRTY | _PAGE_EXEC | \

			 _PAGE_SOFT_DIRTY)

/*
@@ -262,14 +260,14 @@ static inline unsigned long pte_update(struct mm_struct *mm, 
	bne-	1b"

	: "=&r" (old_be), "=&r" (tmp_be), "=m" (*ptep)

	: "r" (ptep), "r" (cpu_to_be64(clr)), "m" (*ptep),

	  "r" (cpu_to_be64(_PAGE_BUSY)), "r" (cpu_to_be64(set))

	  "r" (cpu_to_be64(H_PAGE_BUSY)), "r" (cpu_to_be64(set))

	: "cc" );

	/* huge pages use the old page table lock */

	if (!huge)

		assert_pte_locked(mm, addr);



	old = be64_to_cpu(old_be);

	if (old & _PAGE_HASHPTE)

	if (old & H_PAGE_HASHPTE)

		hpte_need_flush(mm, addr, ptep, old, huge);



	return old;
@@ -287,7 +285,7 @@ static inline int __ptep_test_and_clear_young(struct mm_struct *mm, 
{

	unsigned long old;



	if ((pte_val(*ptep) & (_PAGE_ACCESSED | _PAGE_HASHPTE)) == 0)

	if ((pte_val(*ptep) & (_PAGE_ACCESSED | H_PAGE_HASHPTE)) == 0)

		return 0;

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

	return (old & _PAGE_ACCESSED) != 0;
@@ -355,7 +353,7 @@ static inline void __ptep_set_access_flags(pte_t *ptep, pte_t entry) 
		stdcx.	%0,0,%4\n\

		bne-	1b"

	:"=&r" (old), "=&r" (tmp), "=m" (*ptep)

	:"r" (val), "r" (ptep), "m" (*ptep), "r" (cpu_to_be64(_PAGE_BUSY))

	:"r" (val), "r" (ptep), "m" (*ptep), "r" (cpu_to_be64(H_PAGE_BUSY))

	:"cc");

}

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

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 


#define __real_pte(e,p)		((real_pte_t){(e)})

#define __rpte_to_pte(r)	((r).pte)

#define __rpte_to_hidx(r,index)	(pte_val(__rpte_to_pte(r)) >>_PAGE_F_GIX_SHIFT)

#define __rpte_to_hidx(r,index)	(pte_val(__rpte_to_pte(r)) >> H_PAGE_F_GIX_SHIFT)



#define pte_iterate_hashed_subpages(rpte, psize, va, index, shift)       \

	do {							         \
@@ -287,7 +287,7 @@ static inline int pmd_protnone(pmd_t pmd) 


static inline pmd_t pmd_mkhuge(pmd_t pmd)

{

	return __pmd(pmd_val(pmd) | (_PAGE_PTE | _PAGE_THP_HUGE));

	return __pmd(pmd_val(pmd) | (_PAGE_PTE | H_PAGE_THP_HUGE));

}



#define __HAVE_ARCH_PMDP_SET_ACCESS_FLAGS

arch/powerpc/include/asm/kvm_book3s_64.h

+2 −2
Original line number Diff line number Diff line
@@ -310,9 +310,9 @@ static inline pte_t kvmppc_read_update_linux_pte(pte_t *ptep, int writing) 
		 */

		old_pte = READ_ONCE(*ptep);

		/*

		 * wait until _PAGE_BUSY is clear then set it atomically

		 * wait until H_PAGE_BUSY is clear then set it atomically

		 */

		if (unlikely(pte_val(old_pte) & _PAGE_BUSY)) {

		if (unlikely(pte_val(old_pte) & H_PAGE_BUSY)) {

			cpu_relax();

			continue;

		}