Skip to contentSkip to conversation

io_uring/kbuf: advance head when a pickup empties the buffer ring

PATCH Applied Yichong Chen 3 participants 3 messages Oct 23 – Oct 26 io_uring

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 io_uring/kbuf: advance head when a pickup empties the buffer ring

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")
---
 io_uring/kbuf.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
io_uring/kbuf.c +3 -1
index c9641b6ccc8f..abf44f5dba26 100644
@@ -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);
Signature · 1 line
2.51.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 19 lines · Yichong Chen

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")
---
 io_uring/kbuf.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
io_uring/kbuf.c +0 -0
index c9641b6ccc8f..abf44f5dba26 100644

io_uring/kbuf.c static int io_ring_buffers_peek(struct io_kiocb *req, struct buf_sel_arg *arg, · line 334

Quoted 10 lines
io_uring/kbuf.c +3 -1
@@ -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);
Quoted 4 lines
io_uring/kbuf.c +0 -0
 	} while (--nr_iovs);
Signature · 1 line
2.51.0
Signature · 1 line
Gabriel Krisman Bertazi
maintainer Applied
#2 lore raw
In reply to Yichong Chen
Quoted 9 lines · Yichong Chen

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.

[...]

Applied, thanks!

[1/1] io_uring/kbuf: advance head when a pickup empties the buffer ring

      commit: 8742f4b5a472c347fe568a73468a2d9e4d630b33

Best regards,

Signature · 1 line
Jens Axboe