]> git.itanic.dy.fi Git - linux-stable/commit
io_uring: ensure local task_work is run on wait timeout
authorJens Axboe <axboe@kernel.dk>
Thu, 4 Jan 2024 19:21:08 +0000 (12:21 -0700)
committerJens Axboe <axboe@kernel.dk>
Thu, 4 Jan 2024 19:21:08 +0000 (12:21 -0700)
commit6ff1407e24e6fdfa4a16ba9ba551e3d253a26391
tree5a905e6c11599e8b25b5fd25d86f359fc7907f32
parentd293b1a89694fc4918d9a4330a71ba2458f9d581
io_uring: ensure local task_work is run on wait timeout

A previous commit added an earlier break condition here, which is fine if
we're using non-local task_work as it'll be run on return to userspace.
However, if DEFER_TASKRUN is used, then we could be leaving local
task_work that is ready to process in the ctx list until next time that
we enter the kernel to wait for events.

Move the break condition to _after_ we have run task_work.

Cc: stable@vger.kernel.org
Fixes: 846072f16eed ("io_uring: mimimise io_cqring_wait_schedule")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
io_uring/io_uring.c