]> git.hungrycats.org Git - linux/commitdiff
io_uring/kbuf: advance head when a pickup empties the buffer ring
authorYichong Chen <chenyichong@uniontech.com>
Wed, 4 Nov 2026 18:44:32 +0000 (11:44 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Nov 2026 17:10:52 +0000 (12:10 -0500)
Commit 8742f4b5a472c347fe568a73468a2d9e4d630b33 upstream.

io_ring_buffers_peek() flags the request with REQ_F_BL_EMPTY if the
buffers it picked were the last ones available, comparing head to tail.
When the loop breaks because max_len was exhausted the buffer was picked,
but head is left pointing at it, so the flag isn't set if it was the last
buffer. A bundle receive then retries, finds no buffer, and the request,
which has received data, is marked as failed on account of the -ENOBUFS.
That severs a link, and ends a multishot.

Fixes: 35c8711c8fc4 ("io_uring/kbuf: add helpers for getting/peeking multiple buffers")
Signed-off-by: Yichong Chen <chenyichong@uniontech.com>
Link: https://patch.msgid.link/20261023091711.83481-1-chenyichong@uniontech.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
io_uring/kbuf.c

index c9641b6ccc8ff1228b6f3aaee12957f1a3d3b238..abf44f5dba26a07e04122aa295528aa9d0e65155 100644 (file)
@@ -326,8 +326,10 @@ static int io_ring_buffers_peek(struct io_kiocb *req, struct buf_sel_arg *arg,
 
                arg->out_len += len;
                arg->max_len -= len;
-               if (!arg->max_len)
+               if (!arg->max_len) {
+                       head++;
                        break;
+               }
 
                buf = io_ring_head_to_buf(br, ++head, bl->mask);
        } while (--nr_iovs);