Skip to content

Commit

Permalink
slab: introduce helper functions to get/set free object
Browse files Browse the repository at this point in the history
In the following patches, to get/set free objects from the freelist
is changed so that simple casting doesn't work for it. Therefore,
introduce helper functions.

Acked-by: Christoph Lameter <cl@linux.com>
Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
  • Loading branch information
Joonsoo Kim authored and Pekka Enberg committed Feb 8, 2014
1 parent 9cef2e2 commit e5c58df
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions mm/slab.c
Original file line number Diff line number Diff line change
Expand Up @@ -2548,9 +2548,15 @@ static void *alloc_slabmgmt(struct kmem_cache *cachep,
return freelist;
}

static inline unsigned int *slab_freelist(struct page *page)
static inline unsigned int get_free_obj(struct page *page, unsigned int idx)
{
return (unsigned int *)(page->freelist);
return ((unsigned int *)page->freelist)[idx];
}

static inline void set_free_obj(struct page *page,
unsigned int idx, unsigned int val)
{
((unsigned int *)(page->freelist))[idx] = val;
}

static void cache_init_objs(struct kmem_cache *cachep,
Expand Down Expand Up @@ -2595,7 +2601,7 @@ static void cache_init_objs(struct kmem_cache *cachep,
if (cachep->ctor)
cachep->ctor(objp);
#endif
slab_freelist(page)[i] = i;
set_free_obj(page, i, i);
}
}

Expand All @@ -2614,7 +2620,7 @@ static void *slab_get_obj(struct kmem_cache *cachep, struct page *page,
{
void *objp;

objp = index_to_obj(cachep, page, slab_freelist(page)[page->active]);
objp = index_to_obj(cachep, page, get_free_obj(page, page->active));
page->active++;
#if DEBUG
WARN_ON(page_to_nid(virt_to_page(objp)) != nodeid);
Expand All @@ -2635,15 +2641,15 @@ static void slab_put_obj(struct kmem_cache *cachep, struct page *page,

/* Verify double free bug */
for (i = page->active; i < cachep->num; i++) {
if (slab_freelist(page)[i] == objnr) {
if (get_free_obj(page, i) == objnr) {
printk(KERN_ERR "slab: double free detected in cache "
"'%s', objp %p\n", cachep->name, objp);
BUG();
}
}
#endif
page->active--;
slab_freelist(page)[page->active] = objnr;
set_free_obj(page, page->active, objnr);
}

/*
Expand Down Expand Up @@ -4216,7 +4222,7 @@ static void handle_slab(unsigned long *n, struct kmem_cache *c,

for (j = page->active; j < c->num; j++) {
/* Skip freed item */
if (slab_freelist(page)[j] == i) {
if (get_free_obj(page, j) == i) {
active = false;
break;
}
Expand Down

0 comments on commit e5c58df

Please sign in to comment.