Commit 65ba55f5 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] zoned vm counters: convert nr_mapped to per zone counter 



nr_mapped is important because it allows a determination of how many pages of
a zone are not mapped, which would allow a more efficient means of determining
when we need to reclaim memory in a zone.

We take the nr_mapped field out of the page state structure and define a new
per zone counter named NR_FILE_MAPPED (the anonymous pages will be split off
from NR_MAPPED in the next patch).

We replace the use of nr_mapped in various kernel locations.  This avoids the
looping over all processors in try_to_free_pages(), writeback, reclaim (swap +
zone reclaim).

[akpm@osdl.org: bugfix]
Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2244b95a

arch/i386/mm/pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ void show_mem(void) 
	get_page_state(&ps);

	printk(KERN_INFO "%lu pages dirty\n", ps.nr_dirty);

	printk(KERN_INFO "%lu pages writeback\n", ps.nr_writeback);

	printk(KERN_INFO "%lu pages mapped\n", ps.nr_mapped);

	printk(KERN_INFO "%lu pages mapped\n", global_page_state(NR_FILE_MAPPED));

	printk(KERN_INFO "%lu pages slab\n", ps.nr_slab);

	printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages);

}

drivers/base/node.c

+1 −3
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) 
		ps.nr_dirty = 0;

	if ((long)ps.nr_writeback < 0)

		ps.nr_writeback = 0;

	if ((long)ps.nr_mapped < 0)

		ps.nr_mapped = 0;

	if ((long)ps.nr_slab < 0)

		ps.nr_slab = 0;
@@ -84,7 +82,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) 
		       nid, K(i.freeram - i.freehigh),

		       nid, K(ps.nr_dirty),

		       nid, K(ps.nr_writeback),

		       nid, K(ps.nr_mapped),

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

		       nid, K(ps.nr_slab));

	n += hugetlb_report_node_meminfo(nid, buf + n);

	return n;

fs/proc/proc_misc.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off, 
		K(i.freeswap),

		K(ps.nr_dirty),

		K(ps.nr_writeback),

		K(ps.nr_mapped),

		K(global_page_state(NR_FILE_MAPPED)),

		K(ps.nr_slab),

		K(allowed),

		K(committed),

include/linux/mmzone.h

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ struct zone_padding { 
#endif



enum zone_stat_item {

	NR_FILE_MAPPED,	/* mapped into pagetables.

			   only modified from process context */



	NR_VM_ZONE_STAT_ITEMS };



struct per_cpu_pages {

include/linux/vmstat.h

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ struct page_state { 
	unsigned long nr_writeback;	/* Pages under writeback */

	unsigned long nr_unstable;	/* NFS unstable pages */

	unsigned long nr_page_table_pages;/* Pages used for pagetables */

	unsigned long nr_mapped;	/* mapped into pagetables.

					 * only modified from process context */

	unsigned long nr_slab;		/* In slab */

#define GET_PAGE_STATE_LAST nr_slab

CRA Git | Maintained and supported by SUSTech CRA and CCSE