linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / base / node.c

diff --git a/drivers/base/node.c b/drivers/base/node.c
index e9b0957..c80c3ae 100644 (file)
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -11,7 +11,6 @@
 #include <linux/cpumask.h>
 #include <linux/topology.h>
 #include <linux/nodemask.h>
-#include <linux/cpu.h>
 
 static struct sysdev_class node_class = {
        set_kset_name("node"),
@@ -40,13 +39,24 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
        int n;
        int nid = dev->id;
        struct sysinfo i;
+       struct page_state ps;
        unsigned long inactive;
        unsigned long active;
        unsigned long free;
 
        si_meminfo_node(&i, nid);
+       get_page_state_node(&ps, nid);
        __get_zone_counts(&active, &inactive, &free, NODE_DATA(nid));
 
+       /* Check for negative values in these approximate counters */
+       if ((long)ps.nr_dirty < 0)
+               ps.nr_dirty = 0;
+       if ((long)ps.nr_writeback < 0)
+               ps.nr_writeback = 0;
+       if ((long)ps.nr_mapped < 0)
+               ps.nr_mapped = 0;
+       if ((long)ps.nr_slab < 0)
+               ps.nr_slab = 0;
 
        n = sprintf(buf, "\n"
                       "Node %d MemTotal:     %8lu kB\n"
@@ -60,12 +70,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
                       "Node %d LowFree:      %8lu kB\n"
                       "Node %d Dirty:        %8lu kB\n"
                       "Node %d Writeback:    %8lu kB\n"
-                      "Node %d FilePages:    %8lu kB\n"
                       "Node %d Mapped:       %8lu kB\n"
-                      "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),
@@ -76,15 +81,10 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
                       nid, K(i.freehigh),
                       nid, K(i.totalram - i.totalhigh),
                       nid, K(i.freeram - i.freehigh),
-                      nid, K(node_page_state(nid, NR_FILE_DIRTY)),
-                      nid, K(node_page_state(nid, NR_WRITEBACK)),
-                      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(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)));
+                      nid, K(ps.nr_dirty),
+                      nid, K(ps.nr_writeback),
+                      nid, K(ps.nr_mapped),
+                      nid, K(ps.nr_slab));
        n += hugetlb_report_node_meminfo(nid, buf + n);
        return n;
 }
@@ -94,6 +94,28 @@ 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"
@@ -101,12 +123,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",
-                      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));
+                      numa_hit,
+                      numa_miss,
+                      numa_foreign,
+                      interleave_hit,
+                      local_node,
+                      other_node);
 }
 static SYSDEV_ATTR(numastat, S_IRUGO, node_read_numastat, NULL);
 
@@ -168,66 +190,6 @@ void unregister_node(struct node *node)
        sysdev_unregister(&node->sysdev);
 }
 
-struct node node_devices[MAX_NUMNODES];
-
-/*
- * register cpu under node
- */
-int register_cpu_under_node(unsigned int cpu, unsigned int nid)
-{
-       if (node_online(nid)) {
-               struct sys_device *obj = get_cpu_sysdev(cpu);
-               if (!obj)
-                       return 0;
-               return sysfs_create_link(&node_devices[nid].sysdev.kobj,
-                                        &obj->kobj,
-                                        kobject_name(&obj->kobj));
-        }
-
-       return 0;
-}
-
-int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)
-{
-       if (node_online(nid)) {
-               struct sys_device *obj = get_cpu_sysdev(cpu);
-               if (obj)
-                       sysfs_remove_link(&node_devices[nid].sysdev.kobj,
-                                        kobject_name(&obj->kobj));
-       }
-       return 0;
-}
-
-int register_one_node(int nid)
-{
-       int error = 0;
-       int cpu;
-
-       if (node_online(nid)) {
-               int p_node = parent_node(nid);
-               struct node *parent = NULL;
-
-               if (p_node != nid)
-                       parent = &node_devices[p_node];
-
-               error = register_node(&node_devices[nid], nid, parent);
-
-               /* link cpu under this node */
-               for_each_present_cpu(cpu) {
-                       if (cpu_to_node(cpu) == nid)
-                               register_cpu_under_node(cpu, nid);
-               }
-       }
-
-       return error;
-
-}
-
-void unregister_one_node(int nid)
-{
-       unregister_node(&node_devices[nid]);
-}
-
 static int __init register_node_type(void)
 {
        return sysdev_class_register(&node_class);