Subject: zoned vm counters: conversion of nr_bounce to per zone counter
From: Christoph Lameter <[email protected]>
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 are not 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 <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Index: linux-2.6.17-rc6-cl/drivers/base/node.c
===================================================================
--- linux-2.6.17-rc6-cl.orig/drivers/base/node.c 2006-06-13 11:25:43.386444670 -0700
+++ linux-2.6.17-rc6-cl/drivers/base/node.c 2006-06-13 11:26:21.881127149 -0700
@@ -65,6 +65,7 @@ static ssize_t node_read_meminfo(struct
"Node %d Anonymous: %8lu kB\n"
"Node %d PageTables: %8lu kB\n"
"Node %d 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
nid, K(node_page_state(nid, NR_ANON)),
nid, K(node_page_state(nid, NR_PAGETABLE)),
nid, K(node_page_state(nid, NR_UNSTABLE)),
+ 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-rc6-cl/include/linux/mmzone.h
===================================================================
--- linux-2.6.17-rc6-cl.orig/include/linux/mmzone.h 2006-06-13 11:25:43.389374176 -0700
+++ linux-2.6.17-rc6-cl/include/linux/mmzone.h 2006-06-13 11:26:21.882103651 -0700
@@ -56,6 +56,7 @@ enum zone_stat_item {
NR_DIRTY,
NR_WRITEBACK,
NR_UNSTABLE, /* NFS unstable pages */
+ NR_BOUNCE,
NR_VM_ZONE_STAT_ITEMS };
struct per_cpu_pages {
Index: linux-2.6.17-rc6-cl/mm/highmem.c
===================================================================
--- linux-2.6.17-rc6-cl.orig/mm/highmem.c 2006-06-05 17:57:02.000000000 -0700
+++ linux-2.6.17-rc6-cl/mm/highmem.c 2006-06-13 11:26:21.883080153 -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-rc6-cl/mm/vmstat.c
===================================================================
--- linux-2.6.17-rc6-cl.orig/mm/vmstat.c 2006-06-13 11:25:43.393280184 -0700
+++ linux-2.6.17-rc6-cl/mm/vmstat.c 2006-06-13 11:26:21.883080153 -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-rc6-cl/fs/proc/proc_misc.c
===================================================================
--- linux-2.6.17-rc6-cl.orig/fs/proc/proc_misc.c 2006-06-13 11:26:17.045489603 -0700
+++ linux-2.6.17-rc6-cl/fs/proc/proc_misc.c 2006-06-13 11:26:52.629219866 -0700
@@ -171,6 +171,7 @@ static int meminfo_read_proc(char *page,
"Slab: %8lu kB\n"
"PageTables: %8lu kB\n"
"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)),
+ K(global_page_state(NR_BOUNCE)),
K(allowed),
K(committed),
(unsigned long)VMALLOC_TOTAL >> 10,
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
