From: Christoph Lameter <cl@linux.com>
To: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: David Rientjes <rientjes@google.com>,
linux-mm@kvack.org, Eric Dumazet <eric.dumazet@gmail.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Subject: [slubll1 05/19] slub: Move debug handlign in __slab_free
Date: Wed, 30 Mar 2011 15:23:47 -0500 [thread overview]
Message-ID: <20110330202418.145015838@linux.com> (raw)
In-Reply-To: 20110330202342.669400887@linux.com
[-- Attachment #1: move_debug --]
[-- Type: text/plain, Size: 1273 bytes --]
Its easier to read if its with the check for debugging flags.
Signed-off-by: Christoph Lameter <cl@linux.com>
---
mm/slub.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c 2011-03-28 14:52:13.000000000 -0500
+++ linux-2.6/mm/slub.c 2011-03-28 14:52:58.000000000 -0500
@@ -2051,10 +2051,9 @@ static void __slab_free(struct kmem_cach
slab_lock(page);
stat(s, FREE_SLOWPATH);
- if (kmem_cache_debug(s))
- goto debug;
+ if (kmem_cache_debug(s) && !free_debug_processing(s, page, x, addr))
+ goto out_unlock;
-checks_ok:
prior = page->freelist;
set_freepointer(s, object, prior);
page->freelist = object;
@@ -2098,12 +2097,6 @@ slab_empty:
#endif
stat(s, FREE_SLAB);
discard_slab(s, page);
- return;
-
-debug:
- if (!free_debug_processing(s, page, x, addr))
- goto out_unlock;
- goto checks_ok;
}
/*
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2011-03-30 20:24 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-30 20:23 [slubll1 00/19] SLUB: Implement mostly lockless slowpaths Christoph Lameter
2011-03-30 20:23 ` [slubll1 01/19] percpu: Fixup __this_cpu_xchg* operations Christoph Lameter
2011-03-30 20:23 ` [slubll1 02/19] slub: get_map() function to establish map of free objects in a slab Christoph Lameter
2011-03-30 20:23 ` [slubll1 03/19] slub: Eliminate repeated use of c->page through a new page variable Christoph Lameter
2011-03-30 20:23 ` [slubll1 04/19] slub: Move node determination out of hotpath Christoph Lameter
2011-03-30 20:23 ` Christoph Lameter [this message]
2011-03-30 20:23 ` [slubll1 06/19] slub: Do not use frozen page flag but a bit in the page counters Christoph Lameter
2011-03-30 20:23 ` [slubll1 07/19] slub: Move page->frozen handling near where the page->freelist handling occurs Christoph Lameter
2011-03-30 20:23 ` [slubll1 08/19] x86: Add support for cmpxchg_double Christoph Lameter
2011-03-30 20:23 ` [slubll1 09/19] mm: Rearrange struct page Christoph Lameter
2011-03-30 20:23 ` [slubll1 10/19] slub: Add cmpxchg_double_slab() Christoph Lameter
2011-03-30 20:23 ` [slubll1 11/19] slub: explicit list_lock taking Christoph Lameter
2011-03-30 20:23 ` [slubll1 12/19] slub: Pass kmem_cache struct to lock and freeze slab Christoph Lameter
2011-03-30 20:23 ` [slubll1 13/19] slub: Rework allocator fastpaths Christoph Lameter
2011-03-30 20:23 ` [slubll1 14/19] slub: Invert locking and avoid slab lock Christoph Lameter
2011-03-30 20:23 ` [slubll1 15/19] slub: Disable interrupts in free_debug processing Christoph Lameter
2011-03-30 20:23 ` [slubll1 16/19] slub: Avoid disabling interrupts in free slowpath Christoph Lameter
2011-03-30 20:23 ` [slubll1 17/19] slub: Get rid of the another_slab label Christoph Lameter
2011-03-30 20:24 ` [slubll1 18/19] slub: fast release on full slab Christoph Lameter
2011-03-30 20:24 ` [slubll1 19/19] slub: Not necessary to check for empty slab on load_freelist 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=20110330202418.145015838@linux.com \
--to=cl@linux.com \
--cc=eric.dumazet@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-mm@kvack.org \
--cc=mathieu.desnoyers@efficios.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.