Skip to content

Commit

Permalink
selftests: mptcp: join: skip fullmesh flag tests if not supported
Browse files Browse the repository at this point in the history
Selftests are supposed to run on any kernels, including the old ones not
supporting all MPTCP features.

One of them is the support of the fullmesh flag for the in-kernel PM
introduced by commit 2843ff6 ("mptcp: remote addresses fullmesh")
and commit 1a0d613 ("mptcp: local addresses fullmesh").

It looks like there is no easy external sign we can use to predict the
expected behaviour. We could add the flag and then check if it has been
added but for that, and for each fullmesh test, we would need to setup a
new environment, do the checks, clean it and then only start the test
from yet another clean environment. To keep it simple and avoid
introducing new issues, we look for a specific kernel version. That's
not ideal but an acceptable solution for this case.

Link: https://github.com/multipath-tcp/mptcp_net-next/issues/368
Fixes: 6a0653b ("selftests: mptcp: add fullmesh setting tests")
Cc: stable@vger.kernel.org
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Matthieu Baerts authored and Jakub Kicinski committed Jun 12, 2023
1 parent 07216a3 commit 9db34c4
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions tools/testing/selftests/net/mptcp/mptcp_join.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3098,7 +3098,8 @@ fullmesh_tests()
fi

# set fullmesh flag
if reset "set fullmesh flag test"; then
if reset "set fullmesh flag test" &&
continue_if mptcp_lib_kversion_ge 5.18; then
pm_nl_set_limits $ns1 4 4
pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow
pm_nl_set_limits $ns2 4 4
Expand All @@ -3108,7 +3109,8 @@ fullmesh_tests()
fi

# set nofullmesh flag
if reset "set nofullmesh flag test"; then
if reset "set nofullmesh flag test" &&
continue_if mptcp_lib_kversion_ge 5.18; then
pm_nl_set_limits $ns1 4 4
pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow,fullmesh
pm_nl_set_limits $ns2 4 4
Expand All @@ -3118,7 +3120,8 @@ fullmesh_tests()
fi

# set backup,fullmesh flags
if reset "set backup,fullmesh flags test"; then
if reset "set backup,fullmesh flags test" &&
continue_if mptcp_lib_kversion_ge 5.18; then
pm_nl_set_limits $ns1 4 4
pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow
pm_nl_set_limits $ns2 4 4
Expand All @@ -3129,7 +3132,8 @@ fullmesh_tests()
fi

# set nobackup,nofullmesh flags
if reset "set nobackup,nofullmesh flags test"; then
if reset "set nobackup,nofullmesh flags test" &&
continue_if mptcp_lib_kversion_ge 5.18; then
pm_nl_set_limits $ns1 4 4
pm_nl_set_limits $ns2 4 4
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup,fullmesh
Expand Down

0 comments on commit 9db34c4

Please sign in to comment.