Skip to content

Commit

Permalink
slub: avoid irqoff/on in bulk allocation
Browse files Browse the repository at this point in the history
Use the new function that can do allocation while interrupts are disabled.
Avoids irq on/off sequences.

Signed-off-by: Christoph Lameter <cl@linux.com>
Cc: Jesper Dangaard Brouer <brouer@redhat.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Christoph Lameter authored and Linus Torvalds committed Nov 21, 2015
1 parent a380a3c commit 8709837
Showing 1 changed file with 11 additions and 13 deletions.
24 changes: 11 additions & 13 deletions mm/slub.c
Original file line number Diff line number Diff line change
Expand Up @@ -2818,30 +2818,23 @@ bool kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
void *object = c->freelist;

if (unlikely(!object)) {
local_irq_enable();
/*
* Invoking slow path likely have side-effect
* of re-populating per CPU c->freelist
*/
p[i] = __slab_alloc(s, flags, NUMA_NO_NODE,
p[i] = ___slab_alloc(s, flags, NUMA_NO_NODE,
_RET_IP_, c);
if (unlikely(!p[i])) {
__kmem_cache_free_bulk(s, i, p);
return false;
}
local_irq_disable();
if (unlikely(!p[i]))
goto error;

c = this_cpu_ptr(s->cpu_slab);
continue; /* goto for-loop */
}

/* kmem_cache debug support */
s = slab_pre_alloc_hook(s, flags);
if (unlikely(!s)) {
__kmem_cache_free_bulk(s, i, p);
c->tid = next_tid(c->tid);
local_irq_enable();
return false;
}
if (unlikely(!s))
goto error;

c->freelist = get_freepointer(s, object);
p[i] = object;
Expand All @@ -2861,6 +2854,11 @@ bool kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
}

return true;

error:
__kmem_cache_free_bulk(s, i, p);
local_irq_enable();
return false;
}
EXPORT_SYMBOL(kmem_cache_alloc_bulk);

Expand Down

0 comments on commit 8709837

Please sign in to comment.