Commit 1d5f360d authored by Jens Axboe's avatar Jens Axboe

io_uring: fix race condition in task_work add and clear

We clear the bit marking the ctx task_work as active after having run
the queued work, but we really should be clearing it before. Otherwise
we can hit a tiny race ala:

CPU0					CPU1
io_task_work_add()			tctx_task_work()
					run_work
	add_to_list
	test_and_set_bit
					clear_bit
		already set

and CPU0 will return thinking the task_work is queued, while in reality
it's already being run. If we hit the condition after __tctx_task_work()
found no more work, but before we've cleared the bit, then we'll end up
thinking it's queued and will be run. In reality it is queued, but we
didn't queue the ctx task_work to ensure that it gets run.

Fixes: 7cbf1722 ("io_uring: provide FIFO ordering for task_work")
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent afcc4015
...@@ -1893,10 +1893,10 @@ static void tctx_task_work(struct callback_head *cb) ...@@ -1893,10 +1893,10 @@ static void tctx_task_work(struct callback_head *cb)
{ {
struct io_uring_task *tctx = container_of(cb, struct io_uring_task, task_work); struct io_uring_task *tctx = container_of(cb, struct io_uring_task, task_work);
clear_bit(0, &tctx->task_state);
while (__tctx_task_work(tctx)) while (__tctx_task_work(tctx))
cond_resched(); cond_resched();
clear_bit(0, &tctx->task_state);
} }
static int io_task_work_add(struct task_struct *tsk, struct io_kiocb *req, static int io_task_work_add(struct task_struct *tsk, struct io_kiocb *req,
......
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