1 files changed, 10 insertions, 0 deletions

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;