The patch titled
zoned vm counters: conversion of nr_slab to per zone counter
has been removed from the -mm tree. Its filename is
zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter.patch
This patch was dropped because it had testing failures
------------------------------------------------------
Subject: zoned vm counters: conversion of nr_slab to per zone counter
From: Christoph Lameter <clameter@xxxxxxx>
Conversion of nr_slab to a 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.
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/mm/pgtable.c | 2 +-
drivers/base/node.c | 4 +---
fs/proc/proc_misc.c | 2 +-
include/linux/mmzone.h | 1 +
include/linux/page-flags.h | 3 +--
mm/page_alloc.c | 6 +++---
mm/slab.c | 4 ++--
mm/vmscan.c | 2 +-
8 files changed, 11 insertions(+), 13 deletions(-)
diff -puN arch/i386/mm/pgtable.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter arch/i386/mm/pgtable.c
--- devel/arch/i386/mm/pgtable.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter 2006-06-09 15:21:53.000000000 -0700
+++ devel-akpm/arch/i386/mm/pgtable.c 2006-06-09 15:21:53.000000000 -0700
@@ -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_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
--- devel/drivers/base/node.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter 2006-06-09 15:21:53.000000000 -0700
+++ devel-akpm/drivers/base/node.c 2006-06-09 15:21:53.000000000 -0700
@@ -58,8 +58,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"
@@ -89,7 +87,7 @@ static ssize_t node_read_meminfo(struct
nid, K(ps.nr_writeback),
nid, K(nr[NR_MAPPED]),
nid, K(nr[NR_PAGECACHE]),
- nid, K(ps.nr_slab));
+ nid, K(nr[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
--- devel/fs/proc/proc_misc.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter 2006-06-09 15:21:53.000000000 -0700
+++ devel-akpm/fs/proc/proc_misc.c 2006-06-09 15:21:53.000000000 -0700
@@ -191,7 +191,7 @@ static int meminfo_read_proc(char *page,
K(ps.nr_dirty),
K(ps.nr_writeback),
K(global_page_state(NR_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
--- devel/include/linux/mmzone.h~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter 2006-06-09 15:21:53.000000000 -0700
+++ devel-akpm/include/linux/mmzone.h 2006-06-09 15:21:53.000000000 -0700
@@ -50,6 +50,7 @@ enum zone_stat_item {
NR_MAPPED, /* mapped into pagetables.
only modified from process context */
NR_PAGECACHE, /* file backed pages */
+ NR_SLAB, /* used by slab allocator */
NR_STAT_ITEMS };
struct per_cpu_pages {
diff -puN include/linux/page-flags.h~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter include/linux/page-flags.h
--- devel/include/linux/page-flags.h~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter 2006-06-09 15:21:53.000000000 -0700
+++ devel-akpm/include/linux/page-flags.h 2006-06-09 15:21:53.000000000 -0700
@@ -121,8 +121,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()
diff -puN mm/page_alloc.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter mm/page_alloc.c
--- devel/mm/page_alloc.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter 2006-06-09 15:21:53.000000000 -0700
+++ devel-akpm/mm/page_alloc.c 2006-06-09 15:21:53.000000000 -0700
@@ -613,7 +613,7 @@ static int rmqueue_bulk(struct zone *zon
return i;
}
-char *vm_stat_item_descr[NR_STAT_ITEMS] = { "mapped","pagecache" };
+char *vm_stat_item_descr[NR_STAT_ITEMS] = { "mapped","pagecache", "slab" };
/*
* Manage combined zone based / global counters
@@ -1721,7 +1721,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_MAPPED),
ps.nr_page_table_pages);
@@ -2712,13 +2712,13 @@ static char *vmstat_text[] = {
/* Zoned VM counters */
"nr_mapped",
"nr_pagecache",
+ "nr_slab",
/* Page state */
"nr_dirty",
"nr_writeback",
"nr_unstable",
"nr_page_table_pages",
- "nr_slab",
"pgpgin",
"pgpgout",
diff -puN mm/slab.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter mm/slab.c
--- devel/mm/slab.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter 2006-06-09 15:21:53.000000000 -0700
+++ devel-akpm/mm/slab.c 2006-06-09 15:21:53.000000000 -0700
@@ -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/vmscan.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter mm/vmscan.c
--- devel/mm/vmscan.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter 2006-06-09 15:21:53.000000000 -0700
+++ devel-akpm/mm/vmscan.c 2006-06-09 15:21:53.000000000 -0700
@@ -1366,7 +1366,7 @@ unsigned long shrink_all_memory(unsigned
for_each_zone(zone)
lru_pages += zone->nr_active + zone->nr_inactive;
- nr_slab = read_page_state(nr_slab);
+ nr_slab = global_page_state(NR_SLAB);
/* If slab caches are huge, it's better to hit them first */
while (nr_slab >= lru_pages) {
reclaim_state.reclaimed_slab = 0;
_
Patches currently in -mm which might be from clameter@xxxxxxx are
page-migration-make-do_swap_page-redo-the-fault.patch
slab-extract-cache_free_alien-from-__cache_free.patch
migration-remove-unnecessary-pageswapcache-checks.patch
page-migration-cleanup-rename-ignrefs-to-migration.patch
page-migration-cleanup-group-functions.patch
page-migration-cleanup-remove-useless-definitions.patch
page-migration-cleanup-drop-nr_refs-in-remove_references.patch
page-migration-cleanup-extract-try_to_unmap-from-migration-functions.patch
page-migration-cleanup-pass-mapping-to-migration-functions.patch
page-migration-cleanup-move-fallback-handling-into-special-function.patch
swapless-pm-add-r-w-migration-entries.patch
swapless-page-migration-rip-out-swap-based-logic.patch
swapless-page-migration-modify-core-logic.patch
more-page-migration-do-not-inc-dec-rss-counters.patch
more-page-migration-use-migration-entries-for-file-pages.patch
page-migration-update-documentation.patch
mm-remove-vm_locked-before-remap_pfn_range-and-drop-vm_shm.patch
page-migration-simplify-migrate_pages.patch
page-migration-simplify-migrate_pages-tweaks.patch
page-migration-handle-freeing-of-pages-in-migrate_pages.patch
page-migration-use-allocator-function-for-migrate_pages.patch
page-migration-support-moving-of-individual-pages.patch
page-migration-detailed-status-for-moving-of-individual-pages.patch
page-migration-support-moving-of-individual-pages-fixes.patch
page-migration-support-moving-of-individual-pages-x86_64-support.patch
page-migration-support-moving-of-individual-pages-x86-support.patch
page-migration-support-a-vma-migration-function.patch
allow-migration-of-mlocked-pages.patch
cpuset-remove-extra-cpuset_zone_allowed-check-in-__alloc_pages.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
