6.10-stable patches

added patches:
	selftests-mptcp-join-test-for-flush-re-add-endpoints.patch

diff --git a/queue-6.10/selftests-mptcp-join-test-for-flush-re-add-endpoints.patch b/queue-6.10/selftests-mptcp-join-test-for-flush-re-add-endpoints.patch
new file mode 100644 (file)
index 0000000..391e960
--- /dev/null
+++ b/queue-6.10/selftests-mptcp-join-test-for-flush-re-add-endpoints.patch
@@ -0,0 +1,71 @@
+From e06959e9eebdfea4654390f53b65cff57691872e Mon Sep 17 00:00:00 2001
+From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
+Date: Mon, 19 Aug 2024 21:45:24 +0200
+Subject: selftests: mptcp: join: test for flush/re-add endpoints
+
+From: Matthieu Baerts (NGI0) <matttbe@kernel.org>
+
+commit e06959e9eebdfea4654390f53b65cff57691872e upstream.
+
+After having flushed endpoints that didn't cause the creation of new
+subflows, it is important to check endpoints can be re-created, re-using
+previously used IDs.
+
+Before the previous commit, the client would not have been able to
+re-create the subflow that was previously rejected.
+
+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: 06faa2271034 ("mptcp: remove multi addresses and subflows in PM")
+Cc: stable@vger.kernel.org
+Reviewed-by: Mat Martineau <martineau@kernel.org>
+Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
+Link: https://patch.msgid.link/20240819-net-mptcp-pm-reusing-id-v1-6-38035d40de5b@kernel.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/testing/selftests/net/mptcp/mptcp_join.sh |   30 ++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
++++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
+@@ -3752,6 +3752,36 @@ endpoint_tests()
+               chk_rm_nr 4 3 invert
+       fi
+ 
++      # flush and re-add
++      if reset_with_tcp_filter "flush re-add" ns2 10.0.3.2 REJECT OUTPUT &&
++         mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then
++              pm_nl_set_limits $ns1 0 2
++              pm_nl_set_limits $ns2 1 2
++              # broadcast IP: no packet for this address will be received on ns1
++              pm_nl_add_endpoint $ns1 224.0.0.1 id 2 flags signal
++              pm_nl_add_endpoint $ns2 10.0.3.2 id 3 flags subflow
++              test_linkfail=4 speed=20 \
++                      run_tests $ns1 $ns2 10.0.1.1 &
++              local tests_pid=$!
++
++              wait_attempt_fail $ns2
++              chk_subflow_nr "before flush" 1
++              chk_mptcp_info subflows 0 subflows 0
++
++              pm_nl_flush_endpoint $ns2
++              pm_nl_flush_endpoint $ns1
++              wait_rm_addr $ns2 0
++              ip netns exec "${ns2}" ${iptables} -D OUTPUT -s "10.0.3.2" -p tcp -j REJECT
++              pm_nl_add_endpoint $ns2 10.0.3.2 id 3 flags subflow
++              wait_mpj $ns2
++              pm_nl_add_endpoint $ns1 10.0.3.1 id 2 flags signal
++              wait_mpj $ns2
++              mptcp_lib_kill_wait $tests_pid
++
++              chk_join_nr 2 2 2
++              chk_add_nr 2 2
++              chk_rm_nr 1 0 invert
++      fi
+ }
+ 
+ # [$1: error message]

diff --git a/queue-6.10/series b/queue-6.10/series
index ebeb6f75b4063a063d41525c14c72c9f84916ef2..60b8655201b2b3af8cd35eea567a83242703d73f 100644 (file)
--- a/queue-6.10/series
+++ b/queue-6.10/series
@@ -36,3 +36,4 @@ selftests-mptcp-join-check-re-using-id-of-unused-add.patch
 selftests-mptcp-join-check-re-adding-init-endp-with-.patch
 selftests-mptcp-join-validate-event-numbers.patch
 selftests-mptcp-join-check-re-re-adding-id-0-signal.patch
+selftests-mptcp-join-test-for-flush-re-add-endpoints.patch