mm, vmscan: make shrink_node decisions more node-centric

Earlier patches focused on having direct reclaim and kswapd use data
that is node-centric for reclaiming but shrink_node() itself still uses
too much zone information.  This patch removes unnecessary zone-based
information with the most important decision being whether to continue
reclaim or not.  Some memcg APIs are adjusted as a result even though
memcg itself still uses some zone information.

[mgorman@techsingularity.net: optimization]
  Link: http://lkml.kernel.org/r/1468588165-12461-2-git-send-email-mgorman@techsingularity.net
Link: http://lkml.kernel.org/r/1467970510-21195-14-git-send-email-mgorman@techsingularity.net
Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Minchan Kim <minchan@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, 3 insertions, 3 deletions

diff --git a/mm/workingset.c b/mm/workingset.c
index 7820a7e1ca98..df0dacaf54ee 100644
--- a/mm/workingset.c
+++ b/mm/workingset.c
@@ -218,7 +218,7 @@ void *workingset_eviction(struct address_space *mapping, struct page *page)
         VM_BUG_ON_PAGE(page_count(page), page);
         VM_BUG_ON_PAGE(!PageLocked(page), page);
 
-        lruvec = mem_cgroup_zone_lruvec(zone, memcg);
+        lruvec = mem_cgroup_lruvec(zone->zone_pgdat, zone, memcg);
         eviction = atomic_long_inc_return(&lruvec->inactive_age);
         return pack_shadow(memcgid, zone, eviction);
 }
@@ -267,7 +267,7 @@ bool workingset_refault(void *shadow)
                 rcu_read_unlock();
                 return false;
         }
-        lruvec = mem_cgroup_zone_lruvec(zone, memcg);
+        lruvec = mem_cgroup_lruvec(zone->zone_pgdat, zone, memcg);
         refault = atomic_long_read(&lruvec->inactive_age);
         active_file = lruvec_lru_size(lruvec, LRU_ACTIVE_FILE);
         rcu_read_unlock();
@@ -319,7 +319,7 @@ void workingset_activation(struct page *page)
         memcg = page_memcg_rcu(page);
         if (!mem_cgroup_disabled() && !memcg)
                 goto out;
-        lruvec = mem_cgroup_zone_lruvec(page_zone(page), memcg);
+        lruvec = mem_cgroup_lruvec(page_pgdat(page), page_zone(page), memcg);
         atomic_long_inc(&lruvec->inactive_age);
 out:
         rcu_read_unlock();