From: Greg Kroah-Hartman Date: Tue, 17 Jun 2025 13:33:26 +0000 (+0200) Subject: 6.6-stable patches X-Git-Tag: v6.6.94~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d8eaeaca3ef4ee904b4bbad07b4b4a2477b8569f;p=thirdparty%2Fkernel%2Fstable-queue.git 6.6-stable patches added patches: revert-io_uring-ensure-deferred-completions-are-posted-for-multishot.patch --- 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 index 0000000000..f747bf6753 --- /dev/null +++ b/queue-6.6/revert-io_uring-ensure-deferred-completions-are-posted-for-multishot.patch @@ -0,0 +1,39 @@ +From f30af7e9c2d1c316a1efbaa1b84781c7b5068afa Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Tue, 17 Jun 2025 15:32:22 +0200 +Subject: Revert "io_uring: ensure deferred completions are posted for multishot" + +From: Greg Kroah-Hartman + +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 +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Greg Kroah-Hartman +--- + 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) diff --git a/queue-6.6/series b/queue-6.6/series index 245837d936..95f3931297 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -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