Drop kernel-io_uring-cancel-io_uring-before-task-works.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.10/kernel-io_uring-cancel-io_uring-before-task-works.patch b/queue-5.10/kernel-io_uring-cancel-io_uring-before-task-works.patch
deleted file mode 100644 (file)
index d74d00d..0000000
--- a/queue-5.10/kernel-io_uring-cancel-io_uring-before-task-works.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From b1b6b5a30dce872f500dc43f067cba8e7f86fc7d Mon Sep 17 00:00:00 2001
-From: Pavel Begunkov <asml.silence@gmail.com>
-Date: Wed, 30 Dec 2020 21:34:16 +0000
-Subject: kernel/io_uring: cancel io_uring before task works
-
-From: Pavel Begunkov <asml.silence@gmail.com>
-
-commit b1b6b5a30dce872f500dc43f067cba8e7f86fc7d upstream.
-
-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>
-
----
- fs/file.c     |    2 --
- kernel/exit.c |    2 ++
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- 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;
-@@ -453,7 +452,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);
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -63,6 +63,7 @@
- #include <linux/random.h>
- #include <linux/rcuwait.h>
- #include <linux/compat.h>
-+#include <linux/io_uring.h>
- 
- #include <linux/uaccess.h>
- #include <asm/unistd.h>
-@@ -762,6 +763,7 @@ void __noreturn do_exit(long code)
-               schedule();
-       }
- 
-+      io_uring_files_cancel(tsk->files);
-       exit_signals(tsk);  /* sets PF_EXITING */
- 
-       /* sync mm's RSS info before statistics gathering */

diff --git a/queue-5.10/series b/queue-5.10/series
index 104f3aebf601b9bf9d2af8477116de898f7cd038..ea3dbf59b922cdf400cbd76a3c92038625570ba1 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -18,7 +18,6 @@ io_uring-don-t-assume-mm-is-constant-across-submits.patch
 io_uring-use-bottom-half-safe-lock-for-fixed-file-data.patch
 io_uring-add-a-helper-for-setting-a-ref-node.patch
 io_uring-fix-io_sqe_files_unregister-hangs.patch
-kernel-io_uring-cancel-io_uring-before-task-works.patch
 uapi-move-constants-from-linux-kernel.h-to-linux-const.h.patch
 tools-headers-uapi-sync-linux-const.h-with-the-kernel-headers.patch
 cgroup-fix-memory-leak-when-parsing-multiple-source-parameters.patch