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

Commit 9a865ffa authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] zoned vm counters: conversion of nr_slab to per zone counter 



- Allows reclaim to access counter without looping over processor counts.

- Allows accurate statistics on how many pages are used in a zone by
  the slab. This may become useful to balance slab allocations over
  various zones.

[akpm@osdl.org: bugfix]
Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 34aa1330

arch/i386/mm/pgtable.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ void show_mem(void) 
	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", global_page_state(NR_FILE_MAPPED));

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

	printk(KERN_INFO "%lu pages slab\n", global_page_state(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_slab < 0)

		ps.nr_slab = 0;



	n = sprintf(buf, "\n"

		       "Node %d MemTotal:     %8lu kB\n"
@@ -87,7 +85,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) 
		       nid, K(node_page_state(nid, NR_FILE_PAGES)),

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

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

		       nid, K(ps.nr_slab));

		       nid, K(node_page_state(nid, 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
@@ -194,7 +194,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off, 
		K(ps.nr_writeback),

		K(global_page_state(NR_ANON_PAGES)),

		K(global_page_state(NR_FILE_MAPPED)),

		K(ps.nr_slab),

		K(global_page_state(NR_SLAB)),

		K(allowed),

		K(committed),

		K(ps.nr_page_table_pages),

include/linux/mmzone.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ enum zone_stat_item { 
	NR_FILE_MAPPED,	/* pagecache pages mapped into pagetables.

			   only modified from process context */

	NR_FILE_PAGES,

	NR_SLAB,	/* Pages used by slab allocator */

	NR_VM_ZONE_STAT_ITEMS };



struct per_cpu_pages {

include/linux/vmstat.h

+1 −2
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ 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_slab;		/* In slab */

#define GET_PAGE_STATE_LAST nr_slab

#define GET_PAGE_STATE_LAST nr_page_table_pages



	/*

	 * The below are zeroed by get_page_state().  Use get_full_page_state()