From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756930Ab1DOUuy (ORCPT ); Fri, 15 Apr 2011 16:50:54 -0400 Received: from smtp110.prem.mail.ac4.yahoo.com ([76.13.13.93]:31864 "HELO smtp110.prem.mail.ac4.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753200Ab1DOUrw (ORCPT ); Fri, 15 Apr 2011 16:47:52 -0400 X-Yahoo-SMTP: _Dag8S.swBC1p4FJKLCXbs8NQzyse1SYSgnAbY0- X-YMail-OSG: xVfntZwVM1nDg9kuaeIZJPPuBQv_v8PR32iQNBMBDPdY66M WExUG.mJ05mAi0IRbvofobR9gwo3dQ0A9FlFZqR27V0u7016B9vbvtea4tVD btM9lSUaK6eIlWtZfdqHLtGonmh2lllPACcJ74B1gvuyJpGelDHXn1XYyyMn Ll.tLroUk56E7orUZXUBoM5znodhWU_QWQMZTVWkH1aOyiKwOpKzM9SgY2te B8KymLUxYkN.6fc8I.OnRCMrZoDDNR2QOGymQGrn7gSrMdqv6Qu1h_HNABYq emxIlIkkePIWQtsYlH5FeZOUOigGsbOATo7pufcAXKllqmnFo X-Yahoo-Newman-Property: ymail-3 Message-Id: <20110415204750.707025485@linux.com> User-Agent: quilt/0.48-1 Date: Fri, 15 Apr 2011 15:47:38 -0500 From: Christoph Lameter To: Pekka Enberg Cc: David Rientjes Cc: Hugh Dickins Cc: Eric Dumazet Cc: "H. Peter Anvin" Cc: Mathieu Desnoyers Cc: linux-kernel@vger.kernel.org Subject: [slubllv3 08/21] slub: Move page->frozen handling near where the page->freelist handling occurs References: <20110415204730.326790555@linux.com> Content-Disposition: inline; filename=frozen_move Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is necessary because the frozen bit has to be handled in the same cmpxchg_double with the freelist and the counters. Signed-off-by: Christoph Lameter --- mm/slub.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) Index: linux-2.6/mm/slub.c =================================================================== --- linux-2.6.orig/mm/slub.c 2011-04-15 13:14:36.000000000 -0500 +++ linux-2.6/mm/slub.c 2011-04-15 13:14:40.000000000 -0500 @@ -1264,6 +1264,7 @@ static struct page *new_slab(struct kmem page->freelist = start; page->inuse = 0; + page->frozen = 1; out: return page; } @@ -1402,7 +1403,6 @@ static inline int lock_and_freeze_slab(s { if (slab_trylock(page)) { __remove_partial(n, page); - page->frozen = 1; return 1; } return 0; @@ -1516,7 +1516,6 @@ static void unfreeze_slab(struct kmem_ca { struct kmem_cache_node *n = get_node(s, page_to_nid(page)); - page->frozen = 0; if (page->inuse) { if (page->freelist) { @@ -1657,6 +1656,7 @@ static void deactivate_slab(struct kmem_ #ifdef CONFIG_CMPXCHG_LOCAL c->tid = next_tid(c->tid); #endif + page->frozen = 0; unfreeze_slab(s, page, tail); } @@ -1819,6 +1819,8 @@ static void *__slab_alloc(struct kmem_ca stat(s, ALLOC_REFILL); load_freelist: + VM_BUG_ON(!page->frozen); + object = page->freelist; if (unlikely(!object)) goto another_slab; @@ -1845,6 +1847,7 @@ new_slab: page = get_partial(s, gfpflags, node); if (page) { stat(s, ALLOC_FROM_PARTIAL); + page->frozen = 1; load_from_page: c->node = page_to_nid(page); c->page = page; @@ -1867,7 +1870,6 @@ load_from_page: flush_slab(s, c); slab_lock(page); - page->frozen = 1; goto load_from_page; } @@ -2430,6 +2432,7 @@ static void early_kmem_cache_node_alloc( BUG_ON(!n); page->freelist = get_freepointer(kmem_cache_node, n); page->inuse++; + page->frozen = 0; kmem_cache_node->node[node] = n; #ifdef CONFIG_SLUB_DEBUG init_object(kmem_cache_node, n, SLUB_RED_ACTIVE);