Skip to content

Commit

Permalink
mm/slab: factor out debugging initialization in cache_init_objs()
Browse files Browse the repository at this point in the history
cache_init_objs() will be changed in following patch and current form
doesn't fit well for that change.  So, before doing it, this patch
separates debugging initialization.  This would cause two loop iteration
when debugging is enabled, but, this overhead seems too light than debug
feature itself so effect may not be visible.  This patch will greatly
simplify changes in cache_init_objs() in following patch.

Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Joonsoo Kim authored and Linus Torvalds committed Mar 15, 2016
1 parent d841023 commit 10b2e9e
Showing 1 changed file with 18 additions and 6 deletions.
24 changes: 18 additions & 6 deletions mm/slab.c
Original file line number Diff line number Diff line change
Expand Up @@ -2460,14 +2460,14 @@ static inline void set_free_obj(struct page *page,
((freelist_idx_t *)(page->freelist))[idx] = val;
}

static void cache_init_objs(struct kmem_cache *cachep,
struct page *page)
static void cache_init_objs_debug(struct kmem_cache *cachep, struct page *page)
{
#if DEBUG
int i;

for (i = 0; i < cachep->num; i++) {
void *objp = index_to_obj(cachep, page, i);
#if DEBUG

if (cachep->flags & SLAB_STORE_USER)
*dbg_userword(cachep, objp) = NULL;

Expand Down Expand Up @@ -2496,10 +2496,22 @@ static void cache_init_objs(struct kmem_cache *cachep,
poison_obj(cachep, objp, POISON_FREE);
slab_kernel_map(cachep, objp, 0, 0);
}
#else
if (cachep->ctor)
cachep->ctor(objp);
}
#endif
}

static void cache_init_objs(struct kmem_cache *cachep,
struct page *page)
{
int i;

cache_init_objs_debug(cachep, page);

for (i = 0; i < cachep->num; i++) {
/* constructor could break poison info */
if (DEBUG == 0 && cachep->ctor)
cachep->ctor(index_to_obj(cachep, page, i));

set_free_obj(page, i, i);
}
}
Expand Down

0 comments on commit 10b2e9e

Please sign in to comment.