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 (file)
index 0000000..7770686
--- /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 <pabeni@redhat.com>
+Date: Mon, 30 Dec 2024 19:12:32 +0100
+Subject: mptcp: prevent excessive coalescing on receive
+
+From: Paolo Abeni <pabeni@redhat.com>
+
+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 <pabeni@redhat.com>
+Reviewed-by: Mat Martineau <martineau@kernel.org>
+Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
+Link: https://patch.msgid.link/20241230-net-mptcp-rbuf-fixes-v1-3-8608af434ceb@kernel.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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 ad58b056435f9abcf6b5d1a4e3773ac1b4b24581..0ed211fdb2828e79f16cdd76d7a57a8e083da728 100644 (file)
--- 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