6.12-stable inclusion request

6.12-stable inclusion request

[Jens Axboe]

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

Hi,

See:

https://github.com/axboe/liburing/issues/1530

for the reasonings here, but please add this patch to the 6.12-stable
queue. Thanks!

-- 
Jens Axboe


[-- Attachment #2: 0001-io_uring-rw-recycle-buffers-manually-for-non-mshot-r.patch --]
[-- Type: text/x-patch, Size: 1101 bytes --]

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: [PATCH] io_uring/rw: recycle buffers manually for non-mshot reads

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>
---
 io_uring/rw.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/io_uring/rw.c b/io_uring/rw.c
index 996cd4bec482..1a38b3578367 100644
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -953,6 +953,8 @@ int io_read(struct io_kiocb *req, unsigned int issue_flags)
 	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;
 }
 
-- 
2.51.0

Re: 6.12-stable inclusion request

[Greg Kroah-Hartman]

On Tue, Feb 10, 2026 at 02:58:45PM -0700, Jens Axboe wrote:
> Hi,
> 
> See:
> 
> https://github.com/axboe/liburing/issues/1530
> 
> for the reasonings here, but please add this patch to the 6.12-stable
> queue. Thanks!

Now applied, thanks.

greg k-h