[PATCH 13/14] Conversion of nr_bounce to per zone counter

Christoph Lameter
2006-06-21T15:46:54Z

Conversion of nr_bounce to a per zone counter

nr_bounce is only used for proc output. So it could be left as an
event counter. However, the event counters may not be accurate and nr_bounce
is categorizing types of pages in a zone. So we really need this to also be a
per zone counter.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>

Index: linux-2.6.17-mm1/drivers/base/node.c
===================================================================
--- linux-2.6.17-mm1.orig/drivers/base/node.c 2006-06-21 08:37:27.841917388 -0700
+++ linux-2.6.17-mm1/drivers/base/node.c 2006-06-21 08:37:58.612476132 -0700
@@ -64,6 +64,7 @@ static ssize_t node_read_meminfo(struct
"Node %d AnonPages: %8lu kB\n"
"Node %d PageTables: %8lu kB\n"
"Node %d NFS Unstable: %8lu kB\n"
+ "Node %d Bounce: %8lu kB\n"
"Node %d Slab: %8lu kB\n",
nid, K(i.totalram),
nid, K(i.freeram),
@@ -81,6 +82,7 @@ static ssize_t node_read_meminfo(struct
nid, K(node_page_state(nid, NR_ANON_PAGES)),
nid, K(node_page_state(nid, NR_PAGETABLE)),
nid, K(node_page_state(nid, NR_UNSTABLE_NFS)),
+ nid, K(node_page_state(nid, NR_BOUNCE)),
nid, K(node_page_state(nid, NR_SLAB)));
n += hugetlb_report_node_meminfo(nid, buf + n);
return n;
Index: linux-2.6.17-mm1/include/linux/mmzone.h
===================================================================
--- linux-2.6.17-mm1.orig/include/linux/mmzone.h 2006-06-21 08:37:27.844846894 -0700
+++ linux-2.6.17-mm1/include/linux/mmzone.h 2006-06-21 08:37:58.613452634 -0700
@@ -57,6 +57,7 @@ enum zone_stat_item {
NR_FILE_DIRTY,
NR_WRITEBACK,
NR_UNSTABLE_NFS, /* NFS unstable pages */
+ NR_BOUNCE,
NR_VM_ZONE_STAT_ITEMS };

struct per_cpu_pages {
Index: linux-2.6.17-mm1/mm/highmem.c
===================================================================
--- linux-2.6.17-mm1.orig/mm/highmem.c 2006-06-17 18:49:35.000000000 -0700
+++ linux-2.6.17-mm1/mm/highmem.c 2006-06-21 08:37:58.615405638 -0700
@@ -316,7 +316,7 @@ static void bounce_end_io(struct bio *bi
continue;

mempool_free(bvec->bv_page, pool);
- dec_page_state(nr_bounce);
+ dec_zone_page_state(bvec->bv_page, NR_BOUNCE);
}

bio_endio(bio_orig, bio_orig->bi_size, err);
@@ -397,7 +397,7 @@ static void __blk_queue_bounce(request_q
to->bv_page = mempool_alloc(pool, q->bounce_gfp);
to->bv_len = from->bv_len;
to->bv_offset = from->bv_offset;
- inc_page_state(nr_bounce);
+ inc_zone_page_state(to->bv_page, NR_BOUNCE);

if (rw == WRITE) {
char *vto, *vfrom;
Index: linux-2.6.17-mm1/mm/vmstat.c
===================================================================
--- linux-2.6.17-mm1.orig/mm/vmstat.c 2006-06-21 08:37:27.848752903 -0700
+++ linux-2.6.17-mm1/mm/vmstat.c 2006-06-21 08:37:58.615405638 -0700
@@ -465,6 +465,7 @@ static char *vmstat_text[] = {
"nr_dirty",
"nr_writeback",
"nr_unstable",
+ "nr_bounce",

/* Event counters */
"pgpgin",
@@ -512,7 +513,6 @@ static char *vmstat_text[] = {
"allocstall",

"pgrotated",
- "nr_bounce",
};

/*
Index: linux-2.6.17-mm1/fs/proc/proc_misc.c
===================================================================
--- linux-2.6.17-mm1.orig/fs/proc/proc_misc.c 2006-06-21 08:37:27.848752903 -0700
+++ linux-2.6.17-mm1/fs/proc/proc_misc.c 2006-06-21 08:37:58.616382141 -0700
@@ -171,6 +171,7 @@ static int meminfo_read_proc(char *page,
"Slab: %8lu kB\n"
"PageTables: %8lu kB\n"
"NFS Unstable: %8lu kB\n"
+ "Bounce: %8lu kB\n"
"CommitLimit: %8lu kB\n"
"Committed_AS: %8lu kB\n"
"VmallocTotal: %8lu kB\n"
@@ -196,6 +197,7 @@ static int meminfo_read_proc(char *page,
K(global_page_state(NR_SLAB)),
K(global_page_state(NR_PAGETABLE)),
K(global_page_state(NR_UNSTABLE_NFS)),
+ K(global_page_state(NR_BOUNCE)),
K(allowed),
K(committed),
(unsigned long)VMALLOC_TOTAL >> 10,