From: Eric Dumazet Date: Tue, 13 May 2025 19:39:11 +0000 (+0000) Subject: tcp: adjust rcvbuf in presence of reorders X-Git-Tag: v6.16-rc1~132^2~97^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63ad7dfedfaee60d9ab40f9f2ec4fb488fa9b1ec;p=thirdparty%2Fkernel%2Flinux.git tcp: adjust rcvbuf in presence of reorders This patch takes care of the needed provisioning when incoming packets are stored in the out of order queue. This part was not implemented in the correct way, we need to decouple it from tcp_rcv_space_adjust() logic. Without it, stalls in the pipe could happen. Signed-off-by: Eric Dumazet Link: https://patch.msgid.link/20250513193919.1089692-4-edumazet@google.com Signed-off-by: Jakub Kicinski --- diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 89e886bb0fa11..f799200db2649 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -760,6 +760,9 @@ static void tcp_rcvbuf_grow(struct sock *sk) /* slow start: allow the sender to double its rate. */ rcvwin = tp->rcvq_space.space << 1; + if (!RB_EMPTY_ROOT(&tp->out_of_order_queue)) + rcvwin += TCP_SKB_CB(tp->ooo_last_skb)->end_seq - tp->rcv_nxt; + cap = READ_ONCE(net->ipv4.sysctl_tcp_rmem[2]); rcvbuf = min_t(u32, tcp_space_from_win(sk, rcvwin), cap); @@ -5166,6 +5169,7 @@ end: skb_condense(skb); skb_set_owner_r(skb, sk); } + tcp_rcvbuf_grow(sk); } static int __must_check tcp_queue_rcv(struct sock *sk, struct sk_buff *skb,