mm/gup: Drop the arch_pte_access_permitted() MMU callback

The only arch that defines it to something meaningful is x86.
But x86 doesn't use the generic GUP_fast() implementation -- the
only place where the callback is called.

Let's drop it.

Signed-off-by: Kirill A. Shutemov <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Aneesh Kumar K . V <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Catalin Marinas <[email protected]>
Cc: Dann Frazier <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Rik van Riel <[email protected]>
Cc: Steve Capper <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h
index b9e3f0aca261da2233a086cb41150bc3afacb9dc..ecf9885ab660d329a910a1bda642d69f72a1e305 100644 (file)
--- a/arch/powerpc/include/asm/mmu_context.h
+++ b/arch/powerpc/include/asm/mmu_context.h
@@ -163,11 +163,5 @@ static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
        /* by default, allow everything */
        return true;
 }
-
-static inline bool arch_pte_access_permitted(pte_t pte, bool write)
-{
-       /* by default, allow everything */
-       return true;
-}
 #endif /* __KERNEL__ */
 #endif /* __ASM_POWERPC_MMU_CONTEXT_H */

diff --git a/arch/s390/include/asm/mmu_context.h b/arch/s390/include/asm/mmu_context.h
index 6e31d87fb669bd2037d04d91f1fd5b5bddb9e06b..fa2bf69be18220b9dbdc57573b07ec06eb4d084f 100644 (file)
--- a/arch/s390/include/asm/mmu_context.h
+++ b/arch/s390/include/asm/mmu_context.h
@@ -156,10 +156,4 @@ static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
        /* by default, allow everything */
        return true;
 }
-
-static inline bool arch_pte_access_permitted(pte_t pte, bool write)
-{
-       /* by default, allow everything */
-       return true;
-}
 #endif /* __S390_MMU_CONTEXT_H */

diff --git a/arch/um/include/asm/mmu_context.h b/arch/um/include/asm/mmu_context.h
index 94ac2739918c62557269e51ed1be6b655dd3629e..b668e351fd6c2e4f7a4b75c8a67eada77449abc9 100644 (file)
--- a/arch/um/include/asm/mmu_context.h
+++ b/arch/um/include/asm/mmu_context.h
@@ -37,12 +37,6 @@ static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
        return true;
 }
 
-static inline bool arch_pte_access_permitted(pte_t pte, bool write)
-{
-       /* by default, allow everything */
-       return true;
-}
-
 /*
  * end asm-generic/mm_hooks.h functions
  */

diff --git a/arch/unicore32/include/asm/mmu_context.h b/arch/unicore32/include/asm/mmu_context.h
index 62dfc644c908ab5ffb173b493d5b97b93e8f7ca6..59b06b48f27d7a4e0d8b82fc147d3fdad7f75295 100644 (file)
--- a/arch/unicore32/include/asm/mmu_context.h
+++ b/arch/unicore32/include/asm/mmu_context.h
@@ -103,10 +103,4 @@ static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
        /* by default, allow everything */
        return true;
 }
-
-static inline bool arch_pte_access_permitted(pte_t pte, bool write)
-{
-       /* by default, allow everything */
-       return true;
-}
 #endif

diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
index 306c7e12af55b6518943dcf6fe2ab89745efdd1b..68b329d77b3a406365f3aa06a6aaf6a8bae24c81 100644 (file)
--- a/arch/x86/include/asm/mmu_context.h
+++ b/arch/x86/include/asm/mmu_context.h
@@ -268,8 +268,4 @@ static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
        return __pkru_allows_pkey(vma_pkey(vma), write);
 }
 
-static inline bool arch_pte_access_permitted(pte_t pte, bool write)
-{
-       return __pkru_allows_pkey(pte_flags_pkey(pte_flags(pte)), write);
-}
 #endif /* _ASM_X86_MMU_CONTEXT_H */

diff --git a/include/asm-generic/mm_hooks.h b/include/asm-generic/mm_hooks.h
index cc5d9a1405df925c43ec62a03be03c30ae921f56..41e5b6784b975d1974604c6265486ab858c3865f 100644 (file)
--- a/include/asm-generic/mm_hooks.h
+++ b/include/asm-generic/mm_hooks.h
@@ -32,10 +32,4 @@ static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
        /* by default, allow everything */
        return true;
 }
-
-static inline bool arch_pte_access_permitted(pte_t pte, bool write)
-{
-       /* by default, allow everything */
-       return true;
-}
 #endif /* _ASM_GENERIC_MM_HOOKS_H */

diff --git a/mm/gup.c b/mm/gup.c
index 04aa405350dce8656db4293a34e95e9bfbe166d8..3f2338ba3402fd98652effd0619cb96c065786e1 100644 (file)
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1216,9 +1216,6 @@ static int gup_pte_range(pmd_t pmd, unsigned long addr, unsigned long end,
                        pte_protnone(pte) || (write && !pte_write(pte)))
                        goto pte_unmap;
 
-               if (!arch_pte_access_permitted(pte, write))
-                       goto pte_unmap;
-
                VM_BUG_ON(!pfn_valid(pte_pfn(pte)));
                page = pte_page(pte);
                head = compound_head(page);