From: Greg Kroah-Hartman Date: Mon, 6 Jan 2025 12:29:20 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v5.4.289~21 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=629bd0d1354c0eb93836c4f3090a35ace487e2ad;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: mptcp-prevent-excessive-coalescing-on-receive.patch --- diff --git a/queue-5.10/mptcp-prevent-excessive-coalescing-on-receive.patch b/queue-5.10/mptcp-prevent-excessive-coalescing-on-receive.patch new file mode 100644 index 00000000000..777068692b1 --- /dev/null +++ b/queue-5.10/mptcp-prevent-excessive-coalescing-on-receive.patch @@ -0,0 +1,37 @@ +From 56b824eb49d6258aa0bad09a406ceac3f643cdae Mon Sep 17 00:00:00 2001 +From: Paolo Abeni +Date: Mon, 30 Dec 2024 19:12:32 +0100 +Subject: mptcp: prevent excessive coalescing on receive + +From: Paolo Abeni + +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@vger.kernel.org # please delay 2 weeks after 6.13-final release +Signed-off-by: Paolo Abeni +Reviewed-by: Mat Martineau +Signed-off-by: Matthieu Baerts (NGI0) +Link: https://patch.msgid.link/20241230-net-mptcp-rbuf-fixes-v1-3-8608af434ceb@kernel.org +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/mptcp/protocol.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/net/mptcp/protocol.c ++++ b/net/mptcp/protocol.c +@@ -125,6 +125,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; + diff --git a/queue-5.10/series b/queue-5.10/series index ad58b056435..0ed211fdb28 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -136,3 +136,4 @@ sky2-add-device-id-11ab-4373-for-marvell-88e8075.patch net-sctp-prevent-autoclose-integer-overflow-in-sctp_association_init.patch drm-adv7511-drop-dsi-single-lane-support.patch mm-vmscan-account-for-free-pages-to-prevent-infinite-loop-in-throttle_direct_reclaim.patch +mptcp-prevent-excessive-coalescing-on-receive.patch