Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50658e2e authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds
Browse files

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: default avatarMel Gorman <mgorman@techsingularity.net>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Hillf Danton <hillf.zj@alibaba-inc.com>
Acked-by: default avatarJohannes 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 281e3726

arch/tile/mm/pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ void show_mem(unsigned int filter) 
	       global_page_state(NR_FREE_PAGES),

	       (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_PAGETABLE),

	       global_page_state(NR_BOUNCE),

	       global_page_state(NR_FILE_PAGES),

drivers/base/node.c

+2 −2
Original line number Diff line number Diff line
@@ -121,8 +121,8 @@ static ssize_t node_read_meminfo(struct device *dev, 
		       nid, K(sum_zone_node_page_state(nid, NR_FILE_DIRTY)),

		       nid, K(sum_zone_node_page_state(nid, NR_WRITEBACK)),

		       nid, K(sum_zone_node_page_state(nid, NR_FILE_PAGES)),

		       nid, K(sum_zone_node_page_state(nid, NR_FILE_MAPPED)),

		       nid, K(sum_zone_node_page_state(nid, NR_ANON_PAGES)),

		       nid, K(node_page_state(pgdat, NR_FILE_MAPPED)),

		       nid, K(node_page_state(pgdat, NR_ANON_PAGES)),

		       nid, K(i.sharedram),

		       nid, sum_zone_node_page_state(nid, NR_KERNEL_STACK) *

				THREAD_SIZE / 1024,

fs/proc/meminfo.c

+2 −2
Original line number Diff line number Diff line
@@ -140,8 +140,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v) 
		K(i.freeswap),

		K(global_page_state(NR_FILE_DIRTY)),

		K(global_page_state(NR_WRITEBACK)),

		K(global_page_state(NR_ANON_PAGES)),

		K(global_page_state(NR_FILE_MAPPED)),

		K(global_node_page_state(NR_ANON_PAGES)),

		K(global_node_page_state(NR_FILE_MAPPED)),

		K(i.sharedram),

		K(global_page_state(NR_SLAB_RECLAIMABLE) +

				global_page_state(NR_SLAB_UNRECLAIMABLE)),

include/linux/mmzone.h

+3 −3
Original line number Diff line number Diff line
@@ -115,9 +115,6 @@ enum zone_stat_item { 
	NR_ZONE_LRU_ANON = NR_ZONE_LRU_BASE,

	NR_ZONE_LRU_FILE,

	NR_MLOCK,		/* mlock()ed pages found and moved off LRU */

	NR_ANON_PAGES,	/* Mapped anonymous pages */

	NR_FILE_MAPPED,	/* pagecache pages mapped into pagetables.

			   only modified from process context */

	NR_FILE_PAGES,

	NR_FILE_DIRTY,

	NR_WRITEBACK,
@@ -164,6 +161,9 @@ enum node_stat_item { 
	WORKINGSET_REFAULT,

	WORKINGSET_ACTIVATE,

	WORKINGSET_NODERECLAIM,

	NR_ANON_PAGES,	/* Mapped anonymous pages */

	NR_FILE_MAPPED,	/* pagecache pages mapped into pagetables.

			   only modified from process context */

	NR_VM_NODE_STAT_ITEMS

};

mm/page_alloc.c

+3 −3
Original line number Diff line number Diff line
@@ -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),