mm: convert zone_reclaim to node_reclaim

As reclaim is now per-node based, convert zone_reclaim to be
node_reclaim.  It is possible that a node will be reclaimed multiple
times if it has multiple zones but this is unavoidable without caching
all nodes traversed so far.  The documentation and interface to
userspace is the same from a configuration perspective and will will be
similar in behaviour unless the node-local allocation requests were also
limited to lower zones.

Link: http://lkml.kernel.org/r/1467970510-21195-24-git-send-email-mgorman@techsingularity.net
Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
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: Michal Hocko <mhocko@kernel.org>
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, 16 insertions, 8 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index f2c56a13b065..c9d1720c58a3 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2942,16 +2942,16 @@ zonelist_scan:
                         if (alloc_flags & ALLOC_NO_WATERMARKS)
                                 goto try_this_zone;
 
-                        if (zone_reclaim_mode == 0 ||
+                        if (node_reclaim_mode == 0 ||
                             !zone_allows_reclaim(ac->preferred_zoneref->zone, zone))
                                 continue;
 
-                        ret = zone_reclaim(zone, gfp_mask, order);
+                        ret = node_reclaim(zone->zone_pgdat, gfp_mask, order);
                         switch (ret) {
-                        case ZONE_RECLAIM_NOSCAN:
+                        case NODE_RECLAIM_NOSCAN:
                                 /* did not scan */
                                 continue;
-                        case ZONE_RECLAIM_FULL:
+                        case NODE_RECLAIM_FULL:
                                 /* scanned but unreclaimable */
                                 continue;
                         default:
@@ -5948,9 +5948,9 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat)
                 zone->managed_pages = is_highmem_idx(j) ? realsize : freesize;
 #ifdef CONFIG_NUMA
                 zone->node = nid;
-                zone->min_unmapped_pages = (freesize*sysctl_min_unmapped_ratio)
+                pgdat->min_unmapped_pages += (freesize*sysctl_min_unmapped_ratio)
                                                 / 100;
-                zone->min_slab_pages = (freesize * sysctl_min_slab_ratio) / 100;
+                pgdat->min_slab_pages += (freesize * sysctl_min_slab_ratio) / 100;
 #endif
                 zone->name = zone_names[j];
                 zone->zone_pgdat = pgdat;
@@ -6922,6 +6922,7 @@ int watermark_scale_factor_sysctl_handler(struct ctl_table *table, int write,
 int sysctl_min_unmapped_ratio_sysctl_handler(struct ctl_table *table, int write,
         void __user *buffer, size_t *length, loff_t *ppos)
 {
+        struct pglist_data *pgdat;
         struct zone *zone;
         int rc;
 
@@ -6929,8 +6930,11 @@ int sysctl_min_unmapped_ratio_sysctl_handler(struct ctl_table *table, int write,
         if (rc)
                 return rc;
 
+        for_each_online_pgdat(pgdat)
+                pgdat->min_slab_pages = 0;
+
         for_each_zone(zone)
-                zone->min_unmapped_pages = (zone->managed_pages *
+                zone->zone_pgdat->min_unmapped_pages += (zone->managed_pages *
                                 sysctl_min_unmapped_ratio) / 100;
         return 0;
 }
@@ -6938,6 +6942,7 @@ int sysctl_min_unmapped_ratio_sysctl_handler(struct ctl_table *table, int write,
 int sysctl_min_slab_ratio_sysctl_handler(struct ctl_table *table, int write,
         void __user *buffer, size_t *length, loff_t *ppos)
 {
+        struct pglist_data *pgdat;
         struct zone *zone;
         int rc;
 
@@ -6945,8 +6950,11 @@ int sysctl_min_slab_ratio_sysctl_handler(struct ctl_table *table, int write,
         if (rc)
                 return rc;
 
+        for_each_online_pgdat(pgdat)
+                pgdat->min_slab_pages = 0;
+
         for_each_zone(zone)
-                zone->min_slab_pages = (zone->managed_pages *
+                zone->zone_pgdat->min_slab_pages += (zone->managed_pages *
                                 sysctl_min_slab_ratio) / 100;
         return 0;
 }