From: Christoph Lameter <cl@linux.com>
To: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: David Rientjes <rientjes@google.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: linux-kernel@vger.kernel.org
Subject: [slubllv3 08/21] slub: Move page->frozen handling near where the page->freelist handling occurs
Date: Fri, 15 Apr 2011 15:47:38 -0500 [thread overview]
Message-ID: <20110415204750.707025485@linux.com> (raw)
In-Reply-To: 20110415204730.326790555@linux.com
[-- Attachment #1: frozen_move --]
[-- Type: text/plain, Size: 2021 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 | 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);
next prev parent reply other threads:[~2011-04-15 20:50 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-15 20:47 [slubllv3 00/21] SLUB: Lockless freelists for objects V3 Christoph Lameter
2011-04-15 20:47 ` [slubllv3 01/21] slub: Use NUMA_NO_NODE in get_partial Christoph Lameter
2011-04-15 20:47 ` [slubllv3 02/21] slub: get_map() function to establish map of free objects in a slab Christoph Lameter
2011-04-15 20:47 ` [slubllv3 03/21] slub: Eliminate repeated use of c->page through a new page variable Christoph Lameter
2011-04-15 20:47 ` [slubllv3 04/21] slub: Move node determination out of hotpath Christoph Lameter
2011-04-15 20:47 ` [slubllv3 05/21] slub: Move debug handlign in __slab_free Christoph Lameter
2011-04-15 20:47 ` [slubllv3 06/21] slub: Per object NUMA support Christoph Lameter
2011-04-15 20:47 ` [slubllv3 07/21] slub: Do not use frozen page flag but a bit in the page counters Christoph Lameter
2011-04-15 20:47 ` Christoph Lameter [this message]
2011-04-15 20:47 ` [slubllv3 09/21] x86: Add support for cmpxchg_double Christoph Lameter
2011-04-15 20:47 ` [slubllv3 10/21] mm: Rearrange struct page Christoph Lameter
2011-04-15 20:47 ` [slubllv3 11/21] slub: Add cmpxchg_double_slab() Christoph Lameter
2011-04-15 20:47 ` [slubllv3 12/21] slub: explicit list_lock taking Christoph Lameter
2011-04-15 20:47 ` [slubllv3 13/21] slub: Pass kmem_cache struct to lock and freeze slab Christoph Lameter
2011-04-15 20:47 ` [slubllv3 14/21] slub: Rework allocator fastpaths Christoph Lameter
2011-04-15 20:47 ` [slubllv3 15/21] slub: Invert locking and avoid slab lock Christoph Lameter
2011-04-15 20:47 ` [slubllv3 16/21] slub: Disable interrupts in free_debug processing Christoph Lameter
2011-04-15 20:47 ` [slubllv3 17/21] slub: Avoid disabling interrupts in free slowpath Christoph Lameter
2011-04-15 20:47 ` [slubllv3 18/21] slub: Get rid of the another_slab label Christoph Lameter
2011-04-15 20:47 ` [slubllv3 19/21] slub: fast release on full slab Christoph Lameter
2011-04-15 20:47 ` [slubllv3 20/21] slub: Not necessary to check for empty slab on load_freelist Christoph Lameter
2011-04-15 20:47 ` [slubllv3 21/21] slub: update statistics 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=20110415204750.707025485@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.