PM / Sleep: Add wakeup_source_activate and wakeup_source_deactivate tracepoints
[linux-2.6.git] / drivers / base / node.c
index ee53558..90aa2a1 100644 (file)
@@ -1,12 +1,12 @@
 /*
- * drivers/base/node.c - basic Node class support
+ * Basic Node interface support
  */
 
-#include <linux/sysdev.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/memory.h>
+#include <linux/vmstat.h>
 #include <linux/node.h>
 #include <linux/hugetlb.h>
 #include <linux/compaction.h>
 #include <linux/swap.h>
 #include <linux/slab.h>
 
-static struct sysdev_class_attribute *node_state_attrs[];
-
-static struct sysdev_class node_class = {
+static struct bus_type node_subsys = {
        .name = "node",
-       .attrs = node_state_attrs,
+       .dev_name = "node",
 };
 
 
-static ssize_t node_read_cpumap(struct sys_device *dev, int type, char *buf)
+static ssize_t node_read_cpumap(struct device *dev, int type, char *buf)
 {
        struct node *node_dev = to_node(dev);
-       const struct cpumask *mask = cpumask_of_node(node_dev->sysdev.id);
+       const struct cpumask *mask = cpumask_of_node(node_dev->dev.id);
        int len;
 
        /* 2008/04/07: buf currently PAGE_SIZE, need 9 chars per 32 bits. */
@@ -43,23 +41,23 @@ static ssize_t node_read_cpumap(struct sys_device *dev, int type, char *buf)
        return len;
 }
 
-static inline ssize_t node_read_cpumask(struct sys_device *dev,
-                               struct sysdev_attribute *attr, char *buf)
+static inline ssize_t node_read_cpumask(struct device *dev,
+                               struct device_attribute *attr, char *buf)
 {
        return node_read_cpumap(dev, 0, buf);
 }
-static inline ssize_t node_read_cpulist(struct sys_device *dev,
-                               struct sysdev_attribute *attr, char *buf)
+static inline ssize_t node_read_cpulist(struct device *dev,
+                               struct device_attribute *attr, char *buf)
 {
        return node_read_cpumap(dev, 1, buf);
 }
 
-static SYSDEV_ATTR(cpumap,  S_IRUGO, node_read_cpumask, NULL);
-static SYSDEV_ATTR(cpulist, S_IRUGO, node_read_cpulist, NULL);
+static DEVICE_ATTR(cpumap,  S_IRUGO, node_read_cpumask, NULL);
+static DEVICE_ATTR(cpulist, S_IRUGO, node_read_cpulist, NULL);
 
 #define K(x) ((x) << (PAGE_SHIFT - 10))
-static ssize_t node_read_meminfo(struct sys_device * dev,
-                       struct sysdev_attribute *attr, char * buf)
+static ssize_t node_read_meminfo(struct device *dev,
+                       struct device_attribute *attr, char *buf)
 {
        int n;
        int nid = dev->id;
@@ -117,12 +115,22 @@ static ssize_t node_read_meminfo(struct sys_device * dev,
                       "Node %d WritebackTmp:   %8lu kB\n"
                       "Node %d Slab:           %8lu kB\n"
                       "Node %d SReclaimable:   %8lu kB\n"
-                      "Node %d SUnreclaim:     %8lu kB\n",
+                      "Node %d SUnreclaim:     %8lu kB\n"
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+                      "Node %d AnonHugePages:  %8lu kB\n"
+#endif
+                       ,
                       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)),
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+                      nid, K(node_page_state(nid, NR_ANON_PAGES)
+                       + node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *
+                       HPAGE_PMD_NR),
+#else
                       nid, K(node_page_state(nid, NR_ANON_PAGES)),
+#endif
                       nid, K(node_page_state(nid, NR_SHMEM)),
                       nid, node_page_state(nid, NR_KERNEL_STACK) *
                                THREAD_SIZE / 1024,
@@ -133,16 +141,23 @@ static ssize_t node_read_meminfo(struct sys_device * dev,
                       nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE) +
                                node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),
                       nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE)),
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+                      nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))
+                       , nid,
+                       K(node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *
+                       HPAGE_PMD_NR));
+#else
                       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)));
+#endif
        n += hugetlb_report_node_meminfo(nid, buf + n);
        return n;
 }
 
 #undef K
-static SYSDEV_ATTR(meminfo, S_IRUGO, node_read_meminfo, NULL);
+static DEVICE_ATTR(meminfo, S_IRUGO, node_read_meminfo, NULL);
 
-static ssize_t node_read_numastat(struct sys_device * dev,
-                               struct sysdev_attribute *attr, char * buf)
+static ssize_t node_read_numastat(struct device *dev,
+                               struct device_attribute *attr, char *buf)
 {
        return sprintf(buf,
                       "numa_hit %lu\n"
@@ -158,10 +173,25 @@ static ssize_t node_read_numastat(struct sys_device * dev,
                       node_page_state(dev->id, NUMA_LOCAL),
                       node_page_state(dev->id, NUMA_OTHER));
 }
-static SYSDEV_ATTR(numastat, S_IRUGO, node_read_numastat, NULL);
+static DEVICE_ATTR(numastat, S_IRUGO, node_read_numastat, NULL);
+
+static ssize_t node_read_vmstat(struct device *dev,
+                               struct device_attribute *attr, char *buf)
+{
+       int nid = dev->id;
+       int i;
+       int n = 0;
+
+       for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
+               n += sprintf(buf+n, "%s %lu\n", vmstat_text[i],
+                            node_page_state(nid, i));
+
+       return n;
+}
+static DEVICE_ATTR(vmstat, S_IRUGO, node_read_vmstat, NULL);
 
-static ssize_t node_read_distance(struct sys_device * dev,
-                       struct sysdev_attribute *attr, char * buf)
+static ssize_t node_read_distance(struct device *dev,
+                       struct device_attribute *attr, char * buf)
 {
        int nid = dev->id;
        int len = 0;
@@ -179,7 +209,7 @@ static ssize_t node_read_distance(struct sys_device * dev,
        len += sprintf(buf + len, "\n");
        return len;
 }
-static SYSDEV_ATTR(distance, S_IRUGO, node_read_distance, NULL);
+static DEVICE_ATTR(distance, S_IRUGO, node_read_distance, NULL);
 
 #ifdef CONFIG_HUGETLBFS
 /*
@@ -197,7 +227,7 @@ static node_registration_func_t __hugetlb_unregister_node;
 static inline bool hugetlb_register_node(struct node *node)
 {
        if (__hugetlb_register_node &&
-                       node_state(node->sysdev.id, N_HIGH_MEMORY)) {
+                       node_state(node->dev.id, N_HIGH_MEMORY)) {
                __hugetlb_register_node(node);
                return true;
        }
@@ -233,16 +263,17 @@ int register_node(struct node *node, int num, struct node *parent)
 {
        int error;
 
-       node->sysdev.id = num;
-       node->sysdev.cls = &node_class;
-       error = sysdev_register(&node->sysdev);
+       node->dev.id = num;
+       node->dev.bus = &node_subsys;
+       error = device_register(&node->dev);
 
        if (!error){
-               sysdev_create_file(&node->sysdev, &attr_cpumap);
-               sysdev_create_file(&node->sysdev, &attr_cpulist);
-               sysdev_create_file(&node->sysdev, &attr_meminfo);
-               sysdev_create_file(&node->sysdev, &attr_numastat);
-               sysdev_create_file(&node->sysdev, &attr_distance);
+               device_create_file(&node->dev, &dev_attr_cpumap);
+               device_create_file(&node->dev, &dev_attr_cpulist);
+               device_create_file(&node->dev, &dev_attr_meminfo);
+               device_create_file(&node->dev, &dev_attr_numastat);
+               device_create_file(&node->dev, &dev_attr_distance);
+               device_create_file(&node->dev, &dev_attr_vmstat);
 
                scan_unevictable_register_node(node);
 
@@ -262,16 +293,17 @@ int register_node(struct node *node, int num, struct node *parent)
  */
 void unregister_node(struct node *node)
 {
-       sysdev_remove_file(&node->sysdev, &attr_cpumap);
-       sysdev_remove_file(&node->sysdev, &attr_cpulist);
-       sysdev_remove_file(&node->sysdev, &attr_meminfo);
-       sysdev_remove_file(&node->sysdev, &attr_numastat);
-       sysdev_remove_file(&node->sysdev, &attr_distance);
+       device_remove_file(&node->dev, &dev_attr_cpumap);
+       device_remove_file(&node->dev, &dev_attr_cpulist);
+       device_remove_file(&node->dev, &dev_attr_meminfo);
+       device_remove_file(&node->dev, &dev_attr_numastat);
+       device_remove_file(&node->dev, &dev_attr_distance);
+       device_remove_file(&node->dev, &dev_attr_vmstat);
 
        scan_unevictable_unregister_node(node);
        hugetlb_unregister_node(node);          /* no-op, if memoryless node */
 
-       sysdev_unregister(&node->sysdev);
+       device_unregister(&node->dev);
 }
 
 struct node node_devices[MAX_NUMNODES];
@@ -282,41 +314,41 @@ struct node node_devices[MAX_NUMNODES];
 int register_cpu_under_node(unsigned int cpu, unsigned int nid)
 {
        int ret;
-       struct sys_device *obj;
+       struct device *obj;
 
        if (!node_online(nid))
                return 0;
 
-       obj = get_cpu_sysdev(cpu);
+       obj = get_cpu_device(cpu);
        if (!obj)
                return 0;
 
-       ret = sysfs_create_link(&node_devices[nid].sysdev.kobj,
+       ret = sysfs_create_link(&node_devices[nid].dev.kobj,
                                &obj->kobj,
                                kobject_name(&obj->kobj));
        if (ret)
                return ret;
 
        return sysfs_create_link(&obj->kobj,
-                                &node_devices[nid].sysdev.kobj,
-                                kobject_name(&node_devices[nid].sysdev.kobj));
+                                &node_devices[nid].dev.kobj,
+                                kobject_name(&node_devices[nid].dev.kobj));
 }
 
 int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)
 {
-       struct sys_device *obj;
+       struct device *obj;
 
        if (!node_online(nid))
                return 0;
 
-       obj = get_cpu_sysdev(cpu);
+       obj = get_cpu_device(cpu);
        if (!obj)
                return 0;
 
-       sysfs_remove_link(&node_devices[nid].sysdev.kobj,
+       sysfs_remove_link(&node_devices[nid].dev.kobj,
                          kobject_name(&obj->kobj));
        sysfs_remove_link(&obj->kobj,
-                         kobject_name(&node_devices[nid].sysdev.kobj));
+                         kobject_name(&node_devices[nid].dev.kobj));
 
        return 0;
 }
@@ -346,8 +378,10 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, int nid)
                return -EFAULT;
        if (!node_online(nid))
                return 0;
-       sect_start_pfn = section_nr_to_pfn(mem_blk->phys_index);
-       sect_end_pfn = sect_start_pfn + PAGES_PER_SECTION - 1;
+
+       sect_start_pfn = section_nr_to_pfn(mem_blk->start_section_nr);
+       sect_end_pfn = section_nr_to_pfn(mem_blk->end_section_nr);
+       sect_end_pfn += PAGES_PER_SECTION - 1;
        for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) {
                int page_nid;
 
@@ -356,22 +390,23 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, int nid)
                        continue;
                if (page_nid != nid)
                        continue;
-               ret = sysfs_create_link_nowarn(&node_devices[nid].sysdev.kobj,
-                                       &mem_blk->sysdev.kobj,
-                                       kobject_name(&mem_blk->sysdev.kobj));
+               ret = sysfs_create_link_nowarn(&node_devices[nid].dev.kobj,
+                                       &mem_blk->dev.kobj,
+                                       kobject_name(&mem_blk->dev.kobj));
                if (ret)
                        return ret;
 
-               return sysfs_create_link_nowarn(&mem_blk->sysdev.kobj,
-                               &node_devices[nid].sysdev.kobj,
-                               kobject_name(&node_devices[nid].sysdev.kobj));
+               return sysfs_create_link_nowarn(&mem_blk->dev.kobj,
+                               &node_devices[nid].dev.kobj,
+                               kobject_name(&node_devices[nid].dev.kobj));
        }
        /* mem section does not span the specified node */
        return 0;
 }
 
 /* unregister memory section under all nodes that it spans */
-int unregister_mem_sect_under_nodes(struct memory_block *mem_blk)
+int unregister_mem_sect_under_nodes(struct memory_block *mem_blk,
+                                   unsigned long phys_index)
 {
        NODEMASK_ALLOC(nodemask_t, unlinked_nodes, GFP_KERNEL);
        unsigned long pfn, sect_start_pfn, sect_end_pfn;
@@ -383,7 +418,8 @@ int unregister_mem_sect_under_nodes(struct memory_block *mem_blk)
        if (!unlinked_nodes)
                return -ENOMEM;
        nodes_clear(*unlinked_nodes);
-       sect_start_pfn = section_nr_to_pfn(mem_blk->phys_index);
+
+       sect_start_pfn = section_nr_to_pfn(phys_index);
        sect_end_pfn = sect_start_pfn + PAGES_PER_SECTION - 1;
        for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) {
                int nid;
@@ -395,10 +431,10 @@ int unregister_mem_sect_under_nodes(struct memory_block *mem_blk)
                        continue;
                if (node_test_and_set(nid, *unlinked_nodes))
                        continue;
-               sysfs_remove_link(&node_devices[nid].sysdev.kobj,
-                        kobject_name(&mem_blk->sysdev.kobj));
-               sysfs_remove_link(&mem_blk->sysdev.kobj,
-                        kobject_name(&node_devices[nid].sysdev.kobj));
+               sysfs_remove_link(&node_devices[nid].dev.kobj,
+                        kobject_name(&mem_blk->dev.kobj));
+               sysfs_remove_link(&mem_blk->dev.kobj,
+                        kobject_name(&node_devices[nid].dev.kobj));
        }
        NODEMASK_FREE(unlinked_nodes);
        return 0;
@@ -420,7 +456,15 @@ static int link_mem_sections(int nid)
                if (!present_section_nr(section_nr))
                        continue;
                mem_sect = __nr_to_section(section_nr);
+
+               /* same memblock ? */
+               if (mem_blk)
+                       if ((section_nr >= mem_blk->start_section_nr) &&
+                           (section_nr <= mem_blk->end_section_nr))
+                               continue;
+
                mem_blk = find_memory_block_hinted(mem_sect, mem_blk);
+
                ret = register_mem_sect_under_node(mem_blk, nid);
                if (!err)
                        err = ret;
@@ -429,7 +473,7 @@ static int link_mem_sections(int nid)
        }
 
        if (mem_blk)
-               kobject_put(&mem_blk->sysdev.kobj);
+               kobject_put(&mem_blk->dev.kobj);
        return err;
 }
 
@@ -557,19 +601,19 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
 }
 
 struct node_attr {
-       struct sysdev_class_attribute attr;
+       struct device_attribute attr;
        enum node_states state;
 };
 
-static ssize_t show_node_state(struct sysdev_class *class,
-                              struct sysdev_class_attribute *attr, char *buf)
+static ssize_t show_node_state(struct device *dev,
+                              struct device_attribute *attr, char *buf)
 {
        struct node_attr *na = container_of(attr, struct node_attr, attr);
        return print_nodes_state(na->state, buf);
 }
 
 #define _NODE_ATTR(name, state) \
-       { _SYSDEV_CLASS_ATTR(name, 0444, show_node_state, NULL), state }
+       { __ATTR(name, 0444, show_node_state, NULL), state }
 
 static struct node_attr node_state_attr[] = {
        _NODE_ATTR(possible, N_POSSIBLE),
@@ -581,17 +625,26 @@ static struct node_attr node_state_attr[] = {
 #endif
 };
 
-static struct sysdev_class_attribute *node_state_attrs[] = {
-       &node_state_attr[0].attr,
-       &node_state_attr[1].attr,
-       &node_state_attr[2].attr,
-       &node_state_attr[3].attr,
+static struct attribute *node_state_attrs[] = {
+       &node_state_attr[0].attr.attr,
+       &node_state_attr[1].attr.attr,
+       &node_state_attr[2].attr.attr,
+       &node_state_attr[3].attr.attr,
 #ifdef CONFIG_HIGHMEM
-       &node_state_attr[4].attr,
+       &node_state_attr[4].attr.attr,
 #endif
        NULL
 };
 
+static struct attribute_group memory_root_attr_group = {
+       .attrs = node_state_attrs,
+};
+
+static const struct attribute_group *cpu_root_attr_groups[] = {
+       &memory_root_attr_group,
+       NULL,
+};
+
 #define NODE_CALLBACK_PRI      2       /* lower than SLAB */
 static int __init register_node_type(void)
 {
@@ -600,7 +653,7 @@ static int __init register_node_type(void)
        BUILD_BUG_ON(ARRAY_SIZE(node_state_attr) != NR_NODE_STATES);
        BUILD_BUG_ON(ARRAY_SIZE(node_state_attrs)-1 != NR_NODE_STATES);
 
-       ret = sysdev_class_register(&node_class);
+       ret = subsys_system_register(&node_subsys, cpu_root_attr_groups);
        if (!ret) {
                hotplug_memory_notifier(node_memory_callback,
                                        NODE_CALLBACK_PRI);