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 (file)
index 7770686..0000000
--- 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 <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 0ed211fdb2828e79f16cdd76d7a57a8e083da728..ad58b056435f9abcf6b5d1a4e3773ac1b4b24581 100644 (file)
--- 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 (file)
index f23acb3..0000000
--- 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 <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
-@@ -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 7ce9baa21d67d4d6cae3a6fbcdedeb2ecca59fc2..53a3005e20c1499bff2383523e0171f947f494af 100644 (file)
--- 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 (file)
index bc390ca..0000000
--- 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 <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
-@@ -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 2a55413a1aae5b9fb9bda4f68043936a2139e49f..e15101b4bd193e92e7763146ec9b3ed4a896a1fb 100644 (file)
--- 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 (file)
index f0d3bdf..0000000
--- 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 <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
-@@ -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 776cc4dda06190bf860c709212e91fef14946c49..c8b6dac3d2c1a1483db0624e7b4a4ad7aaaf8b55 100644 (file)
--- 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 (file)
index 24bdcf3..0000000
--- 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 <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
-@@ -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 0a85449c405155e9ed4fef1545829619faa071d1..ed0d742907adcc795329eff85e746591cad5373b 100644 (file)
--- 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