diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2021-03-27 09:59:30 +0000 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-03-28 18:11:53 -0600 |
| commit | 5a978dcfc0f054e4f6983a0a26355a65e34708cb (patch) | |
| tree | b2f148f6469d1319bc5e81abe09e6d358a254cd4 /fs/io_uring.c | |
| parent | 2b8ed1c94182dbbd0163d0eb443a934cbf6b0d85 (diff) | |
| download | lwn-5a978dcfc0f054e4f6983a0a26355a65e34708cb.tar.gz lwn-5a978dcfc0f054e4f6983a0a26355a65e34708cb.zip | |
io_uring: always go for cancellation spin on exec
Always try to do cancellation in __io_uring_task_cancel() at least once,
so it actually goes and cleans its sqpoll tasks (i.e. via
io_sqpoll_cancel_sync()), otherwise sqpoll task may submit new requests
after cancellation and it's racy for many reasons.
Fixes: 521d6a737a31c ("io_uring: cancel sqpoll via task_work")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/0a21bd6d794bb1629bc906dd57a57b2c2985a8ac.1616839147.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 1949b80677e7..a4a944da95a0 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -9002,6 +9002,8 @@ void __io_uring_task_cancel(void) /* make sure overflow events are dropped */ atomic_inc(&tctx->in_idle); + __io_uring_files_cancel(NULL); + do { /* read completions before cancelations */ inflight = tctx_inflight(tctx); |