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 was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: zoned vm counters: conversion of nr_slab to per zone counter
From: Christoph Lameter <clameter@xxxxxxx>
- 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@xxxxxxxx: bugfix]
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/vmstat.h | 3 +--
mm/page_alloc.c | 2 +-
mm/slab.c | 4 ++--
mm/vmscan.c | 2 +-
mm/vmstat.c | 2 +-
9 files changed, 10 insertions(+), 12 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 include/linux/vmstat.h~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter include/linux/vmstat.h
--- a/include/linux/vmstat.h~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter
+++ a/include/linux/vmstat.h
@@ -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()
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
@@ -1507,7 +1507,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);
@@ -1522,12 +1522,12 @@ static void kmem_freepages(struct kmem_c
struct page *page = virt_to_page(addr);
const unsigned long nr_freed = i;
+ sub_zone_page_state(page_zone(page), NR_SLAB, nr_freed);
while (i--) {
BUG_ON(!PageSlab(page));
__ClearPageSlab(page);
page++;
}
- sub_page_state(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
--- a/mm/vmscan.c~zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter
+++ a/mm/vmscan.c
@@ -1362,7 +1362,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;
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
@@ -398,13 +398,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",
_
Patches currently in -mm which might be from clameter@xxxxxxx are
origin.patch
zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o.patch
zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable.patch
zvc-zone_reclaim-leave-1%-of-unmapped-pagecache-pages-for-file-i-o-tunable-rename.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
