]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.6-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Jun 2025 13:33:26 +0000 (15:33 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Jun 2025 13:33:26 +0000 (15:33 +0200)
added patches:
revert-io_uring-ensure-deferred-completions-are-posted-for-multishot.patch

queue-6.6/revert-io_uring-ensure-deferred-completions-are-posted-for-multishot.patch [new file with mode: 0644]
queue-6.6/series

diff --git a/queue-6.6/revert-io_uring-ensure-deferred-completions-are-posted-for-multishot.patch b/queue-6.6/revert-io_uring-ensure-deferred-completions-are-posted-for-multishot.patch
new file mode 100644 (file)
index 0000000..f747bf6
--- /dev/null
@@ -0,0 +1,39 @@
+From f30af7e9c2d1c316a1efbaa1b84781c7b5068afa Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Tue, 17 Jun 2025 15:32:22 +0200
+Subject: Revert "io_uring: ensure deferred completions are posted for multishot"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 746e7d285dcb96caa1845fbbb62b14bf4010cdfb which is
+commit 687b2bae0efff9b25e071737d6af5004e6e35af5 upstream.
+
+Jens writes:
+       There's some missing dependencies that makes this not work
+       right, I'll bring it back in a series instead.
+
+Link: https://lore.kernel.org/r/906ba919-32e6-4534-bbad-2cd18e1098ca@kernel.dk
+Reported-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ io_uring/io_uring.c |    8 --------
+ 1 file changed, 8 deletions(-)
+
+--- a/io_uring/io_uring.c
++++ b/io_uring/io_uring.c
+@@ -920,14 +920,6 @@ static bool __io_post_aux_cqe(struct io_
+ {
+       bool filled;
+-      /*
+-       * If multishot has already posted deferred completions, ensure that
+-       * those are flushed first before posting this one. If not, CQEs
+-       * could get reordered.
+-       */
+-      if (!wq_list_empty(&ctx->submit_state.compl_reqs))
+-              __io_submit_flush_completions(ctx);
+-
+       io_cq_lock(ctx);
+       filled = io_fill_cqe_aux(ctx, user_data, res, cflags);
+       if (!filled && allow_overflow)
index 245837d936b17fb8dcac378d49d6f189f49a0c55..95f39312973ca54e53f91ddeebd7789cad1ea531 100644 (file)
@@ -340,3 +340,4 @@ hid-usbhid-eliminate-recurrent-out-of-bounds-bug-in-usbhid_parse.patch
 io_uring-add-io_file_can_poll-helper.patch
 io_uring-rw-allow-pollable-non-blocking-attempts-for-fmode_nowait.patch
 io_uring-rw-fix-wrong-nowait-check-in-io_rw_init_file.patch
+revert-io_uring-ensure-deferred-completions-are-posted-for-multishot.patch