Commit 110aa25c authored by Jens Axboe's avatar Jens Axboe

io_uring: fix race in unified task_work running

We use a bit to manage if we need to add the shared task_work, but
a list + lock for the pending work. Before aborting a current run
of the task_work we check if the list is empty, but we do so without
grabbing the lock that protects it. This can lead to races where
we think we have nothing left to run, where in practice we could be
racing with a task adding new work to the list. If we do hit that
race condition, we could be left with work items that need processing,
but the shared task_work is not active.

Ensure that we grab the lock before checking if the list is empty,
so we know if it's safe to exit the run or not.

Link: https://lore.kernel.org/io-uring/c6bd5987-e9ae-cd02-49d0-1b3ac1ef65b1@tnonline.net/
Cc: stable@vger.kernel.org # 5.11+
Reported-by: default avatarForza <forza@tnonline.net>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 44eff40a
...@@ -1959,9 +1959,13 @@ static void tctx_task_work(struct callback_head *cb) ...@@ -1959,9 +1959,13 @@ static void tctx_task_work(struct callback_head *cb)
node = next; node = next;
} }
if (wq_list_empty(&tctx->task_list)) { if (wq_list_empty(&tctx->task_list)) {
spin_lock_irq(&tctx->task_lock);
clear_bit(0, &tctx->task_state); clear_bit(0, &tctx->task_state);
if (wq_list_empty(&tctx->task_list)) if (wq_list_empty(&tctx->task_list)) {
spin_unlock_irq(&tctx->task_lock);
break; break;
}
spin_unlock_irq(&tctx->task_lock);
/* another tctx_task_work() is enqueued, yield */ /* another tctx_task_work() is enqueued, yield */
if (test_and_set_bit(0, &tctx->task_state)) if (test_and_set_bit(0, &tctx->task_state))
break; break;
......
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