From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 1 Aug 2023 08:07:03 +0000 (+0200)
Subject: 5.10-stable patches
X-Git-Tag: v5.15.124~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94fd293d34a8ccc1ad88992bd68d854e246b8c85;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	io_uring-treat-eagain-for-req_f_nowait-as-final-for-io-wq.patch
---

diff --git a/queue-5.10/io_uring-treat-eagain-for-req_f_nowait-as-final-for-io-wq.patch b/queue-5.10/io_uring-treat-eagain-for-req_f_nowait-as-final-for-io-wq.patch
new file mode 100644
index 00000000000..edd488879d5
--- /dev/null
+++ b/queue-5.10/io_uring-treat-eagain-for-req_f_nowait-as-final-for-io-wq.patch
@@ -0,0 +1,39 @@
+From a9be202269580ca611c6cebac90eaf1795497800 Mon Sep 17 00:00:00 2001
+From: Jens Axboe <axboe@kernel.dk>
+Date: Thu, 20 Jul 2023 13:16:53 -0600
+Subject: io_uring: treat -EAGAIN for REQ_F_NOWAIT as final for io-wq
+
+From: Jens Axboe <axboe@kernel.dk>
+
+commit a9be202269580ca611c6cebac90eaf1795497800 upstream.
+
+io-wq assumes that an issue is blocking, but it may not be if the
+request type has asked for a non-blocking attempt. If we get
+-EAGAIN for that case, then we need to treat it as a final result
+and not retry or arm poll for it.
+
+Cc: stable@vger.kernel.org # 5.10+
+Link: https://github.com/axboe/liburing/issues/897
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ io_uring/io_uring.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/io_uring/io_uring.c
++++ b/io_uring/io_uring.c
+@@ -6895,6 +6895,14 @@ static void io_wq_submit_work(struct io_
+ 			 */
+ 			if (ret != -EAGAIN || !(req->ctx->flags & IORING_SETUP_IOPOLL))
+ 				break;
++
++			/*
++			 * If REQ_F_NOWAIT is set, then don't wait or retry with
++			 * poll. -EAGAIN is final for that case.
++			 */
++			if (req->flags & REQ_F_NOWAIT)
++				break;
++
+ 			cond_resched();
+ 		} while (1);
+ 	}
diff --git a/queue-5.10/series b/queue-5.10/series
index 58dd625fec5..27b96b0d300 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -108,3 +108,4 @@ acpi-processor-perflib-use-the-no-limit-frequency-qos.patch
 acpi-processor-perflib-avoid-updating-frequency-qos-unnecessarily.patch
 cpufreq-intel_pstate-drop-acpi-_pss-states-table-patching.patch
 selftests-mptcp-depend-on-syn_cookies.patch
+io_uring-treat-eagain-for-req_f_nowait-as-final-for-io-wq.patch