1 files changed, 49 insertions, 10 deletions

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 2872e86837b2..793f796c4da3 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -7,6 +7,7 @@
 #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>
@@ -117,12 +118,21 @@ 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)),
-                       nid, K(node_page_state(nid, NR_ANON_PAGES)),
+                       nid, K(node_page_state(nid, NR_ANON_PAGES)
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+                        + node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *
+                        HPAGE_PMD_NR
+#endif
+                       ),
                        nid, K(node_page_state(nid, NR_SHMEM)),
                        nid, node_page_state(nid, NR_KERNEL_STACK) *
                                 THREAD_SIZE / 1024,
@@ -133,7 +143,13 @@ 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)),
-                       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)));
+                       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+                        , nid,
+                        K(node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *
+                        HPAGE_PMD_NR)
+#endif
+                       );
         n += hugetlb_report_node_meminfo(nid, buf + n);
         return n;
 }
@@ -160,6 +176,21 @@ static ssize_t node_read_numastat(struct sys_device * dev,
 }
 static SYSDEV_ATTR(numastat, S_IRUGO, node_read_numastat, NULL);
 
+static ssize_t node_read_vmstat(struct sys_device *dev,
+                                struct sysdev_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 SYSDEV_ATTR(vmstat, S_IRUGO, node_read_vmstat, NULL);
+
 static ssize_t node_read_distance(struct sys_device * dev,
                         struct sysdev_attribute *attr, char * buf)
 {
@@ -243,6 +274,7 @@ int register_node(struct node *node, int num, struct node *parent)
                 sysdev_create_file(&node->sysdev, &attr_meminfo);
                 sysdev_create_file(&node->sysdev, &attr_numastat);
                 sysdev_create_file(&node->sysdev, &attr_distance);
+                sysdev_create_file(&node->sysdev, &attr_vmstat);
 
                 scan_unevictable_register_node(node);
 
@@ -267,6 +299,7 @@ void unregister_node(struct node *node)
         sysdev_remove_file(&node->sysdev, &attr_meminfo);
         sysdev_remove_file(&node->sysdev, &attr_numastat);
         sysdev_remove_file(&node->sysdev, &attr_distance);
+        sysdev_remove_file(&node->sysdev, &attr_vmstat);
 
         scan_unevictable_unregister_node(node);
         hugetlb_unregister_node(node);          /* no-op, if memoryless node */
@@ -346,8 +379,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;
 
@@ -371,7 +406,8 @@ int register_mem_sect_under_node(struct memory_block *mem_blk, int nid)
 }
 
 /* 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 +419,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;
@@ -409,25 +446,27 @@ static int link_mem_sections(int nid)
         unsigned long start_pfn = NODE_DATA(nid)->node_start_pfn;
         unsigned long end_pfn = start_pfn + NODE_DATA(nid)->node_spanned_pages;
         unsigned long pfn;
+        struct memory_block *mem_blk = NULL;
         int err = 0;
 
         for (pfn = start_pfn; pfn < end_pfn; pfn += PAGES_PER_SECTION) {
                 unsigned long section_nr = pfn_to_section_nr(pfn);
                 struct mem_section *mem_sect;
-                struct memory_block *mem_blk;
                 int ret;
 
                 if (!present_section_nr(section_nr))
                         continue;
                 mem_sect = __nr_to_section(section_nr);
-                mem_blk = find_memory_block(mem_sect);
+                mem_blk = find_memory_block_hinted(mem_sect, mem_blk);
                 ret = register_mem_sect_under_node(mem_blk, nid);
                 if (!err)
                         err = ret;
 
                 /* discard ref obtained in find_memory_block() */
-                kobject_put(&mem_blk->sysdev.kobj);
         }
+
+        if (mem_blk)
+                kobject_put(&mem_blk->sysdev.kobj);
         return err;
 }