mm: Unify pte_to_pgoff and pgoff_to_pte helpers
PATCH 1/1 mm: Unify pte_to_pgoff and pgoff_to_pte helpers
Use unified pte_bitop helper to manipulate bits in pte/pgoff bitfield, and convert pte_to_pgoff/pgoff_to_pte to inlines.
Signed-off-by Cyrill Gorcunov <[email protected]>
Cc Andrew Morton <[email protected]>
Cc Pavel Emelyanov <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc "H. Peter Anvin" <[email protected]>
Cc Thomas Gleixner <[email protected]>
--- arch/x86/include/asm/pgtable-2level.h | 100 ++++++++++++++++++++-------------- 1 file changed, 59 insertions(+), 41 deletions(-)
arch/x86/include/asm/pgtable-2level.h +59 -41
@@ -55,6 +55,13 @@ static inline pmd_t native_pmdp_get_and_#define native_pmdp_get_and_clear (xp) native_local_pmdp_get_and_clear(xp)#endif +/* Bit manipulation helper on pte/pgoff entry */ +static inline unsigned long pte_bitop (unsigned long value,unsigned int rightshift, +unsigned long mask,unsigned int leftshift) +{ +return ((value >> rightshift) & mask) << leftshift; +} +#ifdef CONFIG_MEM_SOFT_DIRTY /*
@@ -71,31 +78,34 @@ static inline pmd_t native_pmdp_get_and_#define PTE_FILE_BITS2 (PTE_FILE_SHIFT3 - PTE_FILE_SHIFT2 - 1)#define PTE_FILE_BITS3 (PTE_FILE_SHIFT4 - PTE_FILE_SHIFT3 - 1) -#define pte_to_pgoff (pte) \ - ((((pte).pte_low >> (PTE_FILE_SHIFT1)) \ - & ((1U << PTE_FILE_BITS1) - 1))) \ - + ((((pte).pte_low >> (PTE_FILE_SHIFT2)) \ - & ((1U << PTE_FILE_BITS2) - 1)) \ - << (PTE_FILE_BITS1)) \ - + ((((pte).pte_low >> (PTE_FILE_SHIFT3)) \ - & ((1U << PTE_FILE_BITS3) - 1)) \ - << (PTE_FILE_BITS1 + PTE_FILE_BITS2)) \ - + ((((pte).pte_low >> (PTE_FILE_SHIFT4))) \ - << (PTE_FILE_BITS1 + PTE_FILE_BITS2 + PTE_FILE_BITS3)) - -#define pgoff_to_pte (off) \ - ((pte_t) { .pte_low = \ - ((((off)) & ((1U << PTE_FILE_BITS1) - 1)) << PTE_FILE_SHIFT1) \ - + ((((off) >> PTE_FILE_BITS1) \ - & ((1U << PTE_FILE_BITS2) - 1)) \ - << PTE_FILE_SHIFT2) \ - + ((((off) >> (PTE_FILE_BITS1 + PTE_FILE_BITS2)) \ - & ((1U << PTE_FILE_BITS3) - 1)) \ - << PTE_FILE_SHIFT3) \ - + ((((off) >> \ - (PTE_FILE_BITS1 + PTE_FILE_BITS2 + PTE_FILE_BITS3))) \ - << PTE_FILE_SHIFT4) \ - + _PAGE_FILE }) +#define PTE_FILE_MASK1 ((1U << PTE_FILE_BITS1) - 1) +#define PTE_FILE_MASK2 ((1U << PTE_FILE_BITS2) - 1) +#define PTE_FILE_MASK3 ((1U << PTE_FILE_BITS3) - 1) + +#define PTE_FILE_LSHIFT2 (PTE_FILE_BITS1) +#define PTE_FILE_LSHIFT3 (PTE_FILE_BITS1 + PTE_FILE_BITS2) +#define PTE_FILE_LSHIFT4 (PTE_FILE_BITS1 + PTE_FILE_BITS2 + PTE_FILE_BITS3) + +static __always_inline pgoff_t pte_to_pgoff(pte_t pte) +{ +return (pgoff_t) + (pte_bitop (pte.pte_low,PTE_FILE_SHIFT1 ,PTE_FILE_MASK1 ,0 ) + +pte_bitop (pte.pte_low,PTE_FILE_SHIFT2 ,PTE_FILE_MASK2 ,PTE_FILE_LSHIFT2 ) + +pte_bitop (pte.pte_low,PTE_FILE_SHIFT3 ,PTE_FILE_MASK3 ,PTE_FILE_LSHIFT3 ) + +pte_bitop (pte.pte_low,PTE_FILE_SHIFT4 ,-1UL ,PTE_FILE_LSHIFT4 )); +} + +static __always_inline pte_t pgoff_to_pte(pgoff_t off) +{ +return (pte_t ){ + .pte_low = +pte_bitop (off,0 ,PTE_FILE_MASK1 ,PTE_FILE_SHIFT1 ) + +pte_bitop (off,PTE_FILE_LSHIFT2 ,PTE_FILE_MASK2 ,PTE_FILE_SHIFT2 ) + +pte_bitop (off,PTE_FILE_LSHIFT3 ,PTE_FILE_MASK3 ,PTE_FILE_SHIFT3 ) + +pte_bitop (off,PTE_FILE_LSHIFT4 ,-1UL ,PTE_FILE_SHIFT4 ) + + _PAGE_FILE, + }; +}#else /* CONFIG_MEM_SOFT_DIRTY */
@@ -115,22 +125,30 @@ static inline pmd_t native_pmdp_get_and_#define PTE_FILE_BITS1 (PTE_FILE_SHIFT2 - PTE_FILE_SHIFT1 - 1)#define PTE_FILE_BITS2 (PTE_FILE_SHIFT3 - PTE_FILE_SHIFT2 - 1) -#define pte_to_pgoff (pte) \ - ((((pte).pte_low >> PTE_FILE_SHIFT1) \ - & ((1U << PTE_FILE_BITS1) - 1)) \ - + ((((pte).pte_low >> PTE_FILE_SHIFT2) \ - & ((1U << PTE_FILE_BITS2) - 1)) << PTE_FILE_BITS1) \ - + (((pte).pte_low >> PTE_FILE_SHIFT3) \ - << (PTE_FILE_BITS1 + PTE_FILE_BITS2))) - -#define pgoff_to_pte (off) \ - ((pte_t) { .pte_low = \ - (((off) & ((1U << PTE_FILE_BITS1) - 1)) << PTE_FILE_SHIFT1) \ - + ((((off) >> PTE_FILE_BITS1) & ((1U << PTE_FILE_BITS2) - 1)) \ - << PTE_FILE_SHIFT2) \ - + (((off) >> (PTE_FILE_BITS1 + PTE_FILE_BITS2)) \ - << PTE_FILE_SHIFT3) \ - + _PAGE_FILE }) +#define PTE_FILE_MASK1 ((1U << PTE_FILE_BITS1) - 1) +#define PTE_FILE_MASK2 ((1U << PTE_FILE_BITS2) - 1) + +#define PTE_FILE_LSHIFT2 (PTE_FILE_BITS1) +#define PTE_FILE_LSHIFT3 (PTE_FILE_BITS1 + PTE_FILE_BITS2) + +static __always_inline pgoff_t pte_to_pgoff(pte_t pte) +{ +return (pgoff_t) + (pte_bitop (pte.pte_low,PTE_FILE_SHIFT1 ,PTE_FILE_MASK1 ,0 ) + +pte_bitop (pte.pte_low,PTE_FILE_SHIFT2 ,PTE_FILE_MASK2 ,PTE_FILE_LSHIFT2 ) + +pte_bitop (pte.pte_low,PTE_FILE_SHIFT3 ,-1UL ,PTE_FILE_LSHIFT3 )); +} + +static __always_inline pte_t pgoff_to_pte(pgoff_t off) +{ +return (pte_t ){ + .pte_low = +pte_bitop (off,0 ,PTE_FILE_MASK1 ,PTE_FILE_SHIFT1 ) + +pte_bitop (off,PTE_FILE_LSHIFT2 ,PTE_FILE_MASK2 ,PTE_FILE_SHIFT2 ) + +pte_bitop (off,PTE_FILE_LSHIFT3 ,-1UL ,PTE_FILE_SHIFT3 ) + + _PAGE_FILE, + }; +}#endif /* CONFIG_MEM_SOFT_DIRTY */