]> git.itanic.dy.fi Git - linux-stable/commit
rq-qos: fix missed wake-ups in rq_qos_throttle try two
authorJan Kara <jack@suse.cz>
Mon, 7 Jun 2021 11:26:13 +0000 (13:26 +0200)
committerJens Axboe <axboe@kernel.dk>
Tue, 8 Jun 2021 21:12:57 +0000 (15:12 -0600)
commit11c7aa0ddea8611007768d3e6b58d45dc60a19e1
treeee3ebd955e2765aa172b9647f23bea6f1db4a742
parentc9c9762d4d44dcb1b2ba90cfb4122dc11ceebf31
rq-qos: fix missed wake-ups in rq_qos_throttle try two

Commit 545fbd0775ba ("rq-qos: fix missed wake-ups in rq_qos_throttle")
tried to fix a problem that a process could be sleeping in rq_qos_wait()
without anyone to wake it up. However the fix is not complete and the
following can still happen:

CPU1 (waiter1) CPU2 (waiter2) CPU3 (waker)
rq_qos_wait() rq_qos_wait()
  acquire_inflight_cb() -> fails
  acquire_inflight_cb() -> fails

completes IOs, inflight
  decreased
  prepare_to_wait_exclusive()
  prepare_to_wait_exclusive()
  has_sleeper = !wq_has_single_sleeper() -> true as there are two sleepers
  has_sleeper = !wq_has_single_sleeper() -> true
  io_schedule()   io_schedule()

Deadlock as now there's nobody to wakeup the two waiters. The logic
automatically blocking when there are already sleepers is really subtle
and the only way to make it work reliably is that we check whether there
are some waiters in the queue when adding ourselves there. That way, we
are guaranteed that at least the first process to enter the wait queue
will recheck the waiting condition before going to sleep and thus
guarantee forward progress.

Fixes: 545fbd0775ba ("rq-qos: fix missed wake-ups in rq_qos_throttle")
CC: stable@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20210607112613.25344-1-jack@suse.cz
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-rq-qos.c
include/linux/wait.h
kernel/sched/wait.c