3 files changed, 13 insertions, 1 deletions

diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
index 568d90e17c17..465ea0153b2a 100644
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
@@ -120,7 +120,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
         show_val_kb(m, "Committed_AS:   ", committed);
         seq_printf(m, "VmallocTotal:   %8lu kB\n",
                    (unsigned long)VMALLOC_TOTAL >> 10);
-        show_val_kb(m, "VmallocUsed:    ", 0ul);
+        show_val_kb(m, "VmallocUsed:    ", vmalloc_nr_pages());
         show_val_kb(m, "VmallocChunk:   ", 0ul);
         show_val_kb(m, "Percpu:         ", pcpu_nr_pages());
 
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 51e131245379..9b21d0047710 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -72,10 +72,12 @@ extern void vm_unmap_aliases(void);
 
 #ifdef CONFIG_MMU
 extern void __init vmalloc_init(void);
+extern unsigned long vmalloc_nr_pages(void);
 #else
 static inline void vmalloc_init(void)
 {
 }
+static inline unsigned long vmalloc_nr_pages(void) { return 0; }
 #endif
 
 extern void *vmalloc(unsigned long size);
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index edb212298c8a..4fa8d84599b0 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -406,6 +406,13 @@ static void purge_vmap_area_lazy(void);
 static BLOCKING_NOTIFIER_HEAD(vmap_notify_list);
 static unsigned long lazy_max_pages(void);
 
+static atomic_long_t nr_vmalloc_pages;
+
+unsigned long vmalloc_nr_pages(void)
+{
+        return atomic_long_read(&nr_vmalloc_pages);
+}
+
 static struct vmap_area *__find_vmap_area(unsigned long addr)
 {
         struct rb_node *n = vmap_area_root.rb_node;
@@ -2237,6 +2244,7 @@ static void __vunmap(const void *addr, int deallocate_pages)
                         BUG_ON(!page);
                         __free_pages(page, 0);
                 }
+                atomic_long_sub(area->nr_pages, &nr_vmalloc_pages);
 
                 kvfree(area->pages);
         }
@@ -2414,12 +2422,14 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
                 if (unlikely(!page)) {
                         /* Successfully allocated i pages, free them in __vunmap() */
                         area->nr_pages = i;
+                        atomic_long_add(area->nr_pages, &nr_vmalloc_pages);
                         goto fail;
                 }
                 area->pages[i] = page;
                 if (gfpflags_allow_blocking(gfp_mask|highmem_mask))
                         cond_resched();
         }
+        atomic_long_add(area->nr_pages, &nr_vmalloc_pages);
 
         if (map_vm_area(area, prot, pages))
                 goto fail;