Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754817AbYHLP2u (ORCPT ); Tue, 12 Aug 2008 11:28:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752838AbYHLP2k (ORCPT ); Tue, 12 Aug 2008 11:28:40 -0400 Received: from qb-out-0506.google.com ([72.14.204.236]:31396 "EHLO qb-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752277AbYHLP2j (ORCPT ); Tue, 12 Aug 2008 11:28:39 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent:sender; b=QSmr0f1v4BOYgTbKZQq45V9TGre+r6KtAnZGv/2268eY0v/sv3MjWRDAi5hpcdCHdg 7fUuvgyAMNE4H5T6p1ZRFNh2oWLOKI9e8Yv0KlcDPDPt6xvT2DAdU4tdGlSQf1AqN2YT T0uMf00mz0zGRsvXgFM+yHxH2FWT8PoJ02csk= Date: Tue, 12 Aug 2008 18:25:49 +0300 From: Eduard - Gabriel Munteanu To: Pekka Enberg Cc: Christoph Lameter , mathieu.desnoyers@polymtl.ca, linux-mm@kvack.org, linux-kernel@vger.kernel.org, rdunlap@xenotime.net, mpm@selenic.com, rostedt@goodmis.org, tglx@linutronix.de Subject: Re: [PATCH 4/5] kmemtrace: SLUB hooks. Message-ID: <20080812152548.GA5973@localhost> References: <1218388447-5578-1-git-send-email-eduard.munteanu@linux360.ro> <1218388447-5578-2-git-send-email-eduard.munteanu@linux360.ro> <1218388447-5578-3-git-send-email-eduard.munteanu@linux360.ro> <1218388447-5578-4-git-send-email-eduard.munteanu@linux360.ro> <1218388447-5578-5-git-send-email-eduard.munteanu@linux360.ro> <48A046F5.2000505@linux-foundation.org> <1218463774.7813.291.camel@penberg-laptop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1218463774.7813.291.camel@penberg-laptop> User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2321 Lines: 58 On Mon, Aug 11, 2008 at 05:09:34PM +0300, Pekka Enberg wrote: > On Mon, 2008-08-11 at 09:04 -0500, Christoph Lameter wrote: > > Eduard - Gabriel Munteanu wrote: > > > > > > > > > static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) > > > { > > > + void *ret; > > > + > > > if (__builtin_constant_p(size) && > > > size <= PAGE_SIZE && !(flags & SLUB_DMA)) { > > > struct kmem_cache *s = kmalloc_slab(size); > > > @@ -239,7 +280,13 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) > > > if (!s) > > > return ZERO_SIZE_PTR; > > > > > > - return kmem_cache_alloc_node(s, flags, node); > > > + ret = kmem_cache_alloc_node_notrace(s, flags, node); > > > + > > > + kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_KMALLOC, > > > + _THIS_IP_, ret, > > > + size, s->size, flags, node); > > > + > > > + return ret; > > > > You could simplify the stuff in slub.h if you would fall back to the uninlined > > functions in the case that kmemtrace is enabled. IMHO adding additional inline > > code here does grow these function to a size where inlining is not useful anymore. > > So, if CONFIG_KMEMTRACE is enabled, make the inlined version go away > completely? I'm okay with that though I wonder if that means we now take > a performance hit when CONFIG_KMEMTRACE is enabled but tracing is > disabled at run-time... Oh, good. I'm also thinking to add a macro that expands to simple inline when CONFIG_KMEMTRACE is disabled and to __always_inline otherwise. > > > + kmemtrace_mark_alloc(KMEMTRACE_TYPE_CACHE, _RET_IP_, ret, > > > + s->objsize, s->size, gfpflags); > > > + > > > + return ret; > > > } > > > > _RET_IP == __builtin_return_address(0) right? Put that into a local variable? > > At least we need consistent usage within one function. Maybe convert > > __builtin_return_address(0) to _RET_IP_ within slub? > > I think we should just convert SLUB to use _RET_IP_ everywhere. Eduard, > care to make a patch and send it and rebase this on top of that? Sure. Will get back soon. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/