tcp: a couple of fixes
Subsystems (3)
Paolo Abeni
maintainerv2 cover tcp: a couple of fixes
This series includes a couple of follow-up for the recent tcp receiver changes, addressing issues outlined by the nipa CI and the mptcp self-tests.
Note that despite the affected self-tests where MPTCP ones, the issues are really in the TCP code, see patch 1 for the details.
v1 -> v2:
- rework patch 1/2
v1: https://lore.kernel.org/netdev/[email protected]
Paolo Abeni (2):
tcp: do not set a zero size receive buffer
tcp: do not increment BeyondWindow MIB for old seq
net/ipv4/tcp_input.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
Signature · 1 line
2.50.0
Paolo Abeni
maintainerPATCH v2 1/2 tcp: do not set a zero size receive buffer
The nipa CI is reporting frequent failures in the mptcp_connect self-tests.
In the failing scenarios (TCP -> MPTCP) the involved sockets are actually plain TCP ones, as fallback for passive socket at 2whs time cause the MPTCP listener to actually create a TCP socket.
The transfer is stuck due to the receiver buffer being zero. With the stronger check in place, tcp_clamp_window() can be invoked while the TCP socket has sk_rmem_alloc == 0, and the receive buffer will be zeroed, too.
Check for the critical condition in tcp_prune_queue() and just drop the packet without shrinking the receiver buffer.
---
v1 -> v2:
- do not account for truesize, check for 0 rmem instead
--- net/ipv4/tcp_input.c | 4 ++++ 1 file changed, 4 insertions(+)
net/ipv4/tcp_input.c +4 -0
@@ -5549,6 +5549,10 @@ static int tcp_prune_queue(struct sock *sk, const struct sk_buff *in_skb) {struct tcp_sock *tp =tcp_sk (sk); +/* Do nothing if our queues are empty. */ +if (!atomic_read (&sk->sk_rmem_alloc)) +return -1 ; +NET_INC_STATS (sock_net (sk),LINUX_MIB_PRUNECALLED );if (!tcp_can_ingest (sk, in_skb))
Signature · 1 line
2.50.0
Re: [PATCH v2 net-next 1/2] tcp: do not set a zero size receive buffer
Quoted 13 lines · Paolo Abeni
The nipa CI is reporting frequent failures in the
mptcp_connectself-tests.In the failing scenarios (TCP -> MPTCP) the involved sockets are actually plain TCP ones, as fallback for passive socket at 2whs time cause the MPTCP listener to actually create a TCP socket.
The transfer is stuck due to the receiver buffer being zero. With the stronger check in place,
tcp_clamp_window()can be invoked while the TCP socket hassk_rmem_alloc== 0, and the receive buffer will be zeroed, too.
Quoted 6 lines
Check for the critical condition in
tcp_prune_queue()and just drop the packet without shrinking the receiver buffer.Fixes 1d2fbaad7cd8 ("tcp: stronger sk_rcvbuf checks")Suggested-by Eric Dumazet <[email protected]>Signed-off-by Paolo Abeni <[email protected]>
Thanks a lot !
Paolo Abeni
maintainerPATCH v2 2/2 tcp: do not increment BeyondWindow MIB for old seq
In reply to Paolo AbeniThe mentioned MIB is currently incremented even when a packet with an old sequence number (i.e. a zero window probe) is received, which is IMHO misleading.
Explicitly restrict such MIB increment at the relevant events.
--- net/ipv4/tcp_input.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
net/ipv4/tcp_input.c +5 -1
@@ -5915,7 +5915,11 @@ static bool tcp_validate_incoming(struct sock *sk, struct sk_buff *skb,if (!th->rst) {if (th->syn) goto syn_challenge; -NET_INC_STATS (sock_net (sk),LINUX_MIB_BEYOND_WINDOW ); + +if (reason ==SKB_DROP_REASON_TCP_INVALID_SEQUENCE || + reason ==SKB_DROP_REASON_TCP_INVALID_END_SEQUENCE ) +NET_INC_STATS (sock_net (sk), +LINUX_MIB_BEYOND_WINDOW );if (!tcp_oow_rate_limited (sock_net (sk), skb,LINUX_MIB_TCPACKSKIPPEDSEQ , &tp->last_oow_ack_time))
Signature · 1 line
2.50.0
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Mon, 21 Jul 2025 19:20:20 +0200 you wrote:
This series includes a couple of follow-up for the recent tcp receiver changes, addressing issues outlined by the nipa CI and the mptcp self-tests.
Note that despite the affected self-tests where MPTCP ones, the issues are really in the TCP code, see patch 1 for the details.
[...]
Here is the summary with links:
- [v2,net-next,1/2] tcp: do not set a zero size receive buffer
https://git.kernel.org/netdev/net-next/c/972ca7a3bc9a - [v2,net-next,2/2] tcp: do not increment BeyondWindow MIB for old seq https://git.kernel.org/netdev/net-next/c/b115c7758802
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html