Skip to content

Commit 51a4598

Browse files
committed
io_uring/net: always use current transfer count for buffer put
A previous fix corrected the retry condition for when to continue a current bundle, but it missed that the current (not the total) transfer count also applies to the buffer put. If not, then for incrementally consumed buffer rings repeated completions on the same request may end up over consuming. Reported-by: Roy Tang (ErgoniaTrading) <[email protected]> Cc: [email protected] Fixes: 3a08988 ("io_uring/net: only retry recv bundle for a full transfer") Link: axboe/liburing#1423 Signed-off-by: Jens Axboe <[email protected]>
1 parent e1c7583 commit 51a4598

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

io_uring/net.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ static inline bool io_recv_finish(struct io_kiocb *req, int *ret,
821821
if (sr->flags & IORING_RECVSEND_BUNDLE) {
822822
size_t this_ret = *ret - sr->done_io;
823823

824-
cflags |= io_put_kbufs(req, *ret, io_bundle_nbufs(kmsg, this_ret),
824+
cflags |= io_put_kbufs(req, this_ret, io_bundle_nbufs(kmsg, this_ret),
825825
issue_flags);
826826
if (sr->retry)
827827
cflags = req->cqe.flags | (cflags & CQE_F_MASK);

0 commit comments

Comments
 (0)