Skip to content

L
linux-davinci
Commit 3ec09742 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files
Options

SLUB: Simplify debug code 

Consolidate functionality into the #ifdef section.

Extract tracing into one subroutine.

Move object debug processing into the #ifdef section so that the
code in __slab_alloc and __slab_free becomes minimal.

Reduce number of functions we need to provide stubs for in the !SLUB_DEBUG case.
Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a35afb83
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 55 deletions
mm/slub.c
View file @ 3ec09742
...@@ -742,6 +742,22 @@ static int on_freelist(struct kmem_cache *s, struct page *page, void *search) ...@@ -742,6 +742,22 @@ static int on_freelist(struct kmem_cache *s, struct page *page, void *search)
return search == NULL; return search == NULL;
} }
static void trace(struct kmem_cache *s, struct page *page, void *object, int alloc)
{
if (s->flags & SLAB_TRACE) {
printk(KERN_INFO "TRACE %s %s 0x%p inuse=%d fp=0x%p\n",
s->name,
alloc ? "alloc" : "free",
object, page->inuse,
page->freelist);
if (!alloc)
print_section("Object", (void *)object, s->objsize);
dump_stack();
}
}
/* /*
* Tracking of fully allocated slabs for debugging purposes. * Tracking of fully allocated slabs for debugging purposes.
*/ */
...@@ -766,8 +782,18 @@ static void remove_full(struct kmem_cache *s, struct page *page) ...@@ -766,8 +782,18 @@ static void remove_full(struct kmem_cache *s, struct page *page)
spin_unlock(&n->list_lock); spin_unlock(&n->list_lock);
} }
static int alloc_object_checks(struct kmem_cache *s, struct page *page, static void setup_object_debug(struct kmem_cache *s, struct page *page,
void *object) void *object)
{
if (!(s->flags & (SLAB_STORE_USER|SLAB_RED_ZONE|__OBJECT_POISON)))
return;
init_object(s, object, 0);
init_tracking(s, object);
}
static int alloc_debug_processing(struct kmem_cache *s, struct page *page,
void *object, void *addr)
{ {
if (!check_slab(s, page)) if (!check_slab(s, page))
goto bad; goto bad;
...@@ -782,13 +808,16 @@ static int alloc_object_checks(struct kmem_cache *s, struct page *page, ...@@ -782,13 +808,16 @@ static int alloc_object_checks(struct kmem_cache *s, struct page *page,
goto bad; goto bad;
} }
if (!object) if (object && !check_object(s, page, object, 0))
return 1;
if (!check_object(s, page, object, 0))
goto bad; goto bad;
/* Success perform special debug activities for allocs */
if (s->flags & SLAB_STORE_USER)
set_track(s, object, TRACK_ALLOC, addr);
trace(s, page, object, 1);
init_object(s, object, 1);
return 1; return 1;
bad: bad:
if (PageSlab(page)) { if (PageSlab(page)) {
/* /*
...@@ -806,8 +835,8 @@ bad: ...@@ -806,8 +835,8 @@ bad:
return 0; return 0;
} }
static int free_object_checks(struct kmem_cache *s, struct page *page, static int free_debug_processing(struct kmem_cache *s, struct page *page,
void *object) void *object, void *addr)
{ {
if (!check_slab(s, page)) if (!check_slab(s, page))
goto fail; goto fail;
...@@ -841,29 +870,22 @@ static int free_object_checks(struct kmem_cache *s, struct page *page, ...@@ -841,29 +870,22 @@ static int free_object_checks(struct kmem_cache *s, struct page *page,
"to slab %s", object, page->slab->name); "to slab %s", object, page->slab->name);
goto fail; goto fail;
} }
/* Special debug activities for freeing objects */
if (!SlabFrozen(page) && !page->freelist)
remove_full(s, page);
if (s->flags & SLAB_STORE_USER)
set_track(s, object, TRACK_FREE, addr);
trace(s, page, object, 0);
init_object(s, object, 0);
return 1; return 1;
fail: fail:
printk(KERN_ERR "@@@ SLUB: %s slab 0x%p object at 0x%p not freed.\n", printk(KERN_ERR "@@@ SLUB: %s slab 0x%p object at 0x%p not freed.\n",
s->name, page, object); s->name, page, object);
return 0; return 0;
} }
static void trace(struct kmem_cache *s, struct page *page, void *object, int alloc)
{
if (s->flags & SLAB_TRACE) {
printk(KERN_INFO "TRACE %s %s 0x%p inuse=%d fp=0x%p\n",
s->name,
alloc ? "alloc" : "free",
object, page->inuse,
page->freelist);
if (!alloc)
print_section("Object", (void *)object, s->objsize);
dump_stack();
}
}
static int __init setup_slub_debug(char *str) static int __init setup_slub_debug(char *str)
{ {
if (!str || *str != '=') if (!str || *str != '=')
...@@ -932,26 +954,20 @@ static void kmem_cache_open_debug_check(struct kmem_cache *s) ...@@ -932,26 +954,20 @@ static void kmem_cache_open_debug_check(struct kmem_cache *s)
s->flags |= slub_debug; s->flags |= slub_debug;
} }
#else #else
static inline void setup_object_debug(struct kmem_cache *s,
struct page *page, void *object) {}
static inline int alloc_object_checks(struct kmem_cache *s, static inline int alloc_debug_processing(struct kmem_cache *s,
struct page *page, void *object) { return 0; } struct page *page, void *object, void *addr) { return 0; }
static inline int free_object_checks(struct kmem_cache *s, static inline int free_debug_processing(struct kmem_cache *s,
struct page *page, void *object) { return 0; } struct page *page, void *object, void *addr) { return 0; }
static inline void add_full(struct kmem_cache_node *n, struct page *page) {}
static inline void remove_full(struct kmem_cache *s, struct page *page) {}
static inline void trace(struct kmem_cache *s, struct page *page,
void *object, int alloc) {}
static inline void init_object(struct kmem_cache *s,
void *object, int active) {}
static inline void init_tracking(struct kmem_cache *s, void *object) {}
static inline int slab_pad_check(struct kmem_cache *s, struct page *page) static inline int slab_pad_check(struct kmem_cache *s, struct page *page)
{ return 1; } { return 1; }
static inline int check_object(struct kmem_cache *s, struct page *page, static inline int check_object(struct kmem_cache *s, struct page *page,
void *object, int active) { return 1; } void *object, int active) { return 1; }
static inline void set_track(struct kmem_cache *s, void *object, static inline void add_full(struct kmem_cache_node *n, struct page *page) {}
enum track_item alloc, void *addr) {}
static inline void kmem_cache_open_debug_check(struct kmem_cache *s) {} static inline void kmem_cache_open_debug_check(struct kmem_cache *s) {}
#define slub_debug 0 #define slub_debug 0
#endif #endif
...@@ -988,11 +1004,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node) ...@@ -988,11 +1004,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
static void setup_object(struct kmem_cache *s, struct page *page, static void setup_object(struct kmem_cache *s, struct page *page,
void *object) void *object)
{ {
if (SlabDebug(page)) { setup_object_debug(s, page, object);
init_object(s, object, 0);
init_tracking(s, object);
}
if (unlikely(s->ctor)) if (unlikely(s->ctor))
s->ctor(object, s, 0); s->ctor(object, s, 0);
} }
...@@ -1449,12 +1461,8 @@ new_slab: ...@@ -1449,12 +1461,8 @@ new_slab:
return NULL; return NULL;
debug: debug:
object = page->freelist; object = page->freelist;
if (!alloc_object_checks(s, page, object)) if (!alloc_debug_processing(s, page, object, addr))
goto another_slab; goto another_slab;
if (s->flags & SLAB_STORE_USER)
set_track(s, object, TRACK_ALLOC, addr);
trace(s, page, object, 1);
init_object(s, object, 1);
page->inuse++; page->inuse++;
page->freelist = object[page->offset]; page->freelist = object[page->offset];
...@@ -1561,14 +1569,8 @@ slab_empty: ...@@ -1561,14 +1569,8 @@ slab_empty:
return; return;
debug: debug:
if (!free_object_checks(s, page, x)) if (!free_debug_processing(s, page, x, addr))
goto out_unlock; goto out_unlock;
if (!SlabFrozen(page) && !page->freelist)
remove_full(s, page);
if (s->flags & SLAB_STORE_USER)
set_track(s, x, TRACK_FREE, addr);
trace(s, page, object, 0);
init_object(s, object, 0);
goto checks_ok; goto checks_ok;
} }
...@@ -1805,7 +1807,7 @@ static struct kmem_cache_node * __init early_kmem_cache_node_alloc(gfp_t gfpflag ...@@ -1805,7 +1807,7 @@ static struct kmem_cache_node * __init early_kmem_cache_node_alloc(gfp_t gfpflag
page->freelist = get_freepointer(kmalloc_caches, n); page->freelist = get_freepointer(kmalloc_caches, n);
page->inuse++; page->inuse++;
kmalloc_caches->node[node] = n; kmalloc_caches->node[node] = n;
init_object(kmalloc_caches, n, 1); setup_object_debug(kmalloc_caches, page, n);
init_kmem_cache_node(n); init_kmem_cache_node(n);
atomic_long_inc(&n->nr_slabs); atomic_long_inc(&n->nr_slabs);
add_partial(n, page); add_partial(n, page);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment