Skip to content

Commit 2055e67

Browse files
hygonitehcaster
authored andcommitted
mm/sl[au]b: use own bulk free function when bulk alloc failed
There is no benefit to call generic bulk free function when kmem_cache_alloc_bulk() failed. Use own kmem_cache_free_bulk() instead of generic function. Note that if kmem_cache_alloc_bulk() fails to allocate first object in SLUB, size is zero. So allow passing size == 0 to kmem_cache_free_bulk() like SLAB's. Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
1 parent b77d5b1 commit 2055e67

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

mm/slab.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3553,7 +3553,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
35533553
local_irq_enable();
35543554
cache_alloc_debugcheck_after_bulk(s, flags, i, p, _RET_IP_);
35553555
slab_post_alloc_hook(s, objcg, flags, i, p, false);
3556-
__kmem_cache_free_bulk(s, i, p);
3556+
kmem_cache_free_bulk(s, i, p);
35573557
return 0;
35583558
}
35593559
EXPORT_SYMBOL(kmem_cache_alloc_bulk);

mm/slub.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3647,7 +3647,7 @@ int build_detached_freelist(struct kmem_cache *s, size_t size,
36473647
/* Note that interrupts must be enabled when calling this function. */
36483648
void kmem_cache_free_bulk(struct kmem_cache *s, size_t size, void **p)
36493649
{
3650-
if (WARN_ON(!size))
3650+
if (!size)
36513651
return;
36523652

36533653
do {
@@ -3738,7 +3738,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
37383738
error:
37393739
slub_put_cpu_ptr(s->cpu_slab);
37403740
slab_post_alloc_hook(s, objcg, flags, i, p, false);
3741-
__kmem_cache_free_bulk(s, i, p);
3741+
kmem_cache_free_bulk(s, i, p);
37423742
return 0;
37433743
}
37443744
EXPORT_SYMBOL(kmem_cache_alloc_bulk);

0 commit comments

Comments
 (0)