diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2020-12-30 21:34:16 +0000 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-12-30 19:36:54 -0700 |
| commit | b1b6b5a30dce872f500dc43f067cba8e7f86fc7d (patch) | |
| tree | 0deae7b9298a78c4f63a4fdd9924eb3ee4f5876d /fs/file.c | |
| parent | 1ffc54220c444774b7f09e6d2121e732f8e19b94 (diff) | |
| download | linux-b1b6b5a30dce872f500dc43f067cba8e7f86fc7d.tar.gz | |
kernel/io_uring: cancel io_uring before task works
For cancelling io_uring requests it needs either to be able to run currently enqueued task_works or having it shut down by that moment. Otherwise io_uring_cancel_files() may be waiting for requests that won't ever complete. Go with the first way and do cancellations before setting PF_EXITING and so before putting the task_work infrastructure into a transition state where task_work_run() would better not be called. Cc: stable@vger.kernel.org # 5.5+ Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/file.c')
| -rw-r--r-- | fs/file.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/file.c b/fs/file.c index c0b60961c672..dab120b71e44 100644 --- a/fs/file.c +++ b/fs/file.c @@ -21,7 +21,6 @@ #include <linux/rcupdate.h> #include <linux/close_range.h> #include <net/sock.h> -#include <linux/io_uring.h> unsigned int sysctl_nr_open __read_mostly = 1024*1024; unsigned int sysctl_nr_open_min = BITS_PER_LONG; @@ -428,7 +427,6 @@ void exit_files(struct task_struct *tsk) struct files_struct * files = tsk->files; if (files) { - io_uring_files_cancel(files); task_lock(tsk); tsk->files = NULL; task_unlock(tsk); |