From: Greg Kroah-Hartman Date: Mon, 6 Jan 2025 14:47:18 +0000 (+0100) Subject: drop mptcp-prevent-excessive-coalescing-on-receive.patch X-Git-Tag: v5.4.289~14 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b33515972dfb9bf4e07ae40404d7990c0d23bff0;p=thirdparty%2Fkernel%2Fstable-queue.git drop 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 deleted file mode 100644 index 777068692b1..00000000000 --- a/queue-5.10/mptcp-prevent-excessive-coalescing-on-receive.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 0ed211fdb28..ad58b056435 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -136,4 +136,3 @@ 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 diff --git a/queue-5.15/mptcp-prevent-excessive-coalescing-on-receive.patch b/queue-5.15/mptcp-prevent-excessive-coalescing-on-receive.patch deleted file mode 100644 index f23acb382ae..00000000000 --- a/queue-5.15/mptcp-prevent-excessive-coalescing-on-receive.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 -@@ -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; - diff --git a/queue-5.15/series b/queue-5.15/series index 7ce9baa21d6..53a3005e20c 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -166,4 +166,3 @@ net-sctp-prevent-autoclose-integer-overflow-in-sctp_association_init.patch drm-adv7511-drop-dsi-single-lane-support.patch dt-bindings-display-adi-adv7533-drop-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 diff --git a/queue-6.1/mptcp-prevent-excessive-coalescing-on-receive.patch b/queue-6.1/mptcp-prevent-excessive-coalescing-on-receive.patch deleted file mode 100644 index bc390ca26bd..00000000000 --- a/queue-6.1/mptcp-prevent-excessive-coalescing-on-receive.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 -@@ -149,6 +149,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-6.1/series b/queue-6.1/series index 2a55413a1aa..e15101b4bd1 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -79,4 +79,3 @@ mm-vmscan-account-for-free-pages-to-prevent-infinite-loop-in-throttle_direct_rec mptcp-fix-tcp-options-overflow.patch mptcp-fix-recvbuffer-adjust-on-sleeping-rcvmsg.patch mptcp-don-t-always-assume-copied-data-in-mptcp_cleanup_rbuf.patch -mptcp-prevent-excessive-coalescing-on-receive.patch diff --git a/queue-6.12/mptcp-prevent-excessive-coalescing-on-receive.patch b/queue-6.12/mptcp-prevent-excessive-coalescing-on-receive.patch deleted file mode 100644 index f0d3bdfd183..00000000000 --- a/queue-6.12/mptcp-prevent-excessive-coalescing-on-receive.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 -@@ -136,6 +136,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-6.12/series b/queue-6.12/series index 776cc4dda06..c8b6dac3d2c 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -154,4 +154,3 @@ mm-hugetlb-independent-pmd-page-table-shared-count.patch mptcp-fix-tcp-options-overflow.patch mptcp-fix-recvbuffer-adjust-on-sleeping-rcvmsg.patch mptcp-don-t-always-assume-copied-data-in-mptcp_cleanup_rbuf.patch -mptcp-prevent-excessive-coalescing-on-receive.patch diff --git a/queue-6.6/mptcp-prevent-excessive-coalescing-on-receive.patch b/queue-6.6/mptcp-prevent-excessive-coalescing-on-receive.patch deleted file mode 100644 index 24bdcf3b5b0..00000000000 --- a/queue-6.6/mptcp-prevent-excessive-coalescing-on-receive.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 -@@ -138,6 +138,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-6.6/series b/queue-6.6/series index 0a85449c405..ed0d742907a 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -218,6 +218,5 @@ mm-vmscan-account-for-free-pages-to-prevent-infinite-loop-in-throttle_direct_rec mptcp-fix-tcp-options-overflow.patch mptcp-fix-recvbuffer-adjust-on-sleeping-rcvmsg.patch mptcp-don-t-always-assume-copied-data-in-mptcp_cleanup_rbuf.patch -mptcp-prevent-excessive-coalescing-on-receive.patch rdma-bnxt_re-fix-max-sges-for-the-work-request.patch scsi-hisi_sas-remove-redundant-checks-for-automatic-debugfs-dump.patch