From: Christoph Lameter <cl@linux.com>
To: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: David Rientjes <rientjes@google.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: linux-kernel@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
Subject: [slubllv6 03/17] slub: Move page->frozen handling near where the page->freelist handling occurs
Date: Thu, 26 May 2011 13:14:45 -0500 [thread overview]
Message-ID: <20110526181503.129943104@linux.com> (raw)
In-Reply-To: 20110526181442.789868308@linux.com
[-- Attachment #1: frozen_move --]
[-- Type: text/plain, Size: 1878 bytes --]
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 <cl@linux.com>
---
mm/slub.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2011-05-24 09:40:08.000000000 -0500
+++ linux-2.6/mm/slub.c 2011-05-24 09:40:37.644875159 -0500
@@ -1284,6 +1284,7 @@ static struct page *new_slab(struct kmem
page->freelist = start;
page->inuse = 0;
+ page->frozen = 1;
out:
return page;
}
@@ -1422,7 +1423,6 @@ static inline int lock_and_freeze_slab(s
{
if (slab_trylock(page)) {
__remove_partial(n, page);
- page->frozen = 1;
return 1;
}
return 0;
@@ -1536,7 +1536,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) {
@@ -1669,6 +1668,7 @@ static void deactivate_slab(struct kmem_
}
c->page = NULL;
c->tid = next_tid(c->tid);
+ page->frozen = 0;
unfreeze_slab(s, page, tail);
}
@@ -1829,6 +1829,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;
@@ -1853,6 +1855,7 @@ new_slab:
page = get_partial(s, gfpflags, node);
if (page) {
stat(s, ALLOC_FROM_PARTIAL);
+ page->frozen = 1;
c->node = page_to_nid(page);
c->page = page;
goto load_freelist;
@@ -2373,6 +2376,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);
next prev parent reply other threads:[~2011-05-26 18:19 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-26 18:14 [slubllv6 00/17] SLUB: Lockless freelists for objects V6 Christoph Lameter
2011-05-26 18:14 ` [slubllv6 01/17] slub: Push irq disable into allocate_slab() Christoph Lameter
2011-05-26 22:13 ` David Rientjes
2011-05-31 16:55 ` Christoph Lameter
2011-05-26 18:14 ` [slubllv6 02/17] slub: Do not use frozen page flag but a bit in the page counters Christoph Lameter
2011-05-26 22:13 ` David Rientjes
2011-05-31 16:57 ` Christoph Lameter
2011-05-26 18:14 ` Christoph Lameter [this message]
2011-05-26 22:13 ` [slubllv6 03/17] slub: Move page->frozen handling near where the page->freelist handling occurs David Rientjes
2011-05-26 18:14 ` [slubllv6 04/17] x86: Add support for cmpxchg_double Christoph Lameter
2011-05-26 18:14 ` [slubllv6 05/17] mm: Rearrange struct page Christoph Lameter
2011-05-26 22:14 ` David Rientjes
2011-05-26 18:14 ` [slubllv6 06/17] slub: Add cmpxchg_double_slab() Christoph Lameter
2011-05-26 22:14 ` David Rientjes
2011-05-31 17:05 ` Christoph Lameter
2011-05-26 18:14 ` [slubllv6 07/17] slub: explicit list_lock taking Christoph Lameter
2011-05-26 22:15 ` David Rientjes
2011-05-31 17:11 ` Christoph Lameter
2011-05-27 19:40 ` David Rientjes
2011-05-26 18:14 ` [slubllv6 08/17] slub: Pass kmem_cache struct to lock and freeze slab Christoph Lameter
2011-05-27 19:43 ` David Rientjes
2011-05-26 18:14 ` [slubllv6 09/17] slub: Rework allocator fastpaths Christoph Lameter
2011-05-26 18:14 ` [slubllv6 10/17] slub: Invert locking and avoid slab lock Christoph Lameter
2011-05-26 18:14 ` [slubllv6 11/17] slub: Disable interrupts in free_debug processing Christoph Lameter
2011-05-26 18:14 ` [slubllv6 12/17] slub: Avoid disabling interrupts in free slowpath Christoph Lameter
2011-05-26 22:16 ` David Rientjes
2011-05-31 17:12 ` Christoph Lameter
2011-05-26 18:14 ` [slubllv6 13/17] slub: Get rid of the another_slab label Christoph Lameter
2011-05-26 18:14 ` [slubllv6 14/17] slub: Add statistics for the case that the current slab does not match the node Christoph Lameter
2011-05-26 18:14 ` [slubllv6 15/17] slub: fast release on full slab Christoph Lameter
2011-05-26 18:14 ` [slubllv6 16/17] slub: Not necessary to check for empty slab on load_freelist Christoph Lameter
2011-05-26 18:14 ` [slubllv6 17/17] slub: slabinfo update for cmpxchg handling Christoph Lameter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110526181503.129943104@linux.com \
--to=cl@linux.com \
--cc=penberg@cs.helsinki.fi \
--cc=rientjes@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox