6.1-stable patches

added patches:
	revert-io_uring-ensure-deferred-completions-are-posted-for-multishot.patch

diff --git a/queue-6.1/revert-io_uring-ensure-deferred-completions-are-posted-for-multishot.patch b/queue-6.1/revert-io_uring-ensure-deferred-completions-are-posted-for-multishot.patch
new file mode 100644 (file)
index 0000000..197be71
--- /dev/null
+++ b/queue-6.1/revert-io_uring-ensure-deferred-completions-are-posted-for-multishot.patch
@@ -0,0 +1,39 @@
+From 45f854c23f2fb9a55ff1ce236ab3ae0b9788cd97 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Tue, 17 Jun 2025 15:42:12 +0200
+Subject: Revert "io_uring: ensure deferred completions are posted for multishot"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit b82c386898f7b00cb49abe3fbd622017aaa61230 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/313f2335-626f-4eea-8502-d5c3773db35a@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
+@@ -820,14 +820,6 @@ bool io_post_aux_cqe(struct io_ring_ctx
+ {
+       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, allow_overflow);
+       io_cq_unlock_post(ctx);

diff --git a/queue-6.1/series b/queue-6.1/series
index b9ddcabf186c80dcb298e6595f9aac47917b67a2..35130b9e9d5c45c39f8861269bbab60a8adb4719 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -276,3 +276,4 @@ bio-fix-bio_first_folio-for-sparsemem-without-vmemma.patch
 tools-resolve_btfids-fix-build-when-cross-compiling-kernel-with-clang.patch
 alsa-usb-audio-add-implicit-feedback-quirk-for-rode-ai-1.patch
 hid-usbhid-eliminate-recurrent-out-of-bounds-bug-in-usbhid_parse.patch
+revert-io_uring-ensure-deferred-completions-are-posted-for-multishot.patch