From a5de77b748f404c7e7e30fd0b6e3000f4d22c491 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 10 Jan 2023 16:14:31 +0100 Subject: [PATCH] drop io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch from everywhere --- ...er-if-task_work-creation-is-canceled.patch | 34 ------------------- queue-5.10/series | 1 - ...er-if-task_work-creation-is-canceled.patch | 34 ------------------- queue-5.15/series | 1 - ...er-if-task_work-creation-is-canceled.patch | 34 ------------------- queue-6.0/series | 1 - ...er-if-task_work-creation-is-canceled.patch | 34 ------------------- queue-6.1/series | 1 - 8 files changed, 140 deletions(-) delete mode 100644 queue-5.10/io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch delete mode 100644 queue-5.15/io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch delete mode 100644 queue-6.0/io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch delete mode 100644 queue-6.1/io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch diff --git a/queue-5.10/io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch b/queue-5.10/io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch deleted file mode 100644 index 730e1a6699b..00000000000 --- a/queue-5.10/io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch +++ /dev/null @@ -1,34 +0,0 @@ -From af82425c6a2d2f347c79b63ce74fca6dc6be157f Mon Sep 17 00:00:00 2001 -From: Jens Axboe -Date: Mon, 2 Jan 2023 16:49:46 -0700 -Subject: io_uring/io-wq: free worker if task_work creation is canceled -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Jens Axboe - -commit af82425c6a2d2f347c79b63ce74fca6dc6be157f upstream. - -If we cancel the task_work, the worker will never come into existance. -As this is the last reference to it, ensure that we get it freed -appropriately. - -Cc: stable@vger.kernel.org -Reported-by: 진호 -Signed-off-by: Jens Axboe -Signed-off-by: Greg Kroah-Hartman ---- - io_uring/io-wq.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/io_uring/io-wq.c -+++ b/io_uring/io-wq.c -@@ -1217,6 +1217,7 @@ static void io_wq_cancel_tw_create(struc - - worker = container_of(cb, struct io_worker, create_work); - io_worker_cancel_cb(worker); -+ kfree(worker); - } - } - diff --git a/queue-5.10/series b/queue-5.10/series index 02aa811e18f..808c7bc5d22 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -760,7 +760,6 @@ nvme-fix-multipath-crash-caused-by-flush-request-whe.patch x86-bugs-flush-ibp-in-ib_prctl_set.patch nfsd-fix-handling-of-readdir-in-v4root-vs.-mount-upcall-timeout.patch fbdev-matroxfb-g200ew-increase-max-memory-from-1-mb-to-16-mb.patch -io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch riscv-uaccess-fix-type-of-0-variable-on-error-in-get_user.patch drm-i915-gvt-fix-gvt-debugfs-destroy.patch drm-i915-gvt-fix-vgpu-debugfs-clean-in-remove.patch diff --git a/queue-5.15/io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch b/queue-5.15/io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch deleted file mode 100644 index 730e1a6699b..00000000000 --- a/queue-5.15/io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch +++ /dev/null @@ -1,34 +0,0 @@ -From af82425c6a2d2f347c79b63ce74fca6dc6be157f Mon Sep 17 00:00:00 2001 -From: Jens Axboe -Date: Mon, 2 Jan 2023 16:49:46 -0700 -Subject: io_uring/io-wq: free worker if task_work creation is canceled -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Jens Axboe - -commit af82425c6a2d2f347c79b63ce74fca6dc6be157f upstream. - -If we cancel the task_work, the worker will never come into existance. -As this is the last reference to it, ensure that we get it freed -appropriately. - -Cc: stable@vger.kernel.org -Reported-by: 진호 -Signed-off-by: Jens Axboe -Signed-off-by: Greg Kroah-Hartman ---- - io_uring/io-wq.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/io_uring/io-wq.c -+++ b/io_uring/io-wq.c -@@ -1217,6 +1217,7 @@ static void io_wq_cancel_tw_create(struc - - worker = container_of(cb, struct io_worker, create_work); - io_worker_cancel_cb(worker); -+ kfree(worker); - } - } - diff --git a/queue-5.15/series b/queue-5.15/series index 303aa52cf97..288cf18163b 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -267,7 +267,6 @@ x86-bugs-flush-ibp-in-ib_prctl_set.patch nfsd-fix-handling-of-readdir-in-v4root-vs.-mount-upcall-timeout.patch fbdev-matroxfb-g200ew-increase-max-memory-from-1-mb-to-16-mb.patch block-don-t-allow-splitting-of-a-req_nowait-bio.patch -io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch io_uring-fix-cq-waiting-timeout-handling.patch thermal-int340x-add-missing-attribute-for-data-rate-base.patch riscv-uaccess-fix-type-of-0-variable-on-error-in-get_user.patch diff --git a/queue-6.0/io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch b/queue-6.0/io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch deleted file mode 100644 index f753aff7f4a..00000000000 --- a/queue-6.0/io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch +++ /dev/null @@ -1,34 +0,0 @@ -From af82425c6a2d2f347c79b63ce74fca6dc6be157f Mon Sep 17 00:00:00 2001 -From: Jens Axboe -Date: Mon, 2 Jan 2023 16:49:46 -0700 -Subject: io_uring/io-wq: free worker if task_work creation is canceled -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Jens Axboe - -commit af82425c6a2d2f347c79b63ce74fca6dc6be157f upstream. - -If we cancel the task_work, the worker will never come into existance. -As this is the last reference to it, ensure that we get it freed -appropriately. - -Cc: stable@vger.kernel.org -Reported-by: 진호 -Signed-off-by: Jens Axboe -Signed-off-by: Greg Kroah-Hartman ---- - io_uring/io-wq.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/io_uring/io-wq.c -+++ b/io_uring/io-wq.c -@@ -1230,6 +1230,7 @@ static void io_wq_cancel_tw_create(struc - - worker = container_of(cb, struct io_worker, create_work); - io_worker_cancel_cb(worker); -+ kfree(worker); - } - } - diff --git a/queue-6.0/series b/queue-6.0/series index 081fb0f129e..027a9ccc03d 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -128,7 +128,6 @@ revert-net-dsa-qca8k-cache-lo-and-hi-for-mdio-write.patch net-dsa-qca8k-fix-wrong-length-value-for-mgmt-eth-packet.patch net-dsa-tag_qca-fix-wrong-mgmt_data2-size.patch block-don-t-allow-splitting-of-a-req_nowait-bio.patch -io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch io_uring-fix-cq-waiting-timeout-handling.patch vhost_vdpa-fix-the-crash-in-unmap-a-large-memory.patch thermal-int340x-add-missing-attribute-for-data-rate-base.patch diff --git a/queue-6.1/io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch b/queue-6.1/io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch deleted file mode 100644 index f753aff7f4a..00000000000 --- a/queue-6.1/io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch +++ /dev/null @@ -1,34 +0,0 @@ -From af82425c6a2d2f347c79b63ce74fca6dc6be157f Mon Sep 17 00:00:00 2001 -From: Jens Axboe -Date: Mon, 2 Jan 2023 16:49:46 -0700 -Subject: io_uring/io-wq: free worker if task_work creation is canceled -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Jens Axboe - -commit af82425c6a2d2f347c79b63ce74fca6dc6be157f upstream. - -If we cancel the task_work, the worker will never come into existance. -As this is the last reference to it, ensure that we get it freed -appropriately. - -Cc: stable@vger.kernel.org -Reported-by: 진호 -Signed-off-by: Jens Axboe -Signed-off-by: Greg Kroah-Hartman ---- - io_uring/io-wq.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/io_uring/io-wq.c -+++ b/io_uring/io-wq.c -@@ -1230,6 +1230,7 @@ static void io_wq_cancel_tw_create(struc - - worker = container_of(cb, struct io_worker, create_work); - io_worker_cancel_cb(worker); -+ kfree(worker); - } - } - diff --git a/queue-6.1/series b/queue-6.1/series index a57320f3c94..381edf4c08a 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -141,7 +141,6 @@ revert-net-dsa-qca8k-cache-lo-and-hi-for-mdio-write.patch net-dsa-qca8k-fix-wrong-length-value-for-mgmt-eth-packet.patch net-dsa-tag_qca-fix-wrong-mgmt_data2-size.patch block-don-t-allow-splitting-of-a-req_nowait-bio.patch -io_uring-io-wq-free-worker-if-task_work-creation-is-canceled.patch io_uring-pin-context-while-queueing-deferred-tw.patch io_uring-fix-cq-waiting-timeout-handling.patch tpm-allow-system-suspend-to-continue-when-tpm-suspend-fails.patch -- 2.47.3