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

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.

[akpm@osdl.org: bugfix]
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/base/node.c b/drivers/base/node.c
index b73d869c9d48e97b130cf35251175c94fc50e3f6..772eadac57a72e553cad3402f13443d9f1235b40 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -65,6 +65,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
                       "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),
@@ -82,6 +83,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
                       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;

diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index eae66b41a1a47eea6b6485a1c620f79ae27cb1f7..6aa2aa779a09e1e81a02742bc5bdb8c3f68d5d59 100644 (file)
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -171,6 +171,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
                "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, char **start, off_t off,
                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,

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index e9d80697f5552d71775fc66328c8f3bb574a8d08..2dbeec1d2874fe96a8537d523e4e84276931f660 100644 (file)
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -56,6 +56,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 {

diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index 9de2a41c885cbcd78c60c6f5a33de9353e7c2e39..5b5b96afc3953879187d7744c7f68863b4e6762d 100644 (file)
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -67,7 +67,6 @@ struct page_state {
        unsigned long allocstall;       /* direct reclaim calls */
 
        unsigned long pgrotated;        /* pages rotated to tail of the LRU */
-       unsigned long nr_bounce;        /* pages for bounce buffers */
 };
 
 extern void get_full_page_state(struct page_state *ret);

diff --git a/mm/highmem.c b/mm/highmem.c
index 9b274fdf9d08d66c3ec78ae396284a6a0c70ac61..9b2a5403c447a7bd0f147700a0db48df5b0b58f4 100644 (file)
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -315,8 +315,8 @@ static void bounce_end_io(struct bio *bio, mempool_t *pool, int err)
                if (bvec->bv_page == org_vec->bv_page)
                        continue;
 
-               mempool_free(bvec->bv_page, pool);      
-               dec_page_state(nr_bounce);
+               dec_zone_page_state(bvec->bv_page, NR_BOUNCE);
+               mempool_free(bvec->bv_page, pool);
        }
 
        bio_endio(bio_orig, bio_orig->bi_size, err);
@@ -397,7 +397,7 @@ static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig,
                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;

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 9dc270aed5c44acfae87b916173474fc5950e034..25e5ca7c1743a498c04cd940f7146136df6a03f4 100644 (file)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -381,6 +381,7 @@ static char *vmstat_text[] = {
        "nr_dirty",
        "nr_writeback",
        "nr_unstable",
+       "nr_bounce",
 
        /* Event counters */
        "pgpgin",
@@ -428,7 +429,6 @@ static char *vmstat_text[] = {
        "allocstall",
 
        "pgrotated",
-       "nr_bounce",
 };
 
 /*