Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-11 15:40:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SLUB: consolidate trace code

Browse Source 
Trace in both slab_alloc and slab_free has a lot of common code.  Use a single
function for both.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Lameter 2007-05-09 02:32:42 -07:00 committed by Linus Torvalds
parent 35e5d7ee27
commit 636f0d7de8
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mm/slub.c
View File

@ -805,6 +805,22 @@ fail:
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();
}
}
/* /*
* Slab allocation and freeing * Slab allocation and freeing
*/ */
@ -1289,12 +1305,7 @@ debug:
goto another_slab; goto another_slab;
if (s->flags & SLAB_STORE_USER) if (s->flags & SLAB_STORE_USER)
set_track(s, object, TRACK_ALLOC, addr); set_track(s, object, TRACK_ALLOC, addr);
if (s->flags & SLAB_TRACE) { trace(s, page, object, 1);
printk(KERN_INFO "TRACE %s alloc 0x%p inuse=%d fp=0x%p\n",
s->name, object, page->inuse,
page->freelist);
dump_stack();
}
init_object(s, object, 1); init_object(s, object, 1);
goto have_object; goto have_object;
} }
@ -1379,13 +1390,7 @@ debug:
remove_full(s, page); remove_full(s, page);
if (s->flags & SLAB_STORE_USER) if (s->flags & SLAB_STORE_USER)
set_track(s, x, TRACK_FREE, addr); set_track(s, x, TRACK_FREE, addr);
if (s->flags & SLAB_TRACE) { trace(s, page, object, 0);
printk(KERN_INFO "TRACE %s free 0x%p inuse=%d fp=0x%p\n",
s->name, object, page->inuse,
page->freelist);
print_section("Object", (void *)object, s->objsize);
dump_stack();
}
init_object(s, object, 0); init_object(s, object, 0);
goto checks_ok; goto checks_ok;
} }