linux-kernel - Re: [PATCH] slub: __kmalloc_node_track_caller should trace kmalloc_large

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.DEB.2.00.1004081202570.21040@chino.kir.corp.google.com>
Date:	Thu, 8 Apr 2010 12:03:10 -0700 (PDT)
From:	David Rientjes <rientjes@...gle.com>
To:	Xiaotian Feng <dfeng@...hat.com>
cc:	linux-mm@...ck.org, linux-kernel@...r.kernel.org,
	Pekka Enberg <penberg@...helsinki.fi>,
	Matt Mackall <mpm@...enic.com>, Ingo Molnar <mingo@...e.hu>,
	Vegard Nossum <vegard.nossum@...il.com>
Subject: Re: [PATCH] slub: __kmalloc_node_track_caller should trace
 kmalloc_large_node case

On Thu, 8 Apr 2010, Xiaotian Feng wrote:

> commit 94b528d (kmemtrace: SLUB hooks for caller-tracking functions)
> missed tracing kmalloc_large_node in __kmalloc_node_track_caller. We
> should trace it same as __kmalloc_node.
> 
> Signed-off-by: Xiaotian Feng <dfeng@...hat.com>
> Cc: Pekka Enberg <penberg@...helsinki.fi>
> Cc: Matt Mackall <mpm@...enic.com>
> Cc: David Rientjes <rientjes@...gle.com>

Acked-by: David Rientjes <rientjes@...gle.com>

> Cc: Ingo Molnar <mingo@...e.hu>
> Cc: Vegard Nossum <vegard.nossum@...il.com>
> ---
>  mm/slub.c |   11 +++++++++--
>  1 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/mm/slub.c b/mm/slub.c
> index b364844..a3a5a18 100644
> --- a/mm/slub.c
> +++ b/mm/slub.c
> @@ -3335,8 +3335,15 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
>  	struct kmem_cache *s;
>  	void *ret;
>  
> -	if (unlikely(size > SLUB_MAX_SIZE))
> -		return kmalloc_large_node(size, gfpflags, node);
> +	if (unlikely(size > SLUB_MAX_SIZE)) {
> +		ret = kmalloc_large_node(size, gfpflags, node);
> +
> +		trace_kmalloc_node(caller, ret,
> +				   size, PAGE_SIZE << get_order(size),
> +				   gfpflags, node);
> +
> +		return ret;
> +	}
>  
>  	s = get_slab(size, gfpflags);
>  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/