mm, vmscan: move lru_lock to the node

Node-based reclaim requires node-based LRUs and locking.  This is a
preparation patch that just moves the lru_lock to the node so later
patches are easier to review.  It is a mechanical change but note this
patch makes contention worse because the LRU lock is hotter and direct
reclaim and kswapd can contend on the same lock even when reclaiming
from different zones.

Link: http://lkml.kernel.org/r/1467970510-21195-3-git-send-email-mgorman@techsingularity.net
Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
Reviewed-by: Minchan Kim <minchan@kernel.org>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Rik van Riel <riel@surriel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/mm/mlock.c b/mm/mlock.c
index ef8dc9f395c4..997f63082ff5 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -188,7 +188,7 @@ unsigned int munlock_vma_page(struct page *page)
          * might otherwise copy PageMlocked to part of the tail pages before
          * we clear it in the head page. It also stabilizes hpage_nr_pages().
          */
-        spin_lock_irq(&zone->lru_lock);
+        spin_lock_irq(zone_lru_lock(zone));
 
         nr_pages = hpage_nr_pages(page);
         if (!TestClearPageMlocked(page))
@@ -197,14 +197,14 @@ unsigned int munlock_vma_page(struct page *page)
         __mod_zone_page_state(zone, NR_MLOCK, -nr_pages);
 
         if (__munlock_isolate_lru_page(page, true)) {
-                spin_unlock_irq(&zone->lru_lock);
+                spin_unlock_irq(zone_lru_lock(zone));
                 __munlock_isolated_page(page);
                 goto out;
         }
         __munlock_isolation_failed(page);
 
 unlock_out:
-        spin_unlock_irq(&zone->lru_lock);
+        spin_unlock_irq(zone_lru_lock(zone));
 
 out:
         return nr_pages - 1;
@@ -289,7 +289,7 @@ static void __munlock_pagevec(struct pagevec *pvec, struct zone *zone)
         pagevec_init(&pvec_putback, 0);
 
         /* Phase 1: page isolation */
-        spin_lock_irq(&zone->lru_lock);
+        spin_lock_irq(zone_lru_lock(zone));
         for (i = 0; i < nr; i++) {
                 struct page *page = pvec->pages[i];
 
@@ -315,7 +315,7 @@ static void __munlock_pagevec(struct pagevec *pvec, struct zone *zone)
         }
         delta_munlocked = -nr + pagevec_count(&pvec_putback);
         __mod_zone_page_state(zone, NR_MLOCK, delta_munlocked);
-        spin_unlock_irq(&zone->lru_lock);
+        spin_unlock_irq(zone_lru_lock(zone));
 
         /* Now we can release pins of pages that we are not munlocking */
         pagevec_release(&pvec_putback);