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

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

powerpc/mm: Move pte related functions together 



Only code movement. No functionality change.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Acked-by: default avatarBalbir Singh <bsingharora@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent aba480e1

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

+71 −71
Original line number Diff line number Diff line
@@ -430,6 +430,77 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
	return __pte((pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot));

}



static inline bool pte_user(pte_t pte)

{

	return !(pte_val(pte) & _PAGE_PRIVILEGED);

}



/* Encode and de-code a swap entry */

#define MAX_SWAPFILES_CHECK() do { \

	BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > SWP_TYPE_BITS); \

	/*							\

	 * Don't have overlapping bits with _PAGE_HPTEFLAGS	\

	 * We filter HPTEFLAGS on set_pte.			\

	 */							\

	BUILD_BUG_ON(_PAGE_HPTEFLAGS & (0x1f << _PAGE_BIT_SWAP_TYPE)); \

	BUILD_BUG_ON(_PAGE_HPTEFLAGS & _PAGE_SWP_SOFT_DIRTY);	\

	} while (0)

/*

 * on pte we don't need handle RADIX_TREE_EXCEPTIONAL_SHIFT;

 */

#define SWP_TYPE_BITS 5

#define __swp_type(x)		(((x).val >> _PAGE_BIT_SWAP_TYPE) \

				& ((1UL << SWP_TYPE_BITS) - 1))

#define __swp_offset(x)		(((x).val & PTE_RPN_MASK) >> PAGE_SHIFT)

#define __swp_entry(type, offset)	((swp_entry_t) { \

				((type) << _PAGE_BIT_SWAP_TYPE) \

				| (((offset) << PAGE_SHIFT) & PTE_RPN_MASK)})

/*

 * swp_entry_t must be independent of pte bits. We build a swp_entry_t from

 * swap type and offset we get from swap and convert that to pte to find a

 * matching pte in linux page table.

 * Clear bits not found in swap entries here.

 */

#define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val((pte)) & ~_PAGE_PTE })

#define __swp_entry_to_pte(x)	__pte((x).val | _PAGE_PTE)



#ifdef CONFIG_MEM_SOFT_DIRTY

#define _PAGE_SWP_SOFT_DIRTY   (1UL << (SWP_TYPE_BITS + _PAGE_BIT_SWAP_TYPE))

#else

#define _PAGE_SWP_SOFT_DIRTY	0UL

#endif /* CONFIG_MEM_SOFT_DIRTY */



#ifdef CONFIG_HAVE_ARCH_SOFT_DIRTY

static inline pte_t pte_swp_mksoft_dirty(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_SWP_SOFT_DIRTY);

}

static inline bool pte_swp_soft_dirty(pte_t pte)

{

	return !!(pte_val(pte) & _PAGE_SWP_SOFT_DIRTY);

}

static inline pte_t pte_swp_clear_soft_dirty(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_SWP_SOFT_DIRTY);

}

#endif /* CONFIG_HAVE_ARCH_SOFT_DIRTY */



static inline bool check_pte_access(unsigned long access, unsigned long ptev)

{

	/*

	 * This check for _PAGE_RWX and _PAGE_PRESENT bits

	 */

	if (access & ~ptev)

		return false;

	/*

	 * This check for access to privilege space

	 */

	if ((access & _PAGE_PRIVILEGED) != (ptev & _PAGE_PRIVILEGED))

		return false;



	return true;

}



#define _PAGE_CACHE_CTL	(_PAGE_NON_IDEMPOTENT | _PAGE_TOLERANT)



#define pgprot_noncached pgprot_noncached
@@ -576,77 +647,6 @@ extern struct page *pgd_page(pgd_t pgd); 
#define pgd_ERROR(e) \

	pr_err("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))



/* Encode and de-code a swap entry */

#define MAX_SWAPFILES_CHECK() do { \

	BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > SWP_TYPE_BITS); \

	/*							\

	 * Don't have overlapping bits with _PAGE_HPTEFLAGS	\

	 * We filter HPTEFLAGS on set_pte.			\

	 */							\

	BUILD_BUG_ON(_PAGE_HPTEFLAGS & (0x1f << _PAGE_BIT_SWAP_TYPE)); \

	BUILD_BUG_ON(_PAGE_HPTEFLAGS & _PAGE_SWP_SOFT_DIRTY);	\

	} while (0)

/*

 * on pte we don't need handle RADIX_TREE_EXCEPTIONAL_SHIFT;

 */

#define SWP_TYPE_BITS 5

#define __swp_type(x)		(((x).val >> _PAGE_BIT_SWAP_TYPE) \

				& ((1UL << SWP_TYPE_BITS) - 1))

#define __swp_offset(x)		(((x).val & PTE_RPN_MASK) >> PAGE_SHIFT)

#define __swp_entry(type, offset)	((swp_entry_t) { \

				((type) << _PAGE_BIT_SWAP_TYPE) \

				| (((offset) << PAGE_SHIFT) & PTE_RPN_MASK)})

/*

 * swp_entry_t must be independent of pte bits. We build a swp_entry_t from

 * swap type and offset we get from swap and convert that to pte to find a

 * matching pte in linux page table.

 * Clear bits not found in swap entries here.

 */

#define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val((pte)) & ~_PAGE_PTE })

#define __swp_entry_to_pte(x)	__pte((x).val | _PAGE_PTE)



static inline bool pte_user(pte_t pte)

{

	return !(pte_val(pte) & _PAGE_PRIVILEGED);

}



#ifdef CONFIG_MEM_SOFT_DIRTY

#define _PAGE_SWP_SOFT_DIRTY   (1UL << (SWP_TYPE_BITS + _PAGE_BIT_SWAP_TYPE))

#else

#define _PAGE_SWP_SOFT_DIRTY	0UL

#endif /* CONFIG_MEM_SOFT_DIRTY */



#ifdef CONFIG_HAVE_ARCH_SOFT_DIRTY

static inline pte_t pte_swp_mksoft_dirty(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_SWP_SOFT_DIRTY);

}

static inline bool pte_swp_soft_dirty(pte_t pte)

{

	return !!(pte_val(pte) & _PAGE_SWP_SOFT_DIRTY);

}

static inline pte_t pte_swp_clear_soft_dirty(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_SWP_SOFT_DIRTY);

}

#endif /* CONFIG_HAVE_ARCH_SOFT_DIRTY */



static inline bool check_pte_access(unsigned long access, unsigned long ptev)

{

	/*

	 * This check for _PAGE_RWX and _PAGE_PRESENT bits

	 */

	if (access & ~ptev)

		return false;

	/*

	 * This check for access to privilege space

	 */

	if ((access & _PAGE_PRIVILEGED) != (ptev & _PAGE_PRIVILEGED))

		return false;



	return true;

}



void pgtable_cache_add(unsigned shift, void (*ctor)(void *));

void pgtable_cache_init(void);