1 files changed, 7 insertions, 10 deletions

diff --git a/mm/memory.c b/mm/memory.c
index e302ae1dcce0..0897830011f3 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -756,7 +756,7 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr,
         unsigned long pfn = pte_pfn(pte);
 
         if (HAVE_PTE_SPECIAL) {
-                if (likely(!pte_special(pte)))
+                if (likely(!pte_special(pte) || pte_numa(pte)))
                         goto check_pfn;
                 if (vma->vm_flags & (VM_PFNMAP | VM_MIXEDMAP))
                         return NULL;
@@ -782,14 +782,15 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr,
                 }
         }
 
-        if (is_zero_pfn(pfn))
-                return NULL;
 check_pfn:
         if (unlikely(pfn > highest_memmap_pfn)) {
                 print_bad_pte(vma, addr, pte, NULL);
                 return NULL;
         }
 
+        if (is_zero_pfn(pfn))
+                return NULL;
+
         /*
          * NOTE! We still have PageReserved() pages in the page tables.
          * eg. VDSO mappings can cause them to exist.
@@ -1722,13 +1723,9 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
         VM_BUG_ON(!!pages != !!(gup_flags & FOLL_GET));
 
         /*
-         * If FOLL_FORCE and FOLL_NUMA are both set, handle_mm_fault
-         * would be called on PROT_NONE ranges. We must never invoke
-         * handle_mm_fault on PROT_NONE ranges or the NUMA hinting
-         * page faults would unprotect the PROT_NONE ranges if
-         * _PAGE_NUMA and _PAGE_PROTNONE are sharing the same pte/pmd
-         * bitflag. So to avoid that, don't set FOLL_NUMA if
-         * FOLL_FORCE is set.
+         * If FOLL_FORCE is set then do not force a full fault as the hinting
+         * fault information is unrelated to the reference behaviour of a task
+         * using the address space
          */
         if (!(gup_flags & FOLL_FORCE))
                 gup_flags |= FOLL_NUMA;