From 1808d28566ce9b53e096bc79bf6ddea7dcec4010 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 13 Feb 2024 17:13:50 +0100 Subject: [PATCH] drop 6.6 io_uring patch something is wrong... --- ...t-mshot-retry-path-in-io_recv_finish.patch | 67 ------------------- queue-6.6/series | 3 +- 2 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 queue-6.6/io_uring-net-un-indent-mshot-retry-path-in-io_recv_finish.patch diff --git a/queue-6.6/io_uring-net-un-indent-mshot-retry-path-in-io_recv_finish.patch b/queue-6.6/io_uring-net-un-indent-mshot-retry-path-in-io_recv_finish.patch deleted file mode 100644 index 49e1f148923..00000000000 --- a/queue-6.6/io_uring-net-un-indent-mshot-retry-path-in-io_recv_finish.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 91e5d765a82fb2c9d0b7ad930d8953208081ddf1 Mon Sep 17 00:00:00 2001 -From: Jens Axboe -Date: Mon, 29 Jan 2024 11:54:18 -0700 -Subject: io_uring/net: un-indent mshot retry path in io_recv_finish() - -From: Jens Axboe - -commit 91e5d765a82fb2c9d0b7ad930d8953208081ddf1 upstream. - -In preparation for putting some retry logic in there, have the done -path just skip straight to the end rather than have too much nesting -in here. - -No functional changes in this patch. - -Signed-off-by: Jens Axboe -Signed-off-by: Greg Kroah-Hartman ---- - io_uring/net.c | 36 ++++++++++++++++++++---------------- - 1 file changed, 20 insertions(+), 16 deletions(-) - ---- a/io_uring/net.c -+++ b/io_uring/net.c -@@ -645,23 +645,27 @@ static inline bool io_recv_finish(struct - return true; - } - -- if (!mshot_finished) { -- if (io_fill_cqe_req_aux(req, issue_flags & IO_URING_F_COMPLETE_DEFER, -- *ret, cflags | IORING_CQE_F_MORE)) { -- io_recv_prep_retry(req); -- /* Known not-empty or unknown state, retry */ -- if (cflags & IORING_CQE_F_SOCK_NONEMPTY || -- msg->msg_inq == -1) -- return false; -- if (issue_flags & IO_URING_F_MULTISHOT) -- *ret = IOU_ISSUE_SKIP_COMPLETE; -- else -- *ret = -EAGAIN; -- return true; -- } -- /* Otherwise stop multishot but use the current result. */ -- } -+ if (mshot_finished) -+ goto finish; - -+ /* -+ * Fill CQE for this receive and see if we should keep trying to -+ * receive from this socket. -+ */ -+ if (io_fill_cqe_req_aux(req, issue_flags & IO_URING_F_COMPLETE_DEFER, -+ *ret, cflags | IORING_CQE_F_MORE)) { -+ io_recv_prep_retry(req); -+ /* Known not-empty or unknown state, retry */ -+ if (cflags & IORING_CQE_F_SOCK_NONEMPTY || msg->msg_inq == -1) -+ return false; -+ if (issue_flags & IO_URING_F_MULTISHOT) -+ *ret = IOU_ISSUE_SKIP_COMPLETE; -+ else -+ *ret = -EAGAIN; -+ return true; -+ } -+ /* Otherwise stop multishot but use the current result. */ -+finish: - io_req_set_res(req, *ret, cflags); - - if (issue_flags & IO_URING_F_MULTISHOT) diff --git a/queue-6.6/series b/queue-6.6/series index 57f43361e13..a364fa0282f 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -112,7 +112,6 @@ usb-dwc3-pci-add-support-for-the-intel-arrow-lake-h.patch hrtimer-report-offline-hrtimer-enqueue.patch input-i8042-fix-strange-behavior-of-touchpad-on-clevo-ns70pu.patch input-atkbd-skip-atkbd_cmd_setleds-when-skipping-atkbd_cmd_getid.patch -io_uring-net-fix-sr-len-for-ioring_op_recv-with-msg_waitall-and-buffers.patch -io_uring-net-un-indent-mshot-retry-path-in-io_recv_finish.patch revert-asoc-amd-add-new-dmi-entries-for-acp5x-platform.patch media-solo6x10-replace-max-a-min-b-c-by-clamp-b-a-c.patch +io_uring-net-fix-sr-len-for-ioring_op_recv-with-msg_waitall-and-buffers.patch -- 2.47.3