Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7adde04a authored by Xiaotian Feng's avatar Xiaotian Feng Committed by Pekka Enberg
Browse files

slab: fix caller tracking on !CONFIG_DEBUG_SLAB && CONFIG_TRACING 



In slab, all __xxx_track_caller is defined on CONFIG_DEBUG_SLAB || CONFIG_TRACING,
thus caller tracking function should be worked for CONFIG_TRACING. But if
CONFIG_DEBUG_SLAB is not set, include/linux/slab.h will define xxx_track_caller to
__xxx() without consideration of CONFIG_TRACING. This will break the caller tracking
behaviour then.

Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Matt Mackall <mpm@selenic.com>
Cc: Vegard Nossum <vegard.nossum@gmail.com>
Cc: Dmitry Monakhov <dmonakhov@openvz.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarXiaotian Feng <dfeng@redhat.com>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
parent 7e27d6e7

include/linux/slab.h

+4 −2
Original line number Diff line number Diff line
@@ -268,7 +268,8 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep, 
 * allocator where we care about the real place the memory allocation

 * request comes from.

 */

#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB)

#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \

	(defined(CONFIG_SLAB) && defined(CONFIG_TRACING))

extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);

#define kmalloc_track_caller(size, flags) \

	__kmalloc_track_caller(size, flags, _RET_IP_)
@@ -286,7 +287,8 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long); 
 * standard allocator where we care about the real place the memory

 * allocation request comes from.

 */

#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB)

#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \

	(defined(CONFIG_SLAB) && defined(CONFIG_TRACING))

extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long);

#define kmalloc_node_track_caller(size, flags, node) \

	__kmalloc_node_track_caller(size, flags, node, \