This is a note to let you know that I've just added the patch titled
sbitmap: Avoid leaving waitqueue in invalid state in __sbq_wake_up()
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sbitmap-avoid-leaving-waitqueue-in-invalid-state-in-.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 660fdc0abb22d8d104a9ced7e4455f40c2eb27d7
Author: Jan Kara <jack@xxxxxxx>
Date: Thu Sep 8 15:09:37 2022 +0200
sbitmap: Avoid leaving waitqueue in invalid state in __sbq_wake_up()
[ Upstream commit 48c033314f372478548203c583529f53080fd078 ]
When __sbq_wake_up() decrements wait_cnt to 0 but races with someone
else waking the waiter on the waitqueue (so the waitqueue becomes
empty), it exits without reseting wait_cnt to wake_batch number. Once
wait_cnt is 0, nobody will ever reset the wait_cnt or wake the new
waiters resulting in possible deadlocks or busyloops. Fix the problem by
making sure we reset wait_cnt even if we didn't wake up anybody in the
end.
Fixes: 040b83fcecfb ("sbitmap: fix possible io hung due to lost wakeup")
Reported-by: Keith Busch <kbusch@xxxxxxxxxx>
Signed-off-by: Jan Kara <jack@xxxxxxx>
Link: https://lore.kernel.org/r/20220908130937.2795-1-jack@xxxxxxx
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/lib/sbitmap.c b/lib/sbitmap.c
index fa30f1645366..fc545994d2eb 100644
--- a/lib/sbitmap.c
+++ b/lib/sbitmap.c
@@ -534,6 +534,7 @@ static bool __sbq_wake_up(struct sbitmap_queue *sbq)
struct sbq_wait_state *ws;
unsigned int wake_batch;
int wait_cnt;
+ bool ret;
ws = sbq_wake_ptr(sbq);
if (!ws)
@@ -544,12 +545,23 @@ static bool __sbq_wake_up(struct sbitmap_queue *sbq)
* For concurrent callers of this, callers should call this function
* again to wakeup a new batch on a different 'ws'.
*/
- if (wait_cnt < 0 || !waitqueue_active(&ws->wait))
+ if (wait_cnt < 0)
return true;
+ /*
+ * If we decremented queue without waiters, retry to avoid lost
+ * wakeups.
+ */
if (wait_cnt > 0)
- return false;
+ return !waitqueue_active(&ws->wait);
+ /*
+ * When wait_cnt == 0, we have to be particularly careful as we are
+ * responsible to reset wait_cnt regardless whether we've actually
+ * woken up anybody. But in case we didn't wakeup anybody, we still
+ * need to retry.
+ */
+ ret = !waitqueue_active(&ws->wait);
wake_batch = READ_ONCE(sbq->wake_batch);
/*
@@ -578,7 +590,7 @@ static bool __sbq_wake_up(struct sbitmap_queue *sbq)
sbq_index_atomic_inc(&sbq->wake_index);
atomic_set(&ws->wait_cnt, wake_batch);
- return false;
+ return ret;
}
void sbitmap_queue_wake_up(struct sbitmap_queue *sbq)
