public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
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 08/17] slub: Pass kmem_cache struct to lock and freeze slab
Date: Thu, 26 May 2011 13:14:50 -0500	[thread overview]
Message-ID: <20110526181506.008690257@linux.com> (raw)
In-Reply-To: 20110526181442.789868308@linux.com

[-- Attachment #1: pass_kmem_cache_to_lock_and_freeze --]
[-- Type: text/plain, Size: 1957 bytes --]

We need more information about the slab for the cmpxchg implementation.

Signed-off-by: Christoph Lameter <cl@linux.com>

---
 mm/slub.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c	2011-05-16 11:46:58.311463052 -0500
+++ linux-2.6/mm/slub.c	2011-05-16 11:47:01.591463049 -0500
@@ -1444,8 +1444,8 @@ static inline void remove_partial(struct
  *
  * Must hold list_lock.
  */
-static inline int lock_and_freeze_slab(struct kmem_cache_node *n,
-							struct page *page)
+static inline int lock_and_freeze_slab(struct kmem_cache *s,
+		struct kmem_cache_node *n, struct page *page)
 {
 	if (slab_trylock(page)) {
 		remove_partial(n, page);
@@ -1457,7 +1457,8 @@ static inline int lock_and_freeze_slab(s
 /*
  * Try to allocate a partial slab from a specific node.
  */
-static struct page *get_partial_node(struct kmem_cache_node *n)
+static struct page *get_partial_node(struct kmem_cache *s,
+					struct kmem_cache_node *n)
 {
 	struct page *page;
 
@@ -1472,7 +1473,7 @@ static struct page *get_partial_node(str
 
 	spin_lock(&n->list_lock);
 	list_for_each_entry(page, &n->partial, lru)
-		if (lock_and_freeze_slab(n, page))
+		if (lock_and_freeze_slab(s, n, page))
 			goto out;
 	page = NULL;
 out:
@@ -1523,7 +1524,7 @@ static struct page *get_any_partial(stru
 
 		if (n && cpuset_zone_allowed_hardwall(zone, flags) &&
 				n->nr_partial > s->min_partial) {
-			page = get_partial_node(n);
+			page = get_partial_node(s, n);
 			if (page) {
 				put_mems_allowed();
 				return page;
@@ -1543,7 +1544,7 @@ static struct page *get_partial(struct k
 	struct page *page;
 	int searchnode = (node == NUMA_NO_NODE) ? numa_node_id() : node;
 
-	page = get_partial_node(get_node(s, searchnode));
+	page = get_partial_node(s, get_node(s, searchnode));
 	if (page || node != NUMA_NO_NODE)
 		return page;
 


  parent reply	other threads:[~2011-05-26 18:18 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 ` [slubllv6 03/17] slub: Move page->frozen handling near where the page->freelist handling occurs Christoph Lameter
2011-05-26 22:13   ` 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 ` Christoph Lameter [this message]
2011-05-27 19:43   ` [slubllv6 08/17] slub: Pass kmem_cache struct to lock and freeze slab 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=20110526181506.008690257@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