Skip to content

Commit

Permalink
mm/slab.c: add a helper function get_first_slab
Browse files Browse the repository at this point in the history
Add a new helper function get_first_slab() that get the first slab from
a kmem_cache_node.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Acked-by: Christoph Lameter <cl@linux.com>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Geliang Tang authored and Linus Torvalds committed Jan 15, 2016
1 parent 73c0219 commit 7aa0d22
Showing 1 changed file with 21 additions and 18 deletions.
39 changes: 21 additions & 18 deletions mm/slab.c
Original file line number Diff line number Diff line change
Expand Up @@ -2756,6 +2756,21 @@ static void *cache_free_debugcheck(struct kmem_cache *cachep, void *objp,
#define cache_free_debugcheck(x,objp,z) (objp)
#endif

static struct page *get_first_slab(struct kmem_cache_node *n)
{
struct page *page;

page = list_first_entry_or_null(&n->slabs_partial,
struct page, lru);
if (!page) {
n->free_touched = 1;
page = list_first_entry_or_null(&n->slabs_free,
struct page, lru);
}

return page;
}

static void *cache_alloc_refill(struct kmem_cache *cachep, gfp_t flags,
bool force_refill)
{
Expand Down Expand Up @@ -2793,15 +2808,9 @@ static void *cache_alloc_refill(struct kmem_cache *cachep, gfp_t flags,
while (batchcount > 0) {
struct page *page;
/* Get slab alloc is to come from. */
page = list_first_entry_or_null(&n->slabs_partial,
struct page, lru);
if (!page) {
n->free_touched = 1;
page = list_first_entry_or_null(&n->slabs_free,
struct page, lru);
if (!page)
goto must_grow;
}
page = get_first_slab(n);
if (!page)
goto must_grow;

check_spinlock_acquired(cachep);

Expand Down Expand Up @@ -3097,15 +3106,9 @@ static void *____cache_alloc_node(struct kmem_cache *cachep, gfp_t flags,
retry:
check_irq_off();
spin_lock(&n->list_lock);
page = list_first_entry_or_null(&n->slabs_partial,
struct page, lru);
if (!page) {
n->free_touched = 1;
page = list_first_entry_or_null(&n->slabs_free,
struct page, lru);
if (!page)
goto must_grow;
}
page = get_first_slab(n);
if (!page)
goto must_grow;

check_spinlock_acquired_node(cachep, nodeid);

Expand Down

0 comments on commit 7aa0d22

Please sign in to comment.