6.12-stable patches

added patches:
	io_uring-rw-recycle-buffers-manually-for-non-mshot-reads.patch

diff --git a/queue-6.12/io_uring-rw-recycle-buffers-manually-for-non-mshot-reads.patch b/queue-6.12/io_uring-rw-recycle-buffers-manually-for-non-mshot-reads.patch
new file mode 100644 (file)
index 0000000..0639726
--- /dev/null
+++ b/queue-6.12/io_uring-rw-recycle-buffers-manually-for-non-mshot-reads.patch
@@ -0,0 +1,32 @@
+From a2d2bad7485d2af8dc564c8565839b23a3f8205d Mon Sep 17 00:00:00 2001
+From: Jens Axboe <axboe@kernel.dk>
+Date: Wed, 20 Aug 2025 20:03:35 -0600
+Subject: io_uring/rw: recycle buffers manually for non-mshot reads
+
+From: Jens Axboe <axboe@kernel.dk>
+
+Commit d8e1dec2f860ee40623609aa6c4f22e1ee45605d upstream.
+
+The mshot side of reads already does this, but the regular read path
+does not. This leads to needing recycling checks sprinkled in various
+spots in the "go async" path, like arming poll. In preparation for
+getting rid of those, ensure that read recycles appropriately.
+
+Link: https://lore.kernel.org/r/20250821020750.598432-8-axboe@kernel.dk
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ io_uring/rw.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/io_uring/rw.c
++++ b/io_uring/rw.c
+@@ -953,6 +953,8 @@ int io_read(struct io_kiocb *req, unsign
+       if (ret >= 0)
+               return kiocb_done(req, ret, issue_flags);
+ 
++      if (req->flags & REQ_F_BUFFERS_COMMIT)
++              io_kbuf_recycle(req, issue_flags);
+       return ret;
+ }
+ 

diff --git a/queue-6.12/series b/queue-6.12/series
index 059800fe60f86d5017192f4734a0beaa56cbbe2e..14ca5677363afc87ec89ac7f3659e085f4a3e787 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -1 +1,2 @@
 net-tunnel-make-skb_vlan_inet_prepare-return-drop-reasons.patch
+io_uring-rw-recycle-buffers-manually-for-non-mshot-reads.patch