mm: move page mapped accounting to the node

Reclaim makes decisions based on the number of pages that are mapped but
it's mixing node and zone information.  Account NR_FILE_MAPPED and
NR_ANON_PAGES pages on the node.

Link: http://lkml.kernel.org/r/1467970510-21195-18-git-send-email-mgorman@techsingularity.net
Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Michal Hocko <mhocko@suse.com>
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/page_alloc.c b/mm/page_alloc.c
index 73b018df6e42..c11935bf37cb 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4312,7 +4312,7 @@ void show_free_areas(unsigned int filter)
                 global_page_state(NR_UNSTABLE_NFS),
                 global_page_state(NR_SLAB_RECLAIMABLE),
                 global_page_state(NR_SLAB_UNRECLAIMABLE),
-                global_page_state(NR_FILE_MAPPED),
+                global_node_page_state(NR_FILE_MAPPED),
                 global_page_state(NR_SHMEM),
                 global_page_state(NR_PAGETABLE),
                 global_page_state(NR_BOUNCE),
@@ -4334,6 +4334,7 @@ void show_free_areas(unsigned int filter)
                         " unevictable:%lukB"
                         " isolated(anon):%lukB"
                         " isolated(file):%lukB"
+                        " mapped:%lukB"
                         " all_unreclaimable? %s"
                         "\n",
                         pgdat->node_id,
@@ -4344,6 +4345,7 @@ void show_free_areas(unsigned int filter)
                         K(node_page_state(pgdat, NR_UNEVICTABLE)),
                         K(node_page_state(pgdat, NR_ISOLATED_ANON)),
                         K(node_page_state(pgdat, NR_ISOLATED_FILE)),
+                        K(node_page_state(pgdat, NR_FILE_MAPPED)),
                         !pgdat_reclaimable(pgdat) ? "yes" : "no");
         }
 
@@ -4368,7 +4370,6 @@ void show_free_areas(unsigned int filter)
                         " mlocked:%lukB"
                         " dirty:%lukB"
                         " writeback:%lukB"
-                        " mapped:%lukB"
                         " shmem:%lukB"
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
                         " shmem_thp: %lukB"
@@ -4397,7 +4398,6 @@ void show_free_areas(unsigned int filter)
                         K(zone_page_state(zone, NR_MLOCK)),
                         K(zone_page_state(zone, NR_FILE_DIRTY)),
                         K(zone_page_state(zone, NR_WRITEBACK)),
-                        K(zone_page_state(zone, NR_FILE_MAPPED)),
                         K(zone_page_state(zone, NR_SHMEM)),
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
                         K(zone_page_state(zone, NR_SHMEM_THPS) * HPAGE_PMD_NR),