2 files changed, 37 insertions, 6 deletions

diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 3d9d786a943c..d68edffbf142 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -82,6 +82,7 @@ extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
                         const void *caller);
 
 extern void vfree(const void *addr);
+extern void vfree_atomic(const void *addr);
 
 extern void *vmap(struct page **pages, unsigned int count,
                         unsigned long flags, pgprot_t prot);
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 1f5501b43026..4ac776f10ad1 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1486,7 +1486,39 @@ static void __vunmap(const void *addr, int deallocate_pages)
         kfree(area);
         return;
 }
- 
+
+static inline void __vfree_deferred(const void *addr)
+{
+        /*
+         * Use raw_cpu_ptr() because this can be called from preemptible
+         * context. Preemption is absolutely fine here, because the llist_add()
+         * implementation is lockless, so it works even if we are adding to
+         * nother cpu's list.  schedule_work() should be fine with this too.
+         */
+        struct vfree_deferred *p = raw_cpu_ptr(&vfree_deferred);
+
+        if (llist_add((struct llist_node *)addr, &p->list))
+                schedule_work(&p->wq);
+}
+
+/**
+ *      vfree_atomic  -  release memory allocated by vmalloc()
+ *      @addr:          memory base address
+ *
+ *      This one is just like vfree() but can be called in any atomic context
+ *      except NMIs.
+ */
+void vfree_atomic(const void *addr)
+{
+        BUG_ON(in_nmi());
+
+        kmemleak_free(addr);
+
+        if (!addr)
+                return;
+        __vfree_deferred(addr);
+}
+
 /**
  *      vfree  -  release memory allocated by vmalloc()
  *      @addr:          memory base address
@@ -1509,11 +1541,9 @@ void vfree(const void *addr)
 
         if (!addr)
                 return;
-        if (unlikely(in_interrupt())) {
-                struct vfree_deferred *p = this_cpu_ptr(&vfree_deferred);
-                if (llist_add((struct llist_node *)addr, &p->list))
-                        schedule_work(&p->wq);
-        } else
+        if (unlikely(in_interrupt()))
+                __vfree_deferred(addr);
+        else
                 __vunmap(addr, 1);
 }
 EXPORT_SYMBOL(vfree);