1 files changed, 23 insertions, 15 deletions

diff --git a/mm/slab.c b/mm/slab.c
index b1e40dafbab3..dfcc8885d7d5 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3653,11 +3653,18 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
 EXPORT_SYMBOL(kmem_cache_alloc);
 
 #ifdef CONFIG_TRACING
-void *kmem_cache_alloc_notrace(struct kmem_cache *cachep, gfp_t flags)
+void *
+kmem_cache_alloc_trace(size_t size, struct kmem_cache *cachep, gfp_t flags)
 {
-        return __cache_alloc(cachep, flags, __builtin_return_address(0));
+        void *ret;
+
+        ret = __cache_alloc(cachep, flags, __builtin_return_address(0));
+
+        trace_kmalloc(_RET_IP_, ret,
+                      size, slab_buffer_size(cachep), flags);
+        return ret;
 }
-EXPORT_SYMBOL(kmem_cache_alloc_notrace);
+EXPORT_SYMBOL(kmem_cache_alloc_trace);
 #endif
 
 /**
@@ -3705,31 +3712,32 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid)
 EXPORT_SYMBOL(kmem_cache_alloc_node);
 
 #ifdef CONFIG_TRACING
-void *kmem_cache_alloc_node_notrace(struct kmem_cache *cachep,
-                                    gfp_t flags,
-                                    int nodeid)
+void *kmem_cache_alloc_node_trace(size_t size,
+                                  struct kmem_cache *cachep,
+                                  gfp_t flags,
+                                  int nodeid)
 {
-        return __cache_alloc_node(cachep, flags, nodeid,
+        void *ret;
+
+        ret = __cache_alloc_node(cachep, flags, nodeid,
                                   __builtin_return_address(0));
+        trace_kmalloc_node(_RET_IP_, ret,
+                           size, slab_buffer_size(cachep),
+                           flags, nodeid);
+        return ret;
 }
-EXPORT_SYMBOL(kmem_cache_alloc_node_notrace);
+EXPORT_SYMBOL(kmem_cache_alloc_node_trace);
 #endif
 
 static __always_inline void *
 __do_kmalloc_node(size_t size, gfp_t flags, int node, void *caller)
 {
         struct kmem_cache *cachep;
-        void *ret;
 
         cachep = kmem_find_general_cachep(size, flags);
         if (unlikely(ZERO_OR_NULL_PTR(cachep)))
                 return cachep;
-        ret = kmem_cache_alloc_node_notrace(cachep, flags, node);
-
-        trace_kmalloc_node((unsigned long) caller, ret,
-                           size, cachep->buffer_size, flags, node);
-
-        return ret;
+        return kmem_cache_alloc_node_trace(size, cachep, flags, node);
 }
 
 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_TRACING)