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

Commit d624a2b1 authored by Daniel Vetter's avatar Daniel Vetter Committed by Alistair Delva
Browse files

UPSTREAM: mm/sl[uo]b: export __kmalloc_track(_node)_caller 



slab does this already, and I want to use this in a memory allocation
tracker in drm for stuff that's tied to the lifetime of a drm_device,
not the underlying struct device. Kinda like devres, but for drm.

Acked-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org
Link: https://patchwork.freedesktop.org/patch/msgid/20200323144950.3018436-2-daniel.vetter@ffwll.ch


(cherry picked from commit fd7cb5753ef49964ea9db5121c3fc9a4ec21ed8e)
Bug: 163141236
Signed-off-by: default avatarAlistair Delva <adelva@google.com>
Change-Id: I10790befc779311a5f2ee441e4d073e51a5a7a62
parent 0f1aab4b

mm/slob.c

+2 −0
Original line number Diff line number Diff line
@@ -474,6 +474,7 @@ 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);



#ifdef CONFIG_NUMA

void *__kmalloc_node_track_caller(size_t size, gfp_t gfp,
@@ -481,6 +482,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfp, 
{

	return __do_kmalloc_node(size, gfp, node, caller);

}

EXPORT_SYMBOL(__kmalloc_node_track_caller);

#endif



void kfree(const void *block)

mm/slub.c

+2 −0
Original line number Diff line number Diff line
@@ -4389,6 +4389,7 @@ void *__kmalloc_track_caller(size_t size, gfp_t gfpflags, unsigned long caller) 


	return ret;

}

EXPORT_SYMBOL(__kmalloc_track_caller);



#ifdef CONFIG_NUMA

void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
@@ -4419,6 +4420,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags, 


	return ret;

}

EXPORT_SYMBOL(__kmalloc_node_track_caller);

#endif



#ifdef CONFIG_SYSFS