selftests: mptcp: join: skip fail tests if not supported

matttbe · kuba-moo · commit ff8897b51894 · 2023-06-12T16:55:42.000-07:00
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 MP_FAIL / infinite mapping introduced by commit 1e39e5a ("mptcp: infinite mapping sending") and the following ones. It is possible to look for one of the infinite mapping counters to know in advance if the this feature is available. Link: multipath-tcp/mptcp_net-next#368 Fixes: b6e074e ("selftests: mptcp: add infinite map testcase") Cc: stable@vger.kernel.org Fixes: 2ba1816 ("selftests: mptcp: add MP_FAIL reset testcase") Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -384,7 +384,7 @@ setup_fail_rules()
 
 reset_with_fail()
 {
-	reset "${1}" || return 1
+	reset_check_counter "${1}" "MPTcpExtInfiniteMapTx" || return 1
 	shift
 
 	ip netns exec $ns1 sysctl -q net.mptcp.checksum_enabled=1

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ setup_fail_rules()`
`384`	`384`
`385`	`385`	`reset_with_fail()`
`386`	`386`	`{`
`387`		`- reset "${1}" \|\| return 1`
	`387`	`+ reset_check_counter "${1}" "MPTcpExtInfiniteMapTx" \|\| return 1`
`388`	`388`	`shift`
`389`	`389`
`390`	`390`	`ip netns exec $ns1 sysctl -q net.mptcp.checksum_enabled=1`