[RFC PATCH V1 15/33] powerpc/mm: Use helper for finding pte filter mask for gup
From: Aneesh Kumar K.V <hidden>
Date: 2016-01-12 07:17:07
Subsystem:
linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Madhavan Srinivasan, Linus Torvalds
Signed-off-by: Aneesh Kumar K.V <redacted> --- arch/powerpc/include/asm/book3s/32/pgtable.h | 8 ++++++++ arch/powerpc/include/asm/book3s/64/hash.h | 9 +++++++++ arch/powerpc/include/asm/nohash/pgtable.h | 9 +++++++++ arch/powerpc/mm/hugetlbpage.c | 5 +---- 4 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/include/asm/book3s/32/pgtable.h b/arch/powerpc/include/asm/book3s/32/pgtable.h
index 77adada2f3b4..c0898e26ed4a 100644
--- a/arch/powerpc/include/asm/book3s/32/pgtable.h
+++ b/arch/powerpc/include/asm/book3s/32/pgtable.h@@ -483,6 +483,14 @@ static inline unsigned long pte_io_cache_bits(void) return _PAGE_NO_CACHE | _PAGE_GUARDED; } +static inline unsigned long gup_pte_filter(int write) +{ + unsigned long mask; + mask = _PAGE_PRESENT | _PAGE_USER; + if (write) + mask |= _PAGE_RW; + return mask; +} #endif /* !__ASSEMBLY__ */ #endif /* _ASM_POWERPC_BOOK3S_32_PGTABLE_H */
diff --git a/arch/powerpc/include/asm/book3s/64/hash.h b/arch/powerpc/include/asm/book3s/64/hash.h
index 1b27c0c8effa..ee8dd7e561b0 100644
--- a/arch/powerpc/include/asm/book3s/64/hash.h
+++ b/arch/powerpc/include/asm/book3s/64/hash.h@@ -583,6 +583,15 @@ static inline unsigned long pte_io_cache_bits(void) return _PAGE_NO_CACHE | _PAGE_GUARDED; } +static inline unsigned long gup_pte_filter(int write) +{ + unsigned long mask; + mask = _PAGE_PRESENT | _PAGE_USER; + if (write) + mask |= _PAGE_RW; + return mask; +} + #ifdef CONFIG_TRANSPARENT_HUGEPAGE extern void hpte_do_hugepage_flush(struct mm_struct *mm, unsigned long addr, pmd_t *pmdp, unsigned long old_pmd);
diff --git a/arch/powerpc/include/asm/nohash/pgtable.h b/arch/powerpc/include/asm/nohash/pgtable.h
index 8c4bb8fda0de..e4173cb06e5b 100644
--- a/arch/powerpc/include/asm/nohash/pgtable.h
+++ b/arch/powerpc/include/asm/nohash/pgtable.h@@ -229,6 +229,15 @@ static inline unsigned long pte_io_cache_bits(void) return _PAGE_NO_CACHE | _PAGE_GUARDED; } +static inline unsigned long gup_pte_filter(int write) +{ + unsigned long mask; + mask = _PAGE_PRESENT | _PAGE_USER; + if (write) + mask |= _PAGE_RW; + return mask; +} + #ifdef CONFIG_HUGETLB_PAGE static inline int hugepd_ok(hugepd_t hpd) {
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 26fb814f289f..4e970f58f8d9 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c@@ -417,10 +417,7 @@ int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr, end = pte_end; pte = READ_ONCE(*ptep); - mask = _PAGE_PRESENT | _PAGE_USER; - if (write) - mask |= _PAGE_RW; - + mask = gup_pte_filter(write); if ((pte_val(pte) & mask) != mask) return 0;
--
2.5.0