Skip to content

Commit 49ac6f0

Browse files
matttbekuba-moo
authored andcommitted
selftests: mptcp: join: restrict fullmesh endp on 1st sf
A new endpoint using the IP of the initial subflow has been recently added to increase the code coverage. But it breaks the test when using old kernels not having commit 86e39e0 ("mptcp: keep track of local endpoint still available for each msk"), e.g. on v5.15. Similar to commit d4c81bb ("selftests: mptcp: join: support local endpoint being tracked or not"), it is possible to add the new endpoint conditionally, by checking if "mptcp_pm_subflow_check_next" is present in kallsyms: this is not directly linked to the commit introducing this symbol but for the parent one which is linked anyway. So we can know in advance what will be the expected behaviour, and add the new endpoint only when it makes sense to do so. Fixes: 4878f9f ("selftests: mptcp: join: validate fullmesh endp on 1st sf") Cc: [email protected] Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> Link: https://patch.msgid.link/20240910-net-selftests-mptcp-fix-install-v1-1-8f124aa9156d@kernel.org Signed-off-by: Jakub Kicinski <[email protected]>
1 parent d1aaaa2 commit 49ac6f0

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

tools/testing/selftests/net/mptcp/mptcp_join.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3064,7 +3064,9 @@ fullmesh_tests()
30643064
pm_nl_set_limits $ns1 1 3
30653065
pm_nl_set_limits $ns2 1 3
30663066
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
3067-
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,fullmesh
3067+
if mptcp_lib_kallsyms_has "mptcp_pm_subflow_check_next$"; then
3068+
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,fullmesh
3069+
fi
30683070
fullmesh=1 speed=slow \
30693071
run_tests $ns1 $ns2 10.0.1.1
30703072
chk_join_nr 3 3 3

0 commit comments

Comments
 (0)