Skip to content

Commit dfb58b1

Browse files
isilenceaxboe
authored andcommitted
io_uring/net: fix overexcessive retries
Length parameter of io_sg_from_iter() can be smaller than the iterator's size, as it's with TCP, so when we set from->count at the end of the function we truncate the iterator forcing TCP to return preliminary with a short send. It affects zerocopy sends with large payload sizes and leads to retries and possible request failures. Fixes: 3ff1a0d ("io_uring: enable managed frags with register buffers") Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/0bc0d5179c665b4ef5c328377c84c7a1f298467e.1661530037.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 581711c commit dfb58b1

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

io_uring/net.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,7 @@ static int io_sg_from_iter(struct sock *sk, struct sk_buff *skb,
956956
shinfo->nr_frags = frag;
957957
from->bvec += bi.bi_idx;
958958
from->nr_segs -= bi.bi_idx;
959-
from->count = bi.bi_size;
959+
from->count -= copied;
960960
from->iov_offset = bi.bi_bvec_done;
961961

962962
skb->data_len += copied;

0 commit comments

Comments
 (0)