Commit 4bb6e96a authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Linus Torvalds
Browse files

lib/percpu_ida.c: don't do alloc from per-CPU list if there is none

In commit 804209d8 ("lib/percpu_ida.c: use _irqsave() instead of
local_irq_save() + spin_lock") I inlined alloc_local_tag() and mixed up
the >= check from percpu_ida_alloc() with the one in alloc_local_tag().

Don't alloc from per-CPU freelist if ->nr_free is zero.

Fixes: 804209d8

 ("lib/percpu_ida.c: use _irqsave() instead of local_irq_save() + spin_lock")
Signed-off-by: default avatarSebastian Andrzej Siewior <>
Reported-by: default avatarDavid Disseldorp <>
Tested-by: default avatarDavid Disseldorp <>
Cc: Thomas Gleixner <>
Cc: Nicholas Bellinger <>
Cc: Shaohua Li <>
Cc: Kent Overstreet <>
Cc: Matthew Wilcox <>
Cc: Jens Axboe <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent f5749432
......@@ -141,7 +141,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
spin_lock_irqsave(&tags->lock, flags);
/* Fastpath */
if (likely(tags->nr_free >= 0)) {
if (likely(tags->nr_free)) {
tag = tags->freelist[--tags->nr_free];
spin_unlock_irqrestore(&tags->lock, flags);
return tag;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment