1 files changed, 20 insertions, 27 deletions

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 35f8553f893a..1ac191ce5641 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -24,6 +24,9 @@
 DEFINE_RWLOCK(vmlist_lock);
 struct vm_struct *vmlist;
 
+static void *__vmalloc_node(unsigned long size, gfp_t gfp_mask, pgprot_t prot,
+                            int node);
+
 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
 {
         pte_t *pte;
@@ -238,7 +241,6 @@ struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,
 
 /**
  *      get_vm_area  -  reserve a contingous kernel virtual area
- *
  *      @size:          size of the area
  *      @flags:         %VM_IOREMAP for I/O mappings or VM_ALLOC
  *
@@ -270,7 +272,7 @@ static struct vm_struct *__find_vm_area(void *addr)
 }
 
 /* Caller must hold vmlist_lock */
-struct vm_struct *__remove_vm_area(void *addr)
+static struct vm_struct *__remove_vm_area(void *addr)
 {
         struct vm_struct **p, *tmp;
 
@@ -293,7 +295,6 @@ found:
 
 /**
  *      remove_vm_area  -  find and remove a contingous kernel virtual area
- *
  *      @addr:          base address
  *
  *      Search for the kernel VM area starting at @addr, and remove it.
@@ -330,6 +331,8 @@ void __vunmap(void *addr, int deallocate_pages)
                 return;
         }
 
+        debug_check_no_locks_freed(addr, area->size);
+
         if (deallocate_pages) {
                 int i;
 
@@ -338,7 +341,7 @@ void __vunmap(void *addr, int deallocate_pages)
                         __free_page(area->pages[i]);
                 }
 
-                if (area->nr_pages > PAGE_SIZE/sizeof(struct page *))
+                if (area->flags & VM_VPAGES)
                         vfree(area->pages);
                 else
                         kfree(area->pages);
@@ -350,7 +353,6 @@ void __vunmap(void *addr, int deallocate_pages)
 
 /**
  *      vfree  -  release memory allocated by vmalloc()
- *
  *      @addr:          memory base address
  *
  *      Free the virtually contiguous memory area starting at @addr, as
@@ -368,7 +370,6 @@ EXPORT_SYMBOL(vfree);
 
 /**
  *      vunmap  -  release virtual mapping obtained by vmap()
- *
  *      @addr:          memory base address
  *
  *      Free the virtually contiguous memory area starting at @addr,
@@ -385,7 +386,6 @@ EXPORT_SYMBOL(vunmap);
 
 /**
  *      vmap  -  map an array of pages into virtually contiguous space
- *
  *      @pages:         array of page pointers
  *      @count:         number of pages to map
  *      @flags:         vm_area->flags
@@ -425,9 +425,10 @@ void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
 
         area->nr_pages = nr_pages;
         /* Please note that the recursion is strictly bounded. */
-        if (array_size > PAGE_SIZE)
+        if (array_size > PAGE_SIZE) {
                 pages = __vmalloc_node(array_size, gfp_mask, PAGE_KERNEL, node);
-        else
+                area->flags |= VM_VPAGES;
+        } else
                 pages = kmalloc_node(array_size, (gfp_mask & ~__GFP_HIGHMEM), node);
         area->pages = pages;
         if (!area->pages) {
@@ -465,7 +466,6 @@ void *__vmalloc_area(struct vm_struct *area, gfp_t gfp_mask, pgprot_t prot)
 
 /**
  *      __vmalloc_node  -  allocate virtually contiguous memory
- *
  *      @size:          allocation size
  *      @gfp_mask:      flags for the page level allocator
  *      @prot:          protection mask for the allocated pages
@@ -475,8 +475,8 @@ void *__vmalloc_area(struct vm_struct *area, gfp_t gfp_mask, pgprot_t prot)
  *      allocator with @gfp_mask flags.  Map them into contiguous
  *      kernel virtual space, using a pagetable protection of @prot.
  */
-void *__vmalloc_node(unsigned long size, gfp_t gfp_mask, pgprot_t prot,
-                        int node)
+static void *__vmalloc_node(unsigned long size, gfp_t gfp_mask, pgprot_t prot,
+                            int node)
 {
         struct vm_struct *area;
 
@@ -490,7 +490,6 @@ void *__vmalloc_node(unsigned long size, gfp_t gfp_mask, pgprot_t prot,
 
         return __vmalloc_area_node(area, gfp_mask, prot, node);
 }
-EXPORT_SYMBOL(__vmalloc_node);
 
 void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
 {
@@ -500,9 +499,7 @@ EXPORT_SYMBOL(__vmalloc);
 
 /**
  *      vmalloc  -  allocate virtually contiguous memory
- *
  *      @size:          allocation size
- *
  *      Allocate enough pages to cover @size from the page level
  *      allocator and map them into contiguous kernel virtual space.
  *
@@ -516,11 +513,11 @@ void *vmalloc(unsigned long size)
 EXPORT_SYMBOL(vmalloc);
 
 /**
- *      vmalloc_user  -  allocate virtually contiguous memory which has
- *                         been zeroed so it can be mapped to userspace without
- *                         leaking data.
+ * vmalloc_user - allocate zeroed virtually contiguous memory for userspace
+ * @size: allocation size
  *
- *      @size:          allocation size
+ * The resulting memory area is zeroed so it can be mapped to userspace
+ * without leaking data.
  */
 void *vmalloc_user(unsigned long size)
 {
@@ -539,7 +536,6 @@ EXPORT_SYMBOL(vmalloc_user);
 
 /**
  *      vmalloc_node  -  allocate memory on a specific node
- *
  *      @size:          allocation size
  *      @node:          numa node
  *
@@ -561,7 +557,6 @@ EXPORT_SYMBOL(vmalloc_node);
 
 /**
  *      vmalloc_exec  -  allocate virtually contiguous, executable memory
- *
  *      @size:          allocation size
  *
  *      Kernel-internal function to allocate enough pages to cover @size
@@ -579,7 +574,6 @@ void *vmalloc_exec(unsigned long size)
 
 /**
  *      vmalloc_32  -  allocate virtually contiguous memory (32bit addressable)
- *
  *      @size:          allocation size
  *
  *      Allocate enough 32bit PA addressable pages to cover @size from the
@@ -592,11 +586,11 @@ void *vmalloc_32(unsigned long size)
 EXPORT_SYMBOL(vmalloc_32);
 
 /**
- *      vmalloc_32_user  -  allocate virtually contiguous memory (32bit
- *                            addressable) which is zeroed so it can be
- *                            mapped to userspace without leaking data.
- *
+ * vmalloc_32_user - allocate zeroed virtually contiguous 32bit memory
  *      @size:          allocation size
+ *
+ * The resulting memory area is 32bit addressable and zeroed so it can be
+ * mapped to userspace without leaking data.
  */
 void *vmalloc_32_user(unsigned long size)
 {
@@ -690,7 +684,6 @@ finished:
 
 /**
  *      remap_vmalloc_range  -  map vmalloc pages to userspace
- *
  *      @vma:           vma to cover (map full range of vma)
  *      @addr:          vmalloc memory
  *      @pgoff:         number of pages into addr before first page to map