3 files changed, 59 insertions, 24 deletions

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index d176b23110cc..804de18abcc2 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -117,8 +117,8 @@ int ioremap_change_attr(unsigned long vaddr, unsigned long size,
  * have to convert them into an offset in a page-aligned mapping, but the
  * caller shouldn't need to know that small detail.
  */
-static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size,
-                               unsigned long prot_val)
+static void __iomem *__ioremap_caller(resource_size_t phys_addr,
+                unsigned long size, unsigned long prot_val, void *caller)
 {
         unsigned long pfn, offset, vaddr;
         resource_size_t last_addr;
@@ -212,7 +212,7 @@ static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size,
         /*
          * Ok, go for it..
          */
-        area = get_vm_area(size, VM_IOREMAP);
+        area = get_vm_area_caller(size, VM_IOREMAP, caller);
         if (!area)
                 return NULL;
         area->phys_addr = phys_addr;
@@ -255,7 +255,8 @@ static void __iomem *__ioremap(resource_size_t phys_addr, unsigned long size,
  */
 void __iomem *ioremap_nocache(resource_size_t phys_addr, unsigned long size)
 {
-        return __ioremap(phys_addr, size, _PAGE_CACHE_UC);
+        return __ioremap_caller(phys_addr, size, _PAGE_CACHE_UC,
+                                __builtin_return_address(0));
 }
 EXPORT_SYMBOL(ioremap_nocache);
 
@@ -272,7 +273,8 @@ EXPORT_SYMBOL(ioremap_nocache);
 void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size)
 {
         if (pat_wc_enabled)
-                return __ioremap(phys_addr, size, _PAGE_CACHE_WC);
+                return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC,
+                                        __builtin_return_address(0));
         else
                 return ioremap_nocache(phys_addr, size);
 }
@@ -280,7 +282,8 @@ EXPORT_SYMBOL(ioremap_wc);
 
 void __iomem *ioremap_cache(resource_size_t phys_addr, unsigned long size)
 {
-        return __ioremap(phys_addr, size, _PAGE_CACHE_WB);
+        return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WB,
+                                __builtin_return_address(0));
 }
 EXPORT_SYMBOL(ioremap_cache);
 
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 7f3adfda337a..364789aae9f3 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -31,6 +31,7 @@ struct vm_struct {
         struct page             **pages;
         unsigned int            nr_pages;
         unsigned long           phys_addr;
+        void                    *caller;
 };
 
 /*
@@ -66,6 +67,8 @@ static inline size_t get_vm_area_size(const struct vm_struct *area)
 }
 
 extern struct vm_struct *get_vm_area(unsigned long size, unsigned long flags);
+extern struct vm_struct *get_vm_area_caller(unsigned long size,
+                                        unsigned long flags, void *caller);
 extern struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,
                                         unsigned long start, unsigned long end);
 extern struct vm_struct *get_vm_area_node(unsigned long size,
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index afa550f66537..e33e0ae69ad1 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -16,6 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/seq_file.h>
 #include <linux/vmalloc.h>
+#include <linux/kallsyms.h>
 
 #include <asm/uaccess.h>
 #include <asm/tlbflush.h>
@@ -25,7 +26,7 @@ DEFINE_RWLOCK(vmlist_lock);
 struct vm_struct *vmlist;
 
 static void *__vmalloc_node(unsigned long size, gfp_t gfp_mask, pgprot_t prot,
-                            int node);
+                            int node, void *caller);
 
 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
 {
@@ -204,9 +205,9 @@ unsigned long vmalloc_to_pfn(const void *vmalloc_addr)
 }
 EXPORT_SYMBOL(vmalloc_to_pfn);
 
-static struct vm_struct *__get_vm_area_node(unsigned long size, unsigned long flags,
-                                            unsigned long start, unsigned long end,
-                                            int node, gfp_t gfp_mask)
+static struct vm_struct *
+__get_vm_area_node(unsigned long size, unsigned long flags, unsigned long start,
+                unsigned long end, int node, gfp_t gfp_mask, void *caller)
 {
         struct vm_struct **p, *tmp, *area;
         unsigned long align = 1;
@@ -269,6 +270,7 @@ found:
         area->pages = NULL;
         area->nr_pages = 0;
         area->phys_addr = 0;
+        area->caller = caller;
         write_unlock(&vmlist_lock);
 
         return area;
@@ -284,7 +286,8 @@ out:
 struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,
                                 unsigned long start, unsigned long end)
 {
-        return __get_vm_area_node(size, flags, start, end, -1, GFP_KERNEL);
+        return __get_vm_area_node(size, flags, start, end, -1, GFP_KERNEL,
+                                                __builtin_return_address(0));
 }
 EXPORT_SYMBOL_GPL(__get_vm_area);
 
@@ -299,14 +302,22 @@ EXPORT_SYMBOL_GPL(__get_vm_area);
  */
 struct vm_struct *get_vm_area(unsigned long size, unsigned long flags)
 {
-        return __get_vm_area(size, flags, VMALLOC_START, VMALLOC_END);
+        return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END,
+                                -1, GFP_KERNEL, __builtin_return_address(0));
+}
+
+struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
+                                void *caller)
+{
+        return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END,
+                                                -1, GFP_KERNEL, caller);
 }
 
 struct vm_struct *get_vm_area_node(unsigned long size, unsigned long flags,
                                    int node, gfp_t gfp_mask)
 {
         return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END, node,
-                                  gfp_mask);
+                                  gfp_mask, __builtin_return_address(0));
 }
 
 /* Caller must hold vmlist_lock */
@@ -455,9 +466,11 @@ void *vmap(struct page **pages, unsigned int count,
         if (count > num_physpages)
                 return NULL;
 
-        area = get_vm_area((count << PAGE_SHIFT), flags);
+        area = get_vm_area_caller((count << PAGE_SHIFT), flags,
+                                        __builtin_return_address(0));
         if (!area)
                 return NULL;
+
         if (map_vm_area(area, prot, &pages)) {
                 vunmap(area->addr);
                 return NULL;
@@ -468,7 +481,7 @@ void *vmap(struct page **pages, unsigned int count,
 EXPORT_SYMBOL(vmap);
 
 static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
-                                 pgprot_t prot, int node)
+                                 pgprot_t prot, int node, void *caller)
 {
         struct page **pages;
         unsigned int nr_pages, array_size, i;
@@ -480,7 +493,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
         /* Please note that the recursion is strictly bounded. */
         if (array_size > PAGE_SIZE) {
                 pages = __vmalloc_node(array_size, gfp_mask | __GFP_ZERO,
-                                        PAGE_KERNEL, node);
+                                PAGE_KERNEL, node, caller);
                 area->flags |= VM_VPAGES;
         } else {
                 pages = kmalloc_node(array_size,
@@ -488,6 +501,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
                                 node);
         }
         area->pages = pages;
+        area->caller = caller;
         if (!area->pages) {
                 remove_vm_area(area->addr);
                 kfree(area);
@@ -521,7 +535,8 @@ fail:
 
 void *__vmalloc_area(struct vm_struct *area, gfp_t gfp_mask, pgprot_t prot)
 {
-        return __vmalloc_area_node(area, gfp_mask, prot, -1);
+        return __vmalloc_area_node(area, gfp_mask, prot, -1,
+                                        __builtin_return_address(0));
 }
 
 /**
@@ -536,7 +551,7 @@ void *__vmalloc_area(struct vm_struct *area, gfp_t gfp_mask, pgprot_t prot)
  *      kernel virtual space, using a pagetable protection of @prot.
  */
 static void *__vmalloc_node(unsigned long size, gfp_t gfp_mask, pgprot_t prot,
-                            int node)
+                                                int node, void *caller)
 {
         struct vm_struct *area;
 
@@ -544,16 +559,19 @@ static void *__vmalloc_node(unsigned long size, gfp_t gfp_mask, pgprot_t prot,
         if (!size || (size >> PAGE_SHIFT) > num_physpages)
                 return NULL;
 
-        area = get_vm_area_node(size, VM_ALLOC, node, gfp_mask);
+        area = __get_vm_area_node(size, VM_ALLOC, VMALLOC_START, VMALLOC_END,
+                                                node, gfp_mask, caller);
+
         if (!area)
                 return NULL;
 
-        return __vmalloc_area_node(area, gfp_mask, prot, node);
+        return __vmalloc_area_node(area, gfp_mask, prot, node, caller);
 }
 
 void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
 {
-        return __vmalloc_node(size, gfp_mask, prot, -1);
+        return __vmalloc_node(size, gfp_mask, prot, -1,
+                                __builtin_return_address(0));
 }
 EXPORT_SYMBOL(__vmalloc);
 
@@ -568,7 +586,8 @@ EXPORT_SYMBOL(__vmalloc);
  */
 void *vmalloc(unsigned long size)
 {
-        return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL);
+        return __vmalloc_node(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
+                                        -1, __builtin_return_address(0));
 }
 EXPORT_SYMBOL(vmalloc);
 
@@ -608,7 +627,8 @@ EXPORT_SYMBOL(vmalloc_user);
  */
 void *vmalloc_node(unsigned long size, int node)
 {
-        return __vmalloc_node(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, node);
+        return __vmalloc_node(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
+                                        node, __builtin_return_address(0));
 }
 EXPORT_SYMBOL(vmalloc_node);
 
@@ -843,7 +863,8 @@ struct vm_struct *alloc_vm_area(size_t size)
 {
         struct vm_struct *area;
 
-        area = get_vm_area(size, VM_IOREMAP);
+        area = get_vm_area_caller(size, VM_IOREMAP,
+                                __builtin_return_address(0));
         if (area == NULL)
                 return NULL;
 
@@ -914,6 +935,14 @@ static int s_show(struct seq_file *m, void *p)
         seq_printf(m, "0x%p-0x%p %7ld",
                 v->addr, v->addr + v->size, v->size);
 
+        if (v->caller) {
+                char buff[2 * KSYM_NAME_LEN];
+
+                seq_putc(m, ' ');
+                sprint_symbol(buff, (unsigned long)v->caller);
+                seq_puts(m, buff);
+        }
+
         if (v->nr_pages)
                 seq_printf(m, " pages=%d", v->nr_pages);