diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2021-01-17 02:29:56 +0000 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-01-16 21:02:49 -0700 |
| commit | 0b5cd6c32b14413bf87e10ee62be3162588dcbe6 (patch) | |
| tree | 02e6b465ed07e8fd9bd5b3c8bb9794f90be39422 /fs/io_uring.c | |
| parent | 4325cb498cb743dacaa3edbec398c5255f476ef6 (diff) | |
io_uring: fix skipping disabling sqo on exec
If there are no requests at the time __io_uring_task_cancel() is called,
tctx_inflight() returns zero and and it terminates not getting a chance
to go through __io_uring_files_cancel() and do
io_disable_sqo_submit(). And we absolutely want them disabled by the
time cancellation ends.
Reported-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Fixes: d9d05217cb69 ("io_uring: stop SQPOLL submit on creator's death")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index d494c4269fc5..383ff6ed3734 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -9085,6 +9085,10 @@ void __io_uring_task_cancel(void) /* make sure overflow events are dropped */ atomic_inc(&tctx->in_idle); + /* trigger io_disable_sqo_submit() */ + if (tctx->sqpoll) + __io_uring_files_cancel(NULL); + do { /* read completions before cancelations */ inflight = tctx_inflight(tctx); |