[PATCH mptcp-net 5/7] selftests: mptcp: join: mark laminar tests as skipped if not supported

Matthieu Baerts (NGI0) posted 7 patches 2 days, 16 hours ago
[PATCH mptcp-net 5/7] selftests: mptcp: join: mark laminar tests as skipped if not supported
Posted by Matthieu Baerts (NGI0) 2 days, 16 hours ago
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")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 tools/testing/selftests/net/mptcp/mptcp_join.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index b2a8c51a3969..78a1aa4ecff2 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -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

-- 
2.51.0
Re: [PATCH mptcp-net 5/7] selftests: mptcp: join: mark laminar tests as skipped if not supported
Posted by Geliang Tang 20 hours ago
Hi Matt,

On Wed, 2025-10-08 at 15:59 +0200, Matthieu Baerts (NGI0) wrote:
> 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")
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

This patch looks good to me.

Reviewed-by: Geliang Tang <geliang@kernel.org>

Thanks,
-Geliang

> ---
>  tools/testing/selftests/net/mptcp/mptcp_join.sh | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> index b2a8c51a3969..78a1aa4ecff2 100755
> --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> @@ -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
>