From: Greg Kroah-Hartman Date: Tue, 24 Mar 2026 08:53:12 +0000 (+0100) Subject: drop a mptcp test patch from 6.1 X-Git-Tag: v6.1.167~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df0165d996eaf05c6232d552291ae20a95b7d2c1;p=thirdparty%2Fkernel%2Fstable-queue.git drop a mptcp test patch from 6.1 --- diff --git a/queue-6.1/selftests-mptcp-join-check-removing-signal-subflow-endp.patch b/queue-6.1/selftests-mptcp-join-check-removing-signal-subflow-endp.patch deleted file mode 100644 index e6e0c0dc89..0000000000 --- a/queue-6.1/selftests-mptcp-join-check-removing-signal-subflow-endp.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 1777f349ff41b62dfe27454b69c27b0bc99ffca5 Mon Sep 17 00:00:00 2001 -From: "Matthieu Baerts (NGI0)" -Date: Tue, 3 Mar 2026 11:56:06 +0100 -Subject: selftests: mptcp: join: check removing signal+subflow endp - -From: Matthieu Baerts (NGI0) - -commit 1777f349ff41b62dfe27454b69c27b0bc99ffca5 upstream. - -This validates the previous commit: endpoints with both the signal and -subflow flags should always be marked as used even if it was not -possible to create new subflows due to the MPTCP PM limits. - -For this test, an extra endpoint is created with both the signal and the -subflow flags, and limits are set not to create extra subflows. In this -case, an ADD_ADDR is sent, but no subflows are created. Still, the local -endpoint is marked as used, and no warning is fired when removing the -endpoint, after having sent a RM_ADDR. - -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: 85df533a787b ("mptcp: pm: do not ignore 'subflow' if 'signal' flag is also set") -Cc: stable@vger.kernel.org -Reviewed-by: Mat Martineau -Signed-off-by: Matthieu Baerts (NGI0) -Link: https://patch.msgid.link/20260303-net-mptcp-misc-fixes-7-0-rc2-v1-5-4b5462b6f016@kernel.org -Signed-off-by: Jakub Kicinski -Signed-off-by: Greg Kroah-Hartman ---- - tools/testing/selftests/net/mptcp/mptcp_join.sh | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - ---- a/tools/testing/selftests/net/mptcp/mptcp_join.sh -+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh -@@ -2389,6 +2389,19 @@ remove_tests() - chk_rst_nr 0 0 - fi - -+ # signal+subflow with limits, remove -+ if reset "remove signal+subflow with limits"; then -+ pm_nl_set_limits $ns1 0 0 -+ pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,subflow -+ pm_nl_set_limits $ns2 0 0 -+ addr_nr_ns1=-1 speed=slow \ -+ run_tests $ns1 $ns2 10.0.1.1 -+ chk_join_nr 0 0 0 -+ chk_add_nr 1 1 -+ chk_rm_nr 1 0 invert -+ chk_rst_nr 0 0 -+ fi -+ - # addresses remove - if reset "remove addresses"; then - pm_nl_set_limits $ns1 3 3 diff --git a/queue-6.1/selftests-mptcp-join-check-rm_addr-not-sent-over-same-subflow.patch b/queue-6.1/selftests-mptcp-join-check-rm_addr-not-sent-over-same-subflow.patch index bcc3248c17..2e643cc87d 100644 --- a/queue-6.1/selftests-mptcp-join-check-rm_addr-not-sent-over-same-subflow.patch +++ b/queue-6.1/selftests-mptcp-join-check-rm_addr-not-sent-over-same-subflow.patch @@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman init_partial() { capout=$(mktemp) -@@ -3468,6 +3486,14 @@ endpoint_tests() +@@ -3455,6 +3473,14 @@ endpoint_tests() wait_mpj $ns2 chk_subflow_nr "" "after no reject" 3 @@ -86,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman local i for i in $(seq 3); do pm_nl_del_endpoint $ns2 1 10.0.1.2 -@@ -3478,6 +3504,7 @@ endpoint_tests() +@@ -3465,6 +3491,7 @@ endpoint_tests() wait_mpj $ns2 chk_subflow_nr "" "after re-add id 0 ($i)" 3 done @@ -94,7 +94,7 @@ Signed-off-by: Greg Kroah-Hartman kill_wait "${tests_pid}" kill_events_pids -@@ -3527,9 +3554,18 @@ endpoint_tests() +@@ -3514,9 +3541,18 @@ endpoint_tests() wait_mpj $ns2 chk_subflow_nr "" "after re-add" 3 diff --git a/queue-6.1/series b/queue-6.1/series index fe69d65151..4f17c90131 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -92,7 +92,6 @@ smb-client-fix-broken-multichannel-with-krb5-signing.patch smb-client-don-t-log-plaintext-credentials-in-cifs_set_cifscreds.patch scsi-core-fix-refcount-leak-for-tagset_refcnt.patch selftests-mptcp-more-stable-simult_flows-tests.patch -selftests-mptcp-join-check-removing-signal-subflow-endp.patch arm-clean-up-the-memset64-c-wrapper.patch platform-x86-thinkpad_acpi-fix-errors-reading-batter.patch net-ethernet-ti-am65-cpsw-nuss-cpsw-ale-fix-multicas.patch