mm, thp: move ptl taking inside page_check_address_pmd()

With split page table lock we can't know which lock we need to take
before we find the relevant pmd.

Let's move lock taking inside the function.

Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Tested-by: Alex Thorlton <athorlton@sgi.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "Eric W . Biederman" <ebiederm@xmission.com>
Cc: "Paul E . McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Dave Jones <davej@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Robin Holt <robinmholt@gmail.com>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 8 deletions

diff --git a/mm/rmap.c b/mm/rmap.c
index fd3ee7a54a13..b59d741dcf65 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -665,25 +665,23 @@ int page_referenced_one(struct page *page, struct vm_area_struct *vma,
                         unsigned long *vm_flags)
 {
         struct mm_struct *mm = vma->vm_mm;
+        spinlock_t *ptl;
         int referenced = 0;
 
         if (unlikely(PageTransHuge(page))) {
                 pmd_t *pmd;
 
-                spin_lock(&mm->page_table_lock);
                 /*
                  * rmap might return false positives; we must filter
                  * these out using page_check_address_pmd().
                  */
                 pmd = page_check_address_pmd(page, mm, address,
-                                             PAGE_CHECK_ADDRESS_PMD_FLAG);
-                if (!pmd) {
-                        spin_unlock(&mm->page_table_lock);
+                                             PAGE_CHECK_ADDRESS_PMD_FLAG, &ptl);
+                if (!pmd)
                         goto out;
-                }
 
                 if (vma->vm_flags & VM_LOCKED) {
-                        spin_unlock(&mm->page_table_lock);
+                        spin_unlock(ptl);
                         *mapcount = 0;  /* break early from loop */
                         *vm_flags |= VM_LOCKED;
                         goto out;
@@ -692,10 +690,9 @@ int page_referenced_one(struct page *page, struct vm_area_struct *vma,
                 /* go ahead even if the pmd is pmd_trans_splitting() */
                 if (pmdp_clear_flush_young_notify(vma, address, pmd))
                         referenced++;
-                spin_unlock(&mm->page_table_lock);
+                spin_unlock(ptl);
         } else {
                 pte_t *pte;
-                spinlock_t *ptl;
 
                 /*
                  * rmap might return false positives; we must filter