diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-02-09 04:23:59 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-02-09 17:55:38 +0100 |
| commit | 6ab231448fdc5e37c15a94a4700fca11e80007f7 (patch) | |
| tree | 941919bce2c64e765fc2f4a27aa6310599e993a4 /fs/io_uring.c | |
| parent | io-wq: add io_wq_cancel_pid() to cancel based on a specific pid (diff) | |
| download | linux-6ab231448fdc5e37c15a94a4700fca11e80007f7.tar.xz linux-6ab231448fdc5e37c15a94a4700fca11e80007f7.zip | |
io_uring: cancel pending async work if task exits
Normally we cancel all work we track, but for untracked work we could
leave the async worker behind until that work completes. This is totally
fine, but does leave resources pending after the task is gone until that
work completes.
Cancel work that this task queued up when it goes away.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 24ebd5714bf9..971d51c50151 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -925,6 +925,8 @@ static inline void io_req_work_grab_env(struct io_kiocb *req, } spin_unlock(¤t->fs->lock); } + if (!req->work.task_pid) + req->work.task_pid = task_pid_vnr(current); } static inline void io_req_work_drop_env(struct io_kiocb *req) @@ -6474,6 +6476,13 @@ static int io_uring_flush(struct file *file, void *data) struct io_ring_ctx *ctx = file->private_data; io_uring_cancel_files(ctx, data); + + /* + * If the task is going away, cancel work it may have pending + */ + if (fatal_signal_pending(current) || (current->flags & PF_EXITING)) + io_wq_cancel_pid(ctx->io_wq, task_pid_vnr(current)); + return 0; } |