AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-23 23:40:53 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

kernel/io_uring: cancel io_uring before task works

Browse Source 
[ Upstream commit b1b6b5a30dce872f500dc43f067cba8e7f86fc7d ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Pavel Begunkov 2021-01-26 11:17:00 +00:00 committed by Greg Kroah-Hartman
parent 08a922a6fd
commit 7bf3fb6243
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/file.c
View File

@ -21,7 +21,6 @@
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/close_range.h> #include <linux/close_range.h>
#include <net/sock.h> #include <net/sock.h>
#include <linux/io_uring.h>
unsigned int sysctl_nr_open __read_mostly = 1024*1024; unsigned int sysctl_nr_open __read_mostly = 1024*1024;
unsigned int sysctl_nr_open_min = BITS_PER_LONG; unsigned int sysctl_nr_open_min = BITS_PER_LONG;
@ -453,7 +452,6 @@ void exit_files(struct task_struct *tsk)
struct files_struct * files = tsk->files; struct files_struct * files = tsk->files;
if (files) { if (files) {
io_uring_files_cancel(files);
task_lock(tsk); task_lock(tsk);
tsk->files = NULL; tsk->files = NULL;
task_unlock(tsk); task_unlock(tsk);

2
kernel/exit.c
View File

@ -63,6 +63,7 @@
#include <linux/random.h> #include <linux/random.h>
#include <linux/rcuwait.h> #include <linux/rcuwait.h>
#include <linux/compat.h> #include <linux/compat.h>
#include <linux/io_uring.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/unistd.h> #include <asm/unistd.h>
@ -762,6 +763,7 @@ void __noreturn do_exit(long code)
schedule(); schedule();
} }
io_uring_files_cancel(tsk->files);
exit_signals(tsk); /* sets PF_EXITING */ exit_signals(tsk); /* sets PF_EXITING */
/* sync mm's RSS info before statistics gathering */ /* sync mm's RSS info before statistics gathering */