Make kmalloc_track_caller() wrapper of kmalloc_node_track_caller().
Signed-off-by: Hyeonggon Yoo <[email protected]>
---
include/linux/slab.h | 17 ++++++++---------
mm/slab.c | 6 ------
mm/slob.c | 6 ------
mm/slub.c | 22 ----------------------
4 files changed, 8 insertions(+), 43 deletions(-)
diff --git a/include/linux/slab.h b/include/linux/slab.h
index a3b9d4c20d7e..acdb4b7428f9 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -639,6 +639,12 @@ static inline __alloc_size(1, 2) void *kcalloc(size_t n, size_t size, gfp_t flag
return kmalloc_array(n, size, flags | __GFP_ZERO);
}
+extern void *__kmalloc_node_track_caller(size_t size, gfp_t flags, int node,
+ unsigned long caller) __alloc_size(1);
+#define kmalloc_node_track_caller(size, flags, node) \
+ __kmalloc_node_track_caller(size, flags, node, \
+ _RET_IP_)
+
/*
* kmalloc_track_caller is a special version of kmalloc that records the
* calling function of the routine calling it for slab leak tracking instead
@@ -647,9 +653,9 @@ static inline __alloc_size(1, 2) void *kcalloc(size_t n, size_t size, gfp_t flag
* allocator where we care about the real place the memory allocation
* request comes from.
*/
-extern void *__kmalloc_track_caller(size_t size, gfp_t flags, unsigned long caller);
#define kmalloc_track_caller(size, flags) \
- __kmalloc_track_caller(size, flags, _RET_IP_)
+ __kmalloc_node_track_caller(size, flags, \
+ NUMA_NO_NODE, _RET_IP_)
static inline __alloc_size(1, 2) void *kmalloc_array_node(size_t n, size_t size, gfp_t flags,
int node)
@@ -668,13 +674,6 @@ static inline __alloc_size(1, 2) void *kcalloc_node(size_t n, size_t size, gfp_t
return kmalloc_array_node(n, size, flags | __GFP_ZERO, node);
}
-
-extern void *__kmalloc_node_track_caller(size_t size, gfp_t flags, int node,
- unsigned long caller) __alloc_size(1);
-#define kmalloc_node_track_caller(size, flags, node) \
- __kmalloc_node_track_caller(size, flags, node, \
- _RET_IP_)
-
/*
* Shortcuts
*/
diff --git a/mm/slab.c b/mm/slab.c
index 5ad55ca96ab6..5f20efc7a330 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3675,12 +3675,6 @@ void *__kmalloc(size_t size, gfp_t flags)
}
EXPORT_SYMBOL(__kmalloc);
-void *__kmalloc_track_caller(size_t size, gfp_t flags, unsigned long caller)
-{
- return __do_kmalloc(size, flags, caller);
-}
-EXPORT_SYMBOL(__kmalloc_track_caller);
-
/**
* kmem_cache_free - Deallocate an object
* @cachep: The cache the allocation was from.
diff --git a/mm/slob.c b/mm/slob.c
index c8c3b5662edf..6d0fc6ad1413 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -528,12 +528,6 @@ void *__kmalloc(size_t size, gfp_t gfp)
}
EXPORT_SYMBOL(__kmalloc);
-void *__kmalloc_track_caller(size_t size, gfp_t gfp, unsigned long caller)
-{
- return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, caller);
-}
-EXPORT_SYMBOL(__kmalloc_track_caller);
-
void *__kmalloc_node_track_caller(size_t size, gfp_t gfp,
int node, unsigned long caller)
{
diff --git a/mm/slub.c b/mm/slub.c
index e36c148e5069..e425c5c372de 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -4903,28 +4903,6 @@ int __kmem_cache_create(struct kmem_cache *s, slab_flags_t flags)
return 0;
}
-void *__kmalloc_track_caller(size_t size, gfp_t gfpflags, unsigned long caller)
-{
- struct kmem_cache *s;
- void *ret;
-
- if (unlikely(size > KMALLOC_MAX_CACHE_SIZE))
- return kmalloc_large(size, gfpflags);
-
- s = kmalloc_slab(size, gfpflags);
-
- if (unlikely(ZERO_OR_NULL_PTR(s)))
- return s;
-
- ret = slab_alloc(s, NULL, gfpflags, caller, size);
-
- /* Honor the call site pointer we received. */
- trace_kmalloc(caller, ret, size, s->size, gfpflags);
-
- return ret;
-}
-EXPORT_SYMBOL(__kmalloc_track_caller);
-
void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
int node, unsigned long caller)
{
--
2.32.0
On 4/14/22 10:57, Hyeonggon Yoo wrote:
> Make kmalloc_track_caller() wrapper of kmalloc_node_track_caller().
Looks like there's an immediate benefit of SLUB not throwing away the caller
pointer anymore in case of kmalloc_large().
> Signed-off-by: Hyeonggon Yoo <[email protected]>
Reviewed-by: Vlastimil Babka <[email protected]>
On 4/14/22 10:57, Hyeonggon Yoo wrote:
> Make kmalloc_track_caller() wrapper of kmalloc_node_track_caller().
>
> Signed-off-by: Hyeonggon Yoo <[email protected]>
> ---
> include/linux/slab.h | 17 ++++++++---------
> mm/slab.c | 6 ------
> mm/slob.c | 6 ------
> mm/slub.c | 22 ----------------------
> 4 files changed, 8 insertions(+), 43 deletions(-)
>
> diff --git a/include/linux/slab.h b/include/linux/slab.h
> index a3b9d4c20d7e..acdb4b7428f9 100644
> --- a/include/linux/slab.h
> +++ b/include/linux/slab.h
> @@ -639,6 +639,12 @@ static inline __alloc_size(1, 2) void *kcalloc(size_t n, size_t size, gfp_t flag
> return kmalloc_array(n, size, flags | __GFP_ZERO);
> }
>
> +extern void *__kmalloc_node_track_caller(size_t size, gfp_t flags, int node,
> + unsigned long caller) __alloc_size(1);
Update: in v3 remove the extern, it's not necessary and the kernel is slowly
getting rid of them.
On Tue, Apr 26, 2022 at 05:49:08PM +0200, Vlastimil Babka wrote:
> On 4/14/22 10:57, Hyeonggon Yoo wrote:
> > Make kmalloc_track_caller() wrapper of kmalloc_node_track_caller().
> >
> > Signed-off-by: Hyeonggon Yoo <[email protected]>
> > ---
> > include/linux/slab.h | 17 ++++++++---------
> > mm/slab.c | 6 ------
> > mm/slob.c | 6 ------
> > mm/slub.c | 22 ----------------------
> > 4 files changed, 8 insertions(+), 43 deletions(-)
> >
> > diff --git a/include/linux/slab.h b/include/linux/slab.h
> > index a3b9d4c20d7e..acdb4b7428f9 100644
> > --- a/include/linux/slab.h
> > +++ b/include/linux/slab.h
> > @@ -639,6 +639,12 @@ static inline __alloc_size(1, 2) void *kcalloc(size_t n, size_t size, gfp_t flag
> > return kmalloc_array(n, size, flags | __GFP_ZERO);
> > }
> >
> > +extern void *__kmalloc_node_track_caller(size_t size, gfp_t flags, int node,
> > + unsigned long caller) __alloc_size(1);
>
> Update: in v3 remove the extern, it's not necessary and the kernel is slowly
> getting rid of them.
Will do in v3. Thanks!