Skip to content

Commit 632978f

Browse files
matttbekuba-moo
authored andcommitted
selftests: mptcp: join: skip MPC backups tests if not supported
Selftests are supposed to run on any kernels, including the old ones not supporting all MPTCP features. One of them is the support of sending an MP_PRIO signal for the initial subflow, introduced by commit c157bbe ("mptcp: allow the in kernel PM to set MPC subflow priority"). It is possible to look for "mptcp_subflow_send_ack" in kallsyms because it was needed to introduce the mentioned feature. So we can know in advance if the feature is supported instead of trying and accepting any results. Link: multipath-tcp/mptcp_net-next#368 Fixes: 914f6a5 ("selftests: mptcp: add MPC backup tests") Cc: stable@vger.kernel.org Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent ff8897b commit 632978f

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2713,29 +2713,33 @@ backup_tests()
27132713
chk_prio_nr 1 1
27142714
fi
27152715

2716-
if reset "mpc backup"; then
2716+
if reset "mpc backup" &&
2717+
continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
27172718
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup
27182719
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
27192720
chk_join_nr 0 0 0
27202721
chk_prio_nr 0 1
27212722
fi
27222723

2723-
if reset "mpc backup both sides"; then
2724+
if reset "mpc backup both sides" &&
2725+
continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
27242726
pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow,backup
27252727
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup
27262728
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
27272729
chk_join_nr 0 0 0
27282730
chk_prio_nr 1 1
27292731
fi
27302732

2731-
if reset "mpc switch to backup"; then
2733+
if reset "mpc switch to backup" &&
2734+
continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
27322735
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow
27332736
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup
27342737
chk_join_nr 0 0 0
27352738
chk_prio_nr 0 1
27362739
fi
27372740

2738-
if reset "mpc switch to backup both sides"; then
2741+
if reset "mpc switch to backup both sides" &&
2742+
continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; then
27392743
pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow
27402744
pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow
27412745
run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup

0 commit comments

Comments
 (0)