[PATCH] Use Zoned VM Counters for NUMA statistics

The numa statistics are really event counters.  But they are per node and
so we have had special treatment for these counters through additional
fields on the pcp structure.  We can now use the per zone nature of the
zoned VM counters to realize these.

This will shrink the size of the pcp structure on NUMA systems.  We will
have some room to add additional per zone counters that will all still fit
in the same cacheline.

 Bits	Prior pcp size	  	Size after patch	We can add
 ------------------------------------------------------------------
 64	128 bytes (16 words)	80 bytes (10 words)	48
 32	 76 bytes (19 words)	56 bytes (14 words)	8 (64 byte cacheline)
							72 (128 byte)

Remove the special statistics for numa and replace them with zoned vm
counters.  This has the side effect that global sums of these events now
show up in /proc/vmstat.

Also take the opportunity to move the zone_statistics() function from
page_alloc.c into vmstat.c.

Discussions:
V2 http://marc.theaimsgroup.com/?t=115048227000002&r=1&w=2

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Acked-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 6 insertions, 28 deletions

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 772eadac57a7..d7de1753e094 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -94,28 +94,6 @@ static SYSDEV_ATTR(meminfo, S_IRUGO, node_read_meminfo, NULL);
 
 static ssize_t node_read_numastat(struct sys_device * dev, char * buf)
 {
-        unsigned long numa_hit, numa_miss, interleave_hit, numa_foreign;
-        unsigned long local_node, other_node;
-        int i, cpu;
-        pg_data_t *pg = NODE_DATA(dev->id);
-        numa_hit = 0;
-        numa_miss = 0;
-        interleave_hit = 0;
-        numa_foreign = 0;
-        local_node = 0;
-        other_node = 0;
-        for (i = 0; i < MAX_NR_ZONES; i++) {
-                struct zone *z = &pg->node_zones[i];
-                for_each_online_cpu(cpu) {
-                        struct per_cpu_pageset *ps = zone_pcp(z,cpu);
-                        numa_hit += ps->numa_hit;
-                        numa_miss += ps->numa_miss;
-                        numa_foreign += ps->numa_foreign;
-                        interleave_hit += ps->interleave_hit;
-                        local_node += ps->local_node;
-                        other_node += ps->other_node;
-                }
-        }
         return sprintf(buf,
                        "numa_hit %lu\n"
                        "numa_miss %lu\n"
@@ -123,12 +101,12 @@ static ssize_t node_read_numastat(struct sys_device * dev, char * buf)
                        "interleave_hit %lu\n"
                        "local_node %lu\n"
                        "other_node %lu\n",
-                       numa_hit,
-                       numa_miss,
-                       numa_foreign,
-                       interleave_hit,
-                       local_node,
-                       other_node);
+                       node_page_state(dev->id, NUMA_HIT),
+                       node_page_state(dev->id, NUMA_MISS),
+                       node_page_state(dev->id, NUMA_FOREIGN),
+                       node_page_state(dev->id, NUMA_INTERLEAVE_HIT),
+                       node_page_state(dev->id, NUMA_LOCAL),
+                       node_page_state(dev->id, NUMA_OTHER));
 }
 static SYSDEV_ATTR(numastat, S_IRUGO, node_read_numastat, NULL);