From: Christoph Lameter - 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. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton --- arch/i386/mm/pgtable.c | 2 +- drivers/base/node.c | 4 +--- fs/proc/proc_misc.c | 2 +- include/linux/mmzone.h | 1 + mm/page_alloc.c | 2 +- mm/slab.c | 4 ++-- mm/vmstat.c | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff -puN arch/i386/mm/pgtable.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter arch/i386/mm/pgtable.c --- a/arch/i386/mm/pgtable.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter +++ a/arch/i386/mm/pgtable.c @@ -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); } diff -puN drivers/base/node.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter drivers/base/node.c --- a/drivers/base/node.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter +++ a/drivers/base/node.c @@ -54,8 +54,6 @@ static ssize_t node_read_meminfo(struct 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 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; } diff -puN fs/proc/proc_misc.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter fs/proc/proc_misc.c --- a/fs/proc/proc_misc.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter +++ a/fs/proc/proc_misc.c @@ -194,7 +194,7 @@ static int meminfo_read_proc(char *page, 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), diff -puN include/linux/mmzone.h~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter include/linux/mmzone.h --- a/include/linux/mmzone.h~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter +++ a/include/linux/mmzone.h @@ -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 { diff -puN mm/page_alloc.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter mm/page_alloc.c --- a/mm/page_alloc.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter +++ a/mm/page_alloc.c @@ -1318,7 +1318,7 @@ void show_free_areas(void) ps.nr_writeback, ps.nr_unstable, nr_free_pages(), - ps.nr_slab, + global_page_state(NR_SLAB), global_page_state(NR_FILE_MAPPED), ps.nr_page_table_pages); diff -puN mm/slab.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter mm/slab.c --- a/mm/slab.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter +++ a/mm/slab.c @@ -1514,7 +1514,7 @@ static void *kmem_getpages(struct kmem_c nr_pages = (1 << cachep->gfporder); if (cachep->flags & SLAB_RECLAIM_ACCOUNT) atomic_add(nr_pages, &slab_reclaim_pages); - add_page_state(nr_slab, nr_pages); + add_zone_page_state(page_zone(page), NR_SLAB, nr_pages); for (i = 0; i < nr_pages; i++) __SetPageSlab(page + i); return page_address(page); @@ -1534,7 +1534,7 @@ static void kmem_freepages(struct kmem_c __ClearPageSlab(page); page++; } - sub_page_state(nr_slab, nr_freed); + sub_zone_page_state(page_zone(page), NR_SLAB, nr_freed); if (current->reclaim_state) current->reclaim_state->reclaimed_slab += nr_freed; free_pages((unsigned long)addr, cachep->gfporder); diff -puN mm/vmstat.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter mm/vmstat.c --- a/mm/vmstat.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter +++ a/mm/vmstat.c @@ -460,13 +460,13 @@ static char *vmstat_text[] = { "nr_anon_pages", "nr_mapped", "nr_file_pages", + "nr_slab", /* Page state */ "nr_dirty", "nr_writeback", "nr_unstable", "nr_page_table_pages", - "nr_slab", "pgpgin", "pgpgout", _