From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail172.messagelabs.com (mail172.messagelabs.com [216.82.254.3]) by kanga.kvack.org (Postfix) with SMTP id 6D2EB8D0055 for ; Wed, 30 Mar 2011 16:24:28 -0400 (EDT) Message-Id: <20110330202425.905786071@linux.com> Date: Wed, 30 Mar 2011 15:23:59 -0500 From: Christoph Lameter Subject: [slubll1 17/19] slub: Get rid of the another_slab label References: <20110330202342.669400887@linux.com> Content-Disposition: inline; filename=eliminate_another_slab Sender: owner-linux-mm@kvack.org List-ID: To: Pekka Enberg Cc: David Rientjes , linux-mm@kvack.org, Eric Dumazet , "H. Peter Anvin" , Mathieu Desnoyers We can avoid deactivate slab in special cases if we do the deactivation of slabs in each code flow that leads to new_slab. Signed-off-by: Christoph Lameter --- mm/slub.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) Index: linux-2.6/mm/slub.c =================================================================== --- linux-2.6.orig/mm/slub.c 2011-03-30 14:43:51.000000000 -0500 +++ linux-2.6/mm/slub.c 2011-03-30 14:43:57.000000000 -0500 @@ -1938,8 +1938,10 @@ static void *__slab_alloc(struct kmem_ca if (!page) goto new_slab; - if (unlikely(!node_match(c, node))) - goto another_slab; + if (unlikely(!node_match(c, node))) { + deactivate_slab(s, c); + goto new_slab; + } stat(s, ALLOC_REFILL); @@ -1964,7 +1966,7 @@ load_freelist: VM_BUG_ON(!page->frozen); if (unlikely(!object)) - goto another_slab; + goto new_slab; c->freelist = get_freepointer(s, object); @@ -1975,9 +1977,6 @@ load_freelist: stat(s, ALLOC_SLOWPATH); return object; -another_slab: - deactivate_slab(s, c); - new_slab: page = get_partial(s, gfpflags, node); if (page) { -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org