]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
selftests: mptcp: join: mark laminar tests as skipped if not supported
authorMatthieu Baerts (NGI0) <matttbe@kernel.org>
Mon, 20 Oct 2025 20:53:30 +0000 (22:53 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 22 Oct 2025 00:36:47 +0000 (17:36 -0700)
The call to 'continue_if' was missing: it properly marks a subtest as
'skipped' if the attached condition is not valid.

Without that, the test is wrongly marked as passed on older kernels.

Fixes: c912f935a5c7 ("selftests: mptcp: join: validate new laminar endp")
Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20251020-net-mptcp-c-flag-late-add-addr-v1-5-8207030cb0e8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/testing/selftests/net/mptcp/mptcp_join.sh

index b2a8c51a39698f4cb4a9bc63f4c4789256021619..78a1aa4ecff2bc86e231e33267a46e1af739c2a6 100755 (executable)
@@ -2324,7 +2324,7 @@ laminar_endp_tests()
 {
        # no laminar endpoints: routing rules are used
        if reset_with_tcp_filter "without a laminar endpoint" ns1 10.0.2.2 REJECT &&
-          mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
+          continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
                pm_nl_set_limits $ns1 0 2
                pm_nl_set_limits $ns2 2 2
                pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
@@ -2336,7 +2336,7 @@ laminar_endp_tests()
 
        # laminar endpoints: this endpoint is used
        if reset_with_tcp_filter "with a laminar endpoint" ns1 10.0.2.2 REJECT &&
-          mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
+          continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
                pm_nl_set_limits $ns1 0 2
                pm_nl_set_limits $ns2 2 2
                pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
@@ -2348,7 +2348,7 @@ laminar_endp_tests()
 
        # laminar endpoints: these endpoints are used
        if reset_with_tcp_filter "with multiple laminar endpoints" ns1 10.0.2.2 REJECT &&
-          mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
+          continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
                pm_nl_set_limits $ns1 0 2
                pm_nl_set_limits $ns2 2 2
                pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
@@ -2363,7 +2363,7 @@ laminar_endp_tests()
 
        # laminar endpoints: only one endpoint is used
        if reset_with_tcp_filter "single laminar endpoint" ns1 10.0.2.2 REJECT &&
-          mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
+          continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
                pm_nl_set_limits $ns1 0 2
                pm_nl_set_limits $ns2 2 2
                pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
@@ -2376,7 +2376,7 @@ laminar_endp_tests()
 
        # laminar endpoints: subflow and laminar flags
        if reset_with_tcp_filter "sublow + laminar endpoints" ns1 10.0.2.2 REJECT &&
-          mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
+          continue_if mptcp_lib_kallsyms_has "mptcp_pm_get_endp_laminar_max$"; then
                pm_nl_set_limits $ns1 0 4
                pm_nl_set_limits $ns2 2 4
                pm_nl_add_endpoint $ns1 10.0.2.1 flags signal