From 6452e4f52baddd9a747a10518243659b70a71b17 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 11 Aug 2024 17:20:34 -0400 Subject: [PATCH] Drop selftests-mptcp-join-test-both-signal-subflow.patch Signed-off-by: Sasha Levin --- ...-mptcp-join-test-both-signal-subflow.patch | 69 ------------------- queue-6.1/series | 1 - ...-mptcp-join-test-both-signal-subflow.patch | 69 ------------------- queue-6.10/series | 1 - ...-mptcp-join-test-both-signal-subflow.patch | 69 ------------------- queue-6.6/series | 1 - 6 files changed, 210 deletions(-) delete mode 100644 queue-6.1/selftests-mptcp-join-test-both-signal-subflow.patch delete mode 100644 queue-6.10/selftests-mptcp-join-test-both-signal-subflow.patch delete mode 100644 queue-6.6/selftests-mptcp-join-test-both-signal-subflow.patch diff --git a/queue-6.1/selftests-mptcp-join-test-both-signal-subflow.patch b/queue-6.1/selftests-mptcp-join-test-both-signal-subflow.patch deleted file mode 100644 index c07245ecaaa..00000000000 --- a/queue-6.1/selftests-mptcp-join-test-both-signal-subflow.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 9980bc5799109587e228f3cc659f68d5ca1b2d5b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jul 2024 13:05:59 +0200 -Subject: selftests: mptcp: join: test both signal & subflow - -From: Matthieu Baerts (NGI0) - -[ Upstream commit 4d2868b5d191c74262f7407972d68d1bf3245d6a ] - -It should be quite uncommon to set both the subflow and the signal -flags: the initiator of the connection is typically the one creating new -subflows, not the other peer, then no need to announce additional local -addresses, and use it to create subflows. - -But some people might be confused about the flags, and set both "just to -be sure at least the right one is set". To verify the previous fix, and -avoid future regressions, this specific case is now validated: the -client announces a new address, and initiates a new subflow from the -same address. - -While working on this, another bug has been noticed, where the client -reset the new subflow because an ADD_ADDR echo got received as the 3rd -ACK: this new test also explicitly checks that no RST have been sent by -the client and server. - -The 'Fixes' tag here below is the same as the one from the previous -commit: this patch here is not fixing anything wrong in the selftests, -but it validates the previous fix for an issue introduced by this commit -ID. - -Fixes: 86e39e04482b ("mptcp: keep track of local endpoint still available for each msk") -Reviewed-by: Mat Martineau -Signed-off-by: Matthieu Baerts (NGI0) -Link: https://patch.msgid.link/20240731-upstream-net-20240731-mptcp-endp-subflow-signal-v1-7-c8a9b036493b@kernel.org -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - tools/testing/selftests/net/mptcp/mptcp_join.sh | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh -index 51f68bb6bdb8a..feadee086128a 100755 ---- a/tools/testing/selftests/net/mptcp/mptcp_join.sh -+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh -@@ -2064,6 +2064,21 @@ signal_address_tests() - chk_add_nr 1 1 - fi - -+ # uncommon: subflow and signal flags on the same endpoint -+ # or because the user wrongly picked both, but still expects the client -+ # to create additional subflows -+ if reset "subflow and signal together"; then -+ pm_nl_set_limits $ns1 0 2 -+ pm_nl_set_limits $ns2 0 2 -+ pm_nl_add_endpoint $ns2 10.0.3.2 flags signal,subflow -+ run_tests $ns1 $ns2 10.0.1.1 -+ chk_join_nr 1 1 1 -+ chk_add_nr 1 1 0 invert # only initiated by ns2 -+ chk_add_nr 0 0 0 # none initiated by ns1 -+ chk_rst_nr 0 0 invert # no RST sent by the client -+ chk_rst_nr 0 0 # no RST sent by the server -+ fi -+ - # accept and use add_addr with additional subflows - if reset "multiple subflows and signal"; then - pm_nl_set_limits $ns1 0 3 --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 6b736db83c5..c7828696397 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -4,7 +4,6 @@ platform-x86-intel-ifs-initialize-union-ifs_status-t.patch jump_label-fix-the-fix-brown-paper-bags-galore.patch x86-mm-fix-pti_clone_pgtable-alignment-assumption.patch x86-mm-fix-pti_clone_entry_text-for-i386.patch -selftests-mptcp-join-test-both-signal-subflow.patch sctp-fix-null-ptr-deref-in-reuseport_add_sock.patch net-usb-qmi_wwan-fix-memory-leak-for-not-ip-packets.patch net-bridge-mcast-wait-for-previous-gc-cycles-when-re.patch diff --git a/queue-6.10/selftests-mptcp-join-test-both-signal-subflow.patch b/queue-6.10/selftests-mptcp-join-test-both-signal-subflow.patch deleted file mode 100644 index 7c32aa07e20..00000000000 --- a/queue-6.10/selftests-mptcp-join-test-both-signal-subflow.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 3cc461a175266db86d3e3918e915988108c8953c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jul 2024 13:05:59 +0200 -Subject: selftests: mptcp: join: test both signal & subflow - -From: Matthieu Baerts (NGI0) - -[ Upstream commit 4d2868b5d191c74262f7407972d68d1bf3245d6a ] - -It should be quite uncommon to set both the subflow and the signal -flags: the initiator of the connection is typically the one creating new -subflows, not the other peer, then no need to announce additional local -addresses, and use it to create subflows. - -But some people might be confused about the flags, and set both "just to -be sure at least the right one is set". To verify the previous fix, and -avoid future regressions, this specific case is now validated: the -client announces a new address, and initiates a new subflow from the -same address. - -While working on this, another bug has been noticed, where the client -reset the new subflow because an ADD_ADDR echo got received as the 3rd -ACK: this new test also explicitly checks that no RST have been sent by -the client and server. - -The 'Fixes' tag here below is the same as the one from the previous -commit: this patch here is not fixing anything wrong in the selftests, -but it validates the previous fix for an issue introduced by this commit -ID. - -Fixes: 86e39e04482b ("mptcp: keep track of local endpoint still available for each msk") -Reviewed-by: Mat Martineau -Signed-off-by: Matthieu Baerts (NGI0) -Link: https://patch.msgid.link/20240731-upstream-net-20240731-mptcp-endp-subflow-signal-v1-7-c8a9b036493b@kernel.org -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - tools/testing/selftests/net/mptcp/mptcp_join.sh | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh -index 8ab350059ce10..a3293043c85dd 100755 ---- a/tools/testing/selftests/net/mptcp/mptcp_join.sh -+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh -@@ -1989,6 +1989,21 @@ signal_address_tests() - chk_add_nr 1 1 - fi - -+ # uncommon: subflow and signal flags on the same endpoint -+ # or because the user wrongly picked both, but still expects the client -+ # to create additional subflows -+ if reset "subflow and signal together"; then -+ pm_nl_set_limits $ns1 0 2 -+ pm_nl_set_limits $ns2 0 2 -+ pm_nl_add_endpoint $ns2 10.0.3.2 flags signal,subflow -+ run_tests $ns1 $ns2 10.0.1.1 -+ chk_join_nr 1 1 1 -+ chk_add_nr 1 1 0 invert # only initiated by ns2 -+ chk_add_nr 0 0 0 # none initiated by ns1 -+ chk_rst_nr 0 0 invert # no RST sent by the client -+ chk_rst_nr 0 0 # no RST sent by the server -+ fi -+ - # accept and use add_addr with additional subflows - if reset "multiple subflows and signal"; then - pm_nl_set_limits $ns1 0 3 --- -2.43.0 - diff --git a/queue-6.10/series b/queue-6.10/series index 3254b4d2619..158a85c039d 100644 --- a/queue-6.10/series +++ b/queue-6.10/series @@ -16,7 +16,6 @@ x86-mm-fix-pti_clone_pgtable-alignment-assumption.patch x86-mm-fix-pti_clone_entry_text-for-i386.patch smb-client-handle-lack-of-fsctl_get_reparse_point-su.patch power-supply-rt5033-bring-back-i2c_set_clientdata.patch -selftests-mptcp-join-test-both-signal-subflow.patch sctp-fix-null-ptr-deref-in-reuseport_add_sock.patch net-pse-pd-tps23881-fix-the-device-id-check.patch gve-fix-use-of-netif_carrier_ok.patch diff --git a/queue-6.6/selftests-mptcp-join-test-both-signal-subflow.patch b/queue-6.6/selftests-mptcp-join-test-both-signal-subflow.patch deleted file mode 100644 index c3b1c38a6c0..00000000000 --- a/queue-6.6/selftests-mptcp-join-test-both-signal-subflow.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 7d7e260cc83ab2a75c2db111546f61cb4ed7af60 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jul 2024 13:05:59 +0200 -Subject: selftests: mptcp: join: test both signal & subflow - -From: Matthieu Baerts (NGI0) - -[ Upstream commit 4d2868b5d191c74262f7407972d68d1bf3245d6a ] - -It should be quite uncommon to set both the subflow and the signal -flags: the initiator of the connection is typically the one creating new -subflows, not the other peer, then no need to announce additional local -addresses, and use it to create subflows. - -But some people might be confused about the flags, and set both "just to -be sure at least the right one is set". To verify the previous fix, and -avoid future regressions, this specific case is now validated: the -client announces a new address, and initiates a new subflow from the -same address. - -While working on this, another bug has been noticed, where the client -reset the new subflow because an ADD_ADDR echo got received as the 3rd -ACK: this new test also explicitly checks that no RST have been sent by -the client and server. - -The 'Fixes' tag here below is the same as the one from the previous -commit: this patch here is not fixing anything wrong in the selftests, -but it validates the previous fix for an issue introduced by this commit -ID. - -Fixes: 86e39e04482b ("mptcp: keep track of local endpoint still available for each msk") -Reviewed-by: Mat Martineau -Signed-off-by: Matthieu Baerts (NGI0) -Link: https://patch.msgid.link/20240731-upstream-net-20240731-mptcp-endp-subflow-signal-v1-7-c8a9b036493b@kernel.org -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - tools/testing/selftests/net/mptcp/mptcp_join.sh | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh -index f928db7b999ee..5879c63af0249 100755 ---- a/tools/testing/selftests/net/mptcp/mptcp_join.sh -+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh -@@ -2133,6 +2133,21 @@ signal_address_tests() - chk_add_nr 1 1 - fi - -+ # uncommon: subflow and signal flags on the same endpoint -+ # or because the user wrongly picked both, but still expects the client -+ # to create additional subflows -+ if reset "subflow and signal together"; then -+ pm_nl_set_limits $ns1 0 2 -+ pm_nl_set_limits $ns2 0 2 -+ pm_nl_add_endpoint $ns2 10.0.3.2 flags signal,subflow -+ run_tests $ns1 $ns2 10.0.1.1 -+ chk_join_nr 1 1 1 -+ chk_add_nr 1 1 0 invert # only initiated by ns2 -+ chk_add_nr 0 0 0 # none initiated by ns1 -+ chk_rst_nr 0 0 invert # no RST sent by the client -+ chk_rst_nr 0 0 # no RST sent by the server -+ fi -+ - # accept and use add_addr with additional subflows - if reset "multiple subflows and signal"; then - pm_nl_set_limits $ns1 0 3 --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 297cbfe36f0..151f3edcc30 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -9,7 +9,6 @@ smb-client-handle-lack-of-fsctl_get_reparse_point-su.patch wifi-ath12k-rename-the-sc-naming-convention-to-ab.patch wifi-ath12k-add-ce-and-ext-irq-flag-to-indicate-irq_.patch wifi-ath12k-fix-soft-lockup-on-suspend.patch -selftests-mptcp-join-test-both-signal-subflow.patch sctp-fix-null-ptr-deref-in-reuseport_add_sock.patch net-usb-qmi_wwan-fix-memory-leak-for-not-ip-packets.patch net-bridge-mcast-wait-for-previous-gc-cycles-when-re.patch -- 2.47.3