Commit 6ab23144 authored by Jens Axboe's avatar Jens Axboe

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: default avatarJens Axboe <axboe@kernel.dk>
parent 36282881
...@@ -925,6 +925,8 @@ static inline void io_req_work_grab_env(struct io_kiocb *req, ...@@ -925,6 +925,8 @@ static inline void io_req_work_grab_env(struct io_kiocb *req,
} }
spin_unlock(&current->fs->lock); spin_unlock(&current->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) 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) ...@@ -6474,6 +6476,13 @@ static int io_uring_flush(struct file *file, void *data)
struct io_ring_ctx *ctx = file->private_data; struct io_ring_ctx *ctx = file->private_data;
io_uring_cancel_files(ctx, 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; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment