From fda5e93b2d88cc9d9da0728b43679e84af37b26a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 1 Aug 2023 10:07:14 +0200 Subject: [PATCH] 5.15-stable patches added patches: io_uring-treat-eagain-for-req_f_nowait-as-final-for-io-wq.patch --- ...-for-req_f_nowait-as-final-for-io-wq.patch | 39 +++++++++++++++++++ queue-5.15/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-5.15/io_uring-treat-eagain-for-req_f_nowait-as-final-for-io-wq.patch diff --git a/queue-5.15/io_uring-treat-eagain-for-req_f_nowait-as-final-for-io-wq.patch b/queue-5.15/io_uring-treat-eagain-for-req_f_nowait-as-final-for-io-wq.patch new file mode 100644 index 00000000000..d6b29dcf0c8 --- /dev/null +++ b/queue-5.15/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 +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 + +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 +Signed-off-by: Greg Kroah-Hartman +--- + io_uring/io_uring.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/io_uring/io_uring.c ++++ b/io_uring/io_uring.c +@@ -7066,6 +7066,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.15/series b/queue-5.15/series index 02d98952114..958e7cbe17a 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -150,3 +150,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-sockopt-use-iptables-legacy-if-available.patch +io_uring-treat-eagain-for-req_f_nowait-as-final-for-io-wq.patch -- 2.47.3