kmemleak: Trace the kmalloc_large* functions in slub
Subsystems (2)
PATCH 1/1 kmemleak: Trace the kmalloc_large* functions in slub
The kmalloc_large() and kmalloc_large_node() functions were missed when adding the kmemleak hooks to the slub allocator. However, they should be traced to avoid false positives.
Signed-off-by Catalin Marinas <[email protected]>
Cc Christoph Lameter <[email protected]>
Cc Pekka Enberg <[email protected]>
--- include/linux/slub_def.h | 2 ++ mm/slub.c | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-)
include/linux/slub_def.h +2 -0
@@ -11,6 +11,7 @@#include <linux/workqueue.h> #include <linux/kobject.h> #include <linux/kmemtrace.h> +#include <linux/kmemleak.h> enum stat_item {ALLOC_FASTPATH ,/* Allocation from cpu slab */
@@ -233,6 +234,7 @@ static __always_inline void *kmalloc_large(size_t size, gfp_t flags)unsigned int order =get_order (size);void *ret = (void *)__get_free_pages (flags | __GFP_COMP, order); +kmemleak_alloc (ret, size,1 , flags);trace_kmalloc (_THIS_IP_, ret, size,PAGE_SIZE << order, flags);return ret;
mm/slub.c +6 -4
@@ -21,7 +21,6 @@#include <linux/kmemcheck.h> #include <linux/cpu.h> #include <linux/cpuset.h> -#include <linux/kmemleak.h> #include <linux/mempolicy.h> #include <linux/ctype.h> #include <linux/debugobjects.h>
@@ -2833,13 +2832,15 @@ EXPORT_SYMBOL(__kmalloc);static void *kmalloc_large_node (size_t size,gfp_t flags,int node) {struct page *page; +void *ptr =NULL ; flags |= __GFP_COMP | __GFP_NOTRACK; page =alloc_pages_node (node, flags,get_order (size));if (page) -return page_address (page); -else -return NULL ; + ptr =page_address (page); + +kmemleak_alloc (ptr, size,1 , flags); +return ptr; }#ifdef CONFIG_NUMA
@@ -2924,6 +2925,7 @@ void kfree(const void *x) page =virt_to_head_page (x);if (unlikely (!PageSlab (page))) {BUG_ON (!PageCompound (page)); +kmemleak_free (x);put_page (page);return ; }
Quoted 7 lines · Catalin Marinas
The
kmalloc_large()andkmalloc_large_node()functions were missed when adding the kmemleak hooks to the slub allocator. However, they should be traced to avoid false positives.Signed-off-by Catalin Marinas <[email protected]>Cc Christoph Lameter <[email protected]>Cc Pekka Enberg <[email protected]>
Acked-by Pekka Enberg <[email protected]>