selftests: mptcp: disable add_addr retrans in endpoint_tests

[ Upstream commit f92199f551e617fae028c5c5905ddd63e3616e18 ]

To prevent test instability in the "delete re-add signal" test caused by
ADD_ADDR retransmissions, disable retransmissions for this test by setting
net.mptcp.add_addr_timeout to 0.

Suggested-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250815-net-mptcp-misc-fixes-6-17-rc2-v1-6-521fe9957892@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: c3496c052ac3 ("selftests: mptcp: join: mark 'delete re-add signal' as skipped if not supported")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index d30314532bb71d690efad9f2f15d91bd67499517..57154a8b75c52b17dc7c33844ba07327bcf20d02 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -3838,6 +3838,7 @@ endpoint_tests()
        # remove and re-add
        if reset_with_events "delete re-add signal" &&
           mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then
+               ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=0
                pm_nl_set_limits $ns1 0 3
                pm_nl_set_limits $ns2 3 3
                pm_nl_add_endpoint $ns1 10.0.2.1 id 1 flags signal