From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail202.messagelabs.com (mail202.messagelabs.com [216.82.254.227]) by kanga.kvack.org (Postfix) with ESMTP id 80E9F600337 for ; Thu, 8 Apr 2010 15:03:19 -0400 (EDT) Received: from wpaz5.hot.corp.google.com (wpaz5.hot.corp.google.com [172.24.198.69]) by smtp-out.google.com with ESMTP id o38J3GtY007537 for ; Thu, 8 Apr 2010 12:03:16 -0700 Received: from pzk9 (pzk9.prod.google.com [10.243.19.137]) by wpaz5.hot.corp.google.com with ESMTP id o38J2GOX031825 for ; Thu, 8 Apr 2010 12:03:15 -0700 Received: by pzk9 with SMTP id 9so2113103pzk.19 for ; Thu, 08 Apr 2010 12:03:13 -0700 (PDT) Date: Thu, 8 Apr 2010 12:03:10 -0700 (PDT) From: David Rientjes Subject: Re: [PATCH] slub: __kmalloc_node_track_caller should trace kmalloc_large_node case In-Reply-To: <1270718804-27268-1-git-send-email-dfeng@redhat.com> Message-ID: References: <1270718804-27268-1-git-send-email-dfeng@redhat.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-linux-mm@kvack.org To: Xiaotian Feng Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Pekka Enberg , Matt Mackall , Ingo Molnar , Vegard Nossum List-ID: 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 > Cc: Pekka Enberg > Cc: Matt Mackall > Cc: David Rientjes Acked-by: David Rientjes > Cc: Ingo Molnar > Cc: Vegard Nossum > --- > 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, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org