Skip to content

Commit a8d13db

Browse files
committed
io_uring: ensure finish_wait() is always called in __io_uring_task_cancel()
If we enter with requests pending and performm cancelations, we'll have a different inflight count before and after calling prepare_to_wait(). This causes the loop to restart. If we actually ended up canceling everything, or everything completed in-between, then we'll break out of the loop without calling finish_wait() on the waitqueue. This can trigger a warning on exit_signals(), as we leave the task state in TASK_UNINTERRUPTIBLE. Put a finish_wait() after the loop to catch that case. Cc: [email protected] # 5.9+ Signed-off-by: Jens Axboe <[email protected]>
1 parent f010505 commit a8d13db

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

fs/io_uring.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9101,6 +9101,7 @@ void __io_uring_task_cancel(void)
91019101
finish_wait(&tctx->wait, &wait);
91029102
} while (1);
91039103

9104+
finish_wait(&tctx->wait, &wait);
91049105
atomic_dec(&tctx->in_idle);
91059106

91069107
io_uring_remove_task_files(tctx);

0 commit comments

Comments
 (0)