From: Paolo Abeni <pabeni@xxxxxxxxxx>
commit 56b824eb49d6258aa0bad09a406ceac3f643cdae upstream.
Currently the skb size after coalescing is only limited by the skb
layout (the skb must not carry frag_list). A single coalesced skb
covering several MSS can potentially fill completely the receive
buffer. In such a case, the snd win will zero until the receive buffer
will be empty again, affecting tput badly.
Fixes: 8268ed4c9d19 ("mptcp: introduce and use mptcp_try_coalesce()")
Cc: stable@xxxxxxxxxxxxxxx # please delay 2 weeks after 6.13-final release
Signed-off-by: Paolo Abeni <pabeni@xxxxxxxxxx>
Reviewed-by: Mat Martineau <martineau@xxxxxxxxxx>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
Link: https://patch.msgid.link/20241230-net-mptcp-rbuf-fixes-v1-3-8608af434ceb@xxxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/mptcp/protocol.c | 1 +
1 file changed, 1 insertion(+)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -133,6 +133,7 @@ static bool mptcp_try_coalesce(struct so
int delta;
if (MPTCP_SKB_CB(from)->offset ||
+ ((to->len + from->len) > (sk->sk_rcvbuf >> 3)) ||
!skb_try_coalesce(to, from, &fragstolen, &delta))
return false;
Patches currently in stable-queue which might be from pabeni@xxxxxxxxxx are
queue-5.15/net-mdiobus-fix-an-of-node-reference-leak.patch
queue-5.15/net-smc-check-sndbuf_space-again-after-nospace-flag-.patch
queue-5.15/mptcp-prevent-excessive-coalescing-on-receive.patch
queue-5.15/phy-core-fix-that-api-devm_phy_put-fails-to-release-the-phy.patch
queue-5.15/net-dsa-improve-shutdown-sequence.patch
queue-5.15/net-ethernet-bgmac-platform-fix-an-of-node-reference.patch
