Commit db08f203 authored Feb 24, 2017 by Aneesh Kumar K.V Committed by Linus Torvalds Feb 24, 2017

mm/gup: check for protnone only if it is a PTE entry

Do the prot_none/FOLL_NUMA check after we are sure this is a THP pte.
Archs can implement prot_none such that it can return true for regular
pmd entries.

Link: http://lkml.kernel.org/r/1487498326-8734-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Rik van Riel <riel@surriel.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 199eaa05

mm/gup.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -272,8 +272,6 @@ struct page follow_page_mask(struct vm_area_struct vma,
		return page;
		return no_page_table(vma, flags);
		}
		if ((flags & FOLL_NUMA) && pmd_protnone(*pmd))
		return no_page_table(vma, flags);
		if (pmd_devmap(*pmd)) {
		ptl = pmd_lock(mm, pmd);
		page = follow_devmap_pmd(vma, address, pmd, flags);
		@@ -284,6 +282,9 @@ struct page follow_page_mask(struct vm_area_struct vma,
		if (likely(!pmd_trans_huge(*pmd)))
		return follow_page_pte(vma, address, pmd, flags);

		if ((flags & FOLL_NUMA) && pmd_protnone(*pmd))
		return no_page_table(vma, flags);

		ptl = pmd_lock(mm, pmd);
		if (unlikely(!pmd_trans_huge(*pmd))) {
		spin_unlock(ptl);