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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jan 2024 23:35:45 +0000 (15:35 -0800)
commit0241f4c2caad6f5ec50dc935eac7bdf7f4ee84d0
tree05b937c998395c11a63d460854590c52b90d7950
parentc239b77ea4d6771e65476e31231b87d0b22fde0c
io_uring: ensure local task_work is run on wait timeout

commit 6ff1407e24e6fdfa4a16ba9ba551e3d253a26391 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
io_uring/io_uring.c