Commit c45248db authored by Hyeonggon Yoo's avatar Hyeonggon Yoo Committed by Vlastimil Babka
Browse files

mm/slab_common: cleanup kmalloc_track_caller() 



Make kmalloc_track_caller() wrapper of kmalloc_node_track_caller().

Signed-off-by: default avatarHyeonggon Yoo <42.hyeyoo@gmail.com>
Reviewed-by: default avatarVlastimil Babka <vbabka@suse.cz>
Signed-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
parent f78a03f6

include/linux/slab.h

+8 −9
Original line number Diff line number Diff line
@@ -651,6 +651,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);

}



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
@@ -659,9 +665,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)
@@ -680,13 +686,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

 */

mm/slab.c

+0 −6
Original line number Diff line number Diff line
@@ -3665,12 +3665,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.

mm/slob.c

+0 −6
Original line number Diff line number Diff line
@@ -530,12 +530,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)

{

mm/slub.c

+0 −22
Original line number Diff line number Diff line
@@ -4904,28 +4904,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, s, 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)

{