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: [slubllv7 02/17] slub: Do not use frozen page flag but a bit in the page counters
Date: Wed, 01 Jun 2011 12:25:45 -0500 [thread overview]
Message-ID: <20110601172612.935727237@linux.com> (raw)
In-Reply-To: 20110601172543.437240675@linux.com
[-- Attachment #1: frozen_field --]
[-- Type: text/plain, Size: 3338 bytes --]
Do not use a page flag for the frozen bit. It needs to be part
of the state that is handled with cmpxchg_double(). So use a bit
in the counter struct in the page struct for that purpose.
Signed-off-by: Christoph Lameter <cl@linux.com>
---
include/linux/mm_types.h | 5 +++--
include/linux/page-flags.h | 5 -----
mm/slub.c | 12 ++++++------
3 files changed, 9 insertions(+), 13 deletions(-)
Index: linux-2.6/include/linux/mm_types.h
===================================================================
--- linux-2.6.orig/include/linux/mm_types.h 2011-05-31 09:40:57.402990070 -0500
+++ linux-2.6/include/linux/mm_types.h 2011-05-31 09:42:53.632989323 -0500
@@ -41,8 +41,9 @@ struct page {
* & limit reverse map searches.
*/
struct { /* SLUB */
- u16 inuse;
- u16 objects;
+ unsigned inuse:16;
+ unsigned objects:15;
+ unsigned frozen:1;
};
};
union {
Index: linux-2.6/include/linux/page-flags.h
===================================================================
--- linux-2.6.orig/include/linux/page-flags.h 2011-05-31 09:40:57.392990068 -0500
+++ linux-2.6/include/linux/page-flags.h 2011-05-31 09:43:25.402989115 -0500
@@ -124,9 +124,6 @@ enum pageflags {
/* SLOB */
PG_slob_free = PG_private,
-
- /* SLUB */
- PG_slub_frozen = PG_active,
};
#ifndef __GENERATING_BOUNDS_H
@@ -212,8 +209,6 @@ PAGEFLAG(SwapBacked, swapbacked) __CLEAR
__PAGEFLAG(SlobFree, slob_free)
-__PAGEFLAG(SlubFrozen, slub_frozen)
-
/*
* Private page markings that may be used by the filesystem that owns the page
* for its own purposes.
Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2011-05-31 09:42:08.102989621 -0500
+++ linux-2.6/mm/slub.c 2011-05-31 09:42:53.632989323 -0500
@@ -166,7 +166,7 @@ static inline int kmem_cache_debug(struc
#define OO_SHIFT 16
#define OO_MASK ((1 << OO_SHIFT) - 1)
-#define MAX_OBJS_PER_PAGE 65535 /* since page.objects is u16 */
+#define MAX_OBJS_PER_PAGE 32767 /* since page.objects is u15 */
/* Internal SLUB flags */
#define __OBJECT_POISON 0x80000000UL /* Poison object */
@@ -1025,7 +1025,7 @@ static noinline int free_debug_processin
}
/* Special debug activities for freeing objects */
- if (!PageSlubFrozen(page) && !page->freelist)
+ if (!page->frozen && !page->freelist)
remove_full(s, page);
if (s->flags & SLAB_STORE_USER)
set_track(s, object, TRACK_FREE, addr);
@@ -1424,7 +1424,7 @@ static inline int lock_and_freeze_slab(s
{
if (slab_trylock(page)) {
__remove_partial(n, page);
- __SetPageSlubFrozen(page);
+ page->frozen = 1;
return 1;
}
return 0;
@@ -1538,7 +1538,7 @@ static void unfreeze_slab(struct kmem_ca
{
struct kmem_cache_node *n = get_node(s, page_to_nid(page));
- __ClearPageSlubFrozen(page);
+ page->frozen = 0;
if (page->inuse) {
if (page->freelist) {
@@ -1868,7 +1868,7 @@ new_slab:
flush_slab(s, c);
slab_lock(page);
- __SetPageSlubFrozen(page);
+ page->frozen = 1;
c->node = page_to_nid(page);
c->page = page;
goto load_freelist;
@@ -2048,7 +2048,7 @@ static void __slab_free(struct kmem_cach
page->freelist = object;
page->inuse--;
- if (unlikely(PageSlubFrozen(page))) {
+ if (unlikely(page->frozen)) {
stat(s, FREE_FROZEN);
goto out_unlock;
}
next prev parent reply other threads:[~2011-06-01 17:30 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-01 17:25 [slubllv7 00/17] SLUB: Lockless freelists for objects V7 Christoph Lameter
2011-06-01 17:25 ` [slubllv7 01/17] slub: Push irq disable into allocate_slab() Christoph Lameter
2011-06-01 17:25 ` Christoph Lameter [this message]
2011-06-01 17:25 ` [slubllv7 03/17] slub: Move page->frozen handling near where the page->freelist handling occurs Christoph Lameter
2011-06-01 17:25 ` [slubllv7 04/17] x86: Add support for cmpxchg_double Christoph Lameter
2011-06-09 9:53 ` Pekka Enberg
2011-06-10 15:17 ` Christoph Lameter
2011-06-11 9:50 ` Pekka Enberg
2011-06-11 17:02 ` Christoph Lameter
2011-06-14 5:49 ` Pekka Enberg
2011-06-14 8:04 ` Ingo Molnar
2011-06-14 14:04 ` Christoph Lameter
2011-06-14 15:05 ` H. Peter Anvin
2011-06-15 8:55 ` Tejun Heo
2011-06-15 14:26 ` Christoph Lameter
2011-06-15 16:39 ` Tejun Heo
2011-06-15 17:19 ` Christoph Lameter
2011-06-25 23:49 ` [tip:x86/atomic] " tip-bot for Christoph Lameter
2011-06-01 17:25 ` [slubllv7 05/17] mm: Rearrange struct page Christoph Lameter
2011-06-09 9:57 ` Pekka Enberg
2011-06-09 16:45 ` Andrew Morton
2011-06-09 17:03 ` [PATCH] checkpatch: Add a "prefer __aligned" check Joe Perches
2011-06-01 17:25 ` [slubllv7 06/17] slub: Add cmpxchg_double_slab() Christoph Lameter
2011-07-11 19:55 ` Eric Dumazet
2011-07-12 15:59 ` Christoph Lameter
2011-07-12 16:06 ` Eric Dumazet
2011-07-12 16:47 ` Christoph Lameter
2011-07-12 18:40 ` H. Peter Anvin
2011-07-12 18:53 ` Christoph Lameter
2011-07-12 20:40 ` H. Peter Anvin
2011-06-01 17:25 ` [slubllv7 07/17] slub: explicit list_lock taking Christoph Lameter
2011-06-01 17:25 ` [slubllv7 08/17] slub: Pass kmem_cache struct to lock and freeze slab Christoph Lameter
2011-06-01 17:25 ` [slubllv7 09/17] slub: Rework allocator fastpaths Christoph Lameter
2011-06-01 17:25 ` [slubllv7 10/17] slub: Invert locking and avoid slab lock Christoph Lameter
2011-06-01 17:25 ` [slubllv7 11/17] slub: Disable interrupts in free_debug processing Christoph Lameter
2011-06-01 17:25 ` [slubllv7 12/17] slub: Avoid disabling interrupts in free slowpath Christoph Lameter
2011-06-01 17:25 ` [slubllv7 13/17] slub: Get rid of the another_slab label Christoph Lameter
2011-06-01 17:25 ` [slubllv7 14/17] slub: Add statistics for the case that the current slab does not match the node Christoph Lameter
2011-06-01 17:25 ` [slubllv7 15/17] slub: fast release on full slab Christoph Lameter
2011-06-01 17:25 ` [slubllv7 16/17] slub: Not necessary to check for empty slab on load_freelist Christoph Lameter
2011-06-01 17:26 ` [slubllv7 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=20110601172612.935727237@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;
as well as URLs for NNTP newsgroup(s).