1 files changed, 37 insertions, 31 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 5760c626c309..35e2d0f9d44f 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1078,9 +1078,9 @@ static void free_pcppages_bulk(struct zone *zone, int count,
 
         spin_lock(&zone->lock);
         isolated_pageblocks = has_isolate_pageblock(zone);
-        nr_scanned = zone_page_state(zone, NR_PAGES_SCANNED);
+        nr_scanned = node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED);
         if (nr_scanned)
-                __mod_zone_page_state(zone, NR_PAGES_SCANNED, -nr_scanned);
+                __mod_node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED, -nr_scanned);
 
         while (count) {
                 struct page *page;
@@ -1135,9 +1135,9 @@ static void free_one_page(struct zone *zone,
 {
         unsigned long nr_scanned;
         spin_lock(&zone->lock);
-        nr_scanned = zone_page_state(zone, NR_PAGES_SCANNED);
+        nr_scanned = node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED);
         if (nr_scanned)
-                __mod_zone_page_state(zone, NR_PAGES_SCANNED, -nr_scanned);
+                __mod_node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED, -nr_scanned);
 
         if (unlikely(has_isolate_pageblock(zone) ||
                 is_migrate_isolate(migratetype))) {
@@ -4288,6 +4288,7 @@ void show_free_areas(unsigned int filter)
         unsigned long free_pcp = 0;
         int cpu;
         struct zone *zone;
+        pg_data_t *pgdat;
 
         for_each_populated_zone(zone) {
                 if (skip_free_areas_node(filter, zone_to_nid(zone)))
@@ -4306,13 +4307,13 @@ void show_free_areas(unsigned int filter)
                 " anon_thp: %lu shmem_thp: %lu shmem_pmdmapped: %lu\n"
 #endif
                 " free:%lu free_pcp:%lu free_cma:%lu\n",
-                global_page_state(NR_ACTIVE_ANON),
-                global_page_state(NR_INACTIVE_ANON),
-                global_page_state(NR_ISOLATED_ANON),
-                global_page_state(NR_ACTIVE_FILE),
-                global_page_state(NR_INACTIVE_FILE),
-                global_page_state(NR_ISOLATED_FILE),
-                global_page_state(NR_UNEVICTABLE),
+                global_node_page_state(NR_ACTIVE_ANON),
+                global_node_page_state(NR_INACTIVE_ANON),
+                global_node_page_state(NR_ISOLATED_ANON),
+                global_node_page_state(NR_ACTIVE_FILE),
+                global_node_page_state(NR_INACTIVE_FILE),
+                global_node_page_state(NR_ISOLATED_FILE),
+                global_node_page_state(NR_UNEVICTABLE),
                 global_page_state(NR_FILE_DIRTY),
                 global_page_state(NR_WRITEBACK),
                 global_page_state(NR_UNSTABLE_NFS),
@@ -4331,6 +4332,28 @@ void show_free_areas(unsigned int filter)
                 free_pcp,
                 global_page_state(NR_FREE_CMA_PAGES));
 
+        for_each_online_pgdat(pgdat) {
+                printk("Node %d"
+                        " active_anon:%lukB"
+                        " inactive_anon:%lukB"
+                        " active_file:%lukB"
+                        " inactive_file:%lukB"
+                        " unevictable:%lukB"
+                        " isolated(anon):%lukB"
+                        " isolated(file):%lukB"
+                        " all_unreclaimable? %s"
+                        "\n",
+                        pgdat->node_id,
+                        K(node_page_state(pgdat, NR_ACTIVE_ANON)),
+                        K(node_page_state(pgdat, NR_INACTIVE_ANON)),
+                        K(node_page_state(pgdat, NR_ACTIVE_FILE)),
+                        K(node_page_state(pgdat, NR_INACTIVE_FILE)),
+                        K(node_page_state(pgdat, NR_UNEVICTABLE)),
+                        K(node_page_state(pgdat, NR_ISOLATED_ANON)),
+                        K(node_page_state(pgdat, NR_ISOLATED_FILE)),
+                        !pgdat_reclaimable(pgdat) ? "yes" : "no");
+        }
+
         for_each_populated_zone(zone) {
                 int i;
 
@@ -4347,13 +4370,6 @@ void show_free_areas(unsigned int filter)
                         " min:%lukB"
                         " low:%lukB"
                         " high:%lukB"
-                        " active_anon:%lukB"
-                        " inactive_anon:%lukB"
-                        " active_file:%lukB"
-                        " inactive_file:%lukB"
-                        " unevictable:%lukB"
-                        " isolated(anon):%lukB"
-                        " isolated(file):%lukB"
                         " present:%lukB"
                         " managed:%lukB"
                         " mlocked:%lukB"
@@ -4376,21 +4392,13 @@ void show_free_areas(unsigned int filter)
                         " local_pcp:%ukB"
                         " free_cma:%lukB"
                         " writeback_tmp:%lukB"
-                        " pages_scanned:%lu"
-                        " all_unreclaimable? %s"
+                        " node_pages_scanned:%lu"
                         "\n",
                         zone->name,
                         K(zone_page_state(zone, NR_FREE_PAGES)),
                         K(min_wmark_pages(zone)),
                         K(low_wmark_pages(zone)),
                         K(high_wmark_pages(zone)),
-                        K(zone_page_state(zone, NR_ACTIVE_ANON)),
-                        K(zone_page_state(zone, NR_INACTIVE_ANON)),
-                        K(zone_page_state(zone, NR_ACTIVE_FILE)),
-                        K(zone_page_state(zone, NR_INACTIVE_FILE)),
-                        K(zone_page_state(zone, NR_UNEVICTABLE)),
-                        K(zone_page_state(zone, NR_ISOLATED_ANON)),
-                        K(zone_page_state(zone, NR_ISOLATED_FILE)),
                         K(zone->present_pages),
                         K(zone->managed_pages),
                         K(zone_page_state(zone, NR_MLOCK)),
@@ -4415,9 +4423,7 @@ void show_free_areas(unsigned int filter)
                         K(this_cpu_read(zone->pageset->pcp.count)),
                         K(zone_page_state(zone, NR_FREE_CMA_PAGES)),
                         K(zone_page_state(zone, NR_WRITEBACK_TEMP)),
-                        K(zone_page_state(zone, NR_PAGES_SCANNED)),
-                        (!zone_reclaimable(zone) ? "yes" : "no")
-                        );
+                        K(node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED)));
                 printk("lowmem_reserve[]:");
                 for (i = 0; i < MAX_NR_ZONES; i++)
                         printk(" %ld", zone->lowmem_reserve[i]);
@@ -5967,7 +5973,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat)
                 /* For bootup, initialized properly in watermark setup */
                 mod_zone_page_state(zone, NR_ALLOC_BATCH, zone->managed_pages);
 
-                lruvec_init(&zone->lruvec);
+                lruvec_init(zone_lruvec(zone));
                 if (!size)
                         continue;