Squash to "selftests: mptcp: add tests for subflow creation failure"

[PATCH mptcp-next] Squash to "selftests: mptcp: add tests for subflow creation failure"

Posted by Geliang Tang 2 years, 4 months ago

Align the output logs with others.

01 no MPC address reuse with single endpoint syn[ ok ] - synack[ ok ] - ack[ ok ]
02 multiple subflows, with failing subflow syn[ ok ] - synack[ ok ] - ack[ ok ]
03 multiple subflows, with subflow timeout syn[ ok ] - synack[ ok ] - ack[ ok ]
04 multiple subflows, fair usage on close syn[ ok ] - synack[ ok ] - ack[ ok ]
05 no JOIN                              syn[ ok ] - synack[ ok ] - ack[ ok ]
06 single subflow, limited by client    syn[ ok ] - synack[ ok ] - ack[ ok ]
07 single subflow, limited by server    syn[ ok ] - synack[ ok ] - ack[ ok ]
08 single subflow                       syn[ ok ] - synack[ ok ] - ack[ ok ]
09 multiple subflows                    syn[ ok ] - synack[ ok ] - ack[ ok ]
10 multiple subflows, limited by server syn[ ok ] - synack[ ok ] - ack[ ok ]
11 single subflow, dev                  syn[ ok ] - synack[ ok ] - ack[ ok ]

->

01 no MPC reuse with single endpoint    syn[ ok ] - synack[ ok ] - ack[ ok ]
02 multi subflows, with failing subflow syn[ ok ] - synack[ ok ] - ack[ ok ]
03 multi subflows, with subflow timeout syn[ ok ] - synack[ ok ] - ack[ ok ]
04 multi subflows, fair usage on close  syn[ ok ] - synack[ ok ] - ack[ ok ]
05 no JOIN                              syn[ ok ] - synack[ ok ] - ack[ ok ]
06 single subflow, limited by client    syn[ ok ] - synack[ ok ] - ack[ ok ]
07 single subflow, limited by server    syn[ ok ] - synack[ ok ] - ack[ ok ]
08 single subflow                       syn[ ok ] - synack[ ok ] - ack[ ok ]
09 multiple subflows                    syn[ ok ] - synack[ ok ] - ack[ ok ]
10 multiple subflows, limited by server syn[ ok ] - synack[ ok ] - ack[ ok ]
11 single subflow, dev                  syn[ ok ] - synack[ ok ] - ack[ ok ]

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index d70621700281..e48ce23d2386 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -1069,7 +1069,7 @@ subflows_error_tests()
 	ip netns exec $ns2 ./pm_nl_ctl limits 0 1
 	ip netns exec $ns2 ./pm_nl_ctl add 10.0.1.2 flags subflow
 	run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
-	chk_join_nr "no MPC address reuse with single endpoint" 0 0 0
+	chk_join_nr "no MPC reuse with single endpoint" 0 0 0
 
 	# multiple subflows, with subflow creation error
 	reset
@@ -1079,7 +1079,7 @@ subflows_error_tests()
 	ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow
 	ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j REJECT
 	run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
-	chk_join_nr "multiple subflows, with failing subflow" 1 1 1
+	chk_join_nr "multi subflows, with failing subflow" 1 1 1
 
 	# multiple subflows, with subflow timeout on MPJ
 	reset
@@ -1089,7 +1089,7 @@ subflows_error_tests()
 	ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow
 	ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j DROP
 	run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
-	chk_join_nr "multiple subflows, with subflow timeout" 1 1 1
+	chk_join_nr "multi subflows, with subflow timeout" 1 1 1
 
 	# multiple subflows, check that the endpoint corresponding to
 	# closed subflow (due to reset) is not reused if additional
@@ -1112,7 +1112,7 @@ subflows_error_tests()
 
 	# additional subflow could be created only if the PM select
 	# the later endpoint, skipping the already used one
-	chk_join_nr "multiple subflows, fair usage on close" 1 1 1
+	chk_join_nr "multi subflows, fair usage on close" 1 1 1
 }
 
 signal_address_tests()
-- 
2.31.1

Re: [PATCH mptcp-next] Squash to "selftests: mptcp: add tests for subflow creation failure"

Posted by Paolo Abeni 2 years, 4 months ago

On Fri, 2021-12-17 at 14:42 +0800, Geliang Tang wrote:
> Align the output logs with others.
> 
> 01 no MPC address reuse with single endpoint syn[ ok ] - synack[ ok ] - ack[ ok ]
> 02 multiple subflows, with failing subflow syn[ ok ] - synack[ ok ] - ack[ ok ]
> 03 multiple subflows, with subflow timeout syn[ ok ] - synack[ ok ] - ack[ ok ]
> 04 multiple subflows, fair usage on close syn[ ok ] - synack[ ok ] - ack[ ok ]
> 05 no JOIN                              syn[ ok ] - synack[ ok ] - ack[ ok ]
> 06 single subflow, limited by client    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 07 single subflow, limited by server    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 08 single subflow                       syn[ ok ] - synack[ ok ] - ack[ ok ]
> 09 multiple subflows                    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 10 multiple subflows, limited by server syn[ ok ] - synack[ ok ] - ack[ ok ]
> 11 single subflow, dev                  syn[ ok ] - synack[ ok ] - ack[ ok ]
> 
> ->
> 
> 01 no MPC reuse with single endpoint    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 02 multi subflows, with failing subflow syn[ ok ] - synack[ ok ] - ack[ ok ]
> 03 multi subflows, with subflow timeout syn[ ok ] - synack[ ok ] - ack[ ok ]
> 04 multi subflows, fair usage on close  syn[ ok ] - synack[ ok ] - ack[ ok ]
> 05 no JOIN                              syn[ ok ] - synack[ ok ] - ack[ ok ]
> 06 single subflow, limited by client    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 07 single subflow, limited by server    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 08 single subflow                       syn[ ok ] - synack[ ok ] - ack[ ok ]
> 09 multiple subflows                    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 10 multiple subflows, limited by server syn[ ok ] - synack[ ok ] - ack[ ok ]
> 11 single subflow, dev                  syn[ ok ] - synack[ ok ] - ack[ ok ]
> 
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>
> ---
>  tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> index d70621700281..e48ce23d2386 100755
> --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> @@ -1069,7 +1069,7 @@ subflows_error_tests()
>  	ip netns exec $ns2 ./pm_nl_ctl limits 0 1
>  	ip netns exec $ns2 ./pm_nl_ctl add 10.0.1.2 flags subflow
>  	run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
> -	chk_join_nr "no MPC address reuse with single endpoint" 0 0 0
> +	chk_join_nr "no MPC reuse with single endpoint" 0 0 0
>  
>  	# multiple subflows, with subflow creation error
>  	reset
> @@ -1079,7 +1079,7 @@ subflows_error_tests()
>  	ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow
>  	ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j REJECT
>  	run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
> -	chk_join_nr "multiple subflows, with failing subflow" 1 1 1
> +	chk_join_nr "multi subflows, with failing subflow" 1 1 1
>  
>  	# multiple subflows, with subflow timeout on MPJ
>  	reset
> @@ -1089,7 +1089,7 @@ subflows_error_tests()
>  	ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow
>  	ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j DROP
>  	run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
> -	chk_join_nr "multiple subflows, with subflow timeout" 1 1 1
> +	chk_join_nr "multi subflows, with subflow timeout" 1 1 1
>  
>  	# multiple subflows, check that the endpoint corresponding to
>  	# closed subflow (due to reset) is not reused if additional
> @@ -1112,7 +1112,7 @@ subflows_error_tests()
>  
>  	# additional subflow could be created only if the PM select
>  	# the later endpoint, skipping the already used one
> -	chk_join_nr "multiple subflows, fair usage on close" 1 1 1
> +	chk_join_nr "multi subflows, fair usage on close" 1 1 1
>  }
>  
>  signal_address_tests()

LGTM, thanks!

Acked-by: Paolo Abeni <pabeni@redhat.com>

Re: [PATCH mptcp-next] Squash to "selftests: mptcp: add tests for subflow creation failure"

Posted by Mat Martineau 2 years, 4 months ago

On Fri, 17 Dec 2021, Geliang Tang wrote:

> Align the output logs with others.
>
> 01 no MPC address reuse with single endpoint syn[ ok ] - synack[ ok ] - ack[ ok ]
> 02 multiple subflows, with failing subflow syn[ ok ] - synack[ ok ] - ack[ ok ]
> 03 multiple subflows, with subflow timeout syn[ ok ] - synack[ ok ] - ack[ ok ]
> 04 multiple subflows, fair usage on close syn[ ok ] - synack[ ok ] - ack[ ok ]
> 05 no JOIN                              syn[ ok ] - synack[ ok ] - ack[ ok ]
> 06 single subflow, limited by client    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 07 single subflow, limited by server    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 08 single subflow                       syn[ ok ] - synack[ ok ] - ack[ ok ]
> 09 multiple subflows                    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 10 multiple subflows, limited by server syn[ ok ] - synack[ ok ] - ack[ ok ]
> 11 single subflow, dev                  syn[ ok ] - synack[ ok ] - ack[ ok ]
>
> ->
>
> 01 no MPC reuse with single endpoint    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 02 multi subflows, with failing subflow syn[ ok ] - synack[ ok ] - ack[ ok ]
> 03 multi subflows, with subflow timeout syn[ ok ] - synack[ ok ] - ack[ ok ]
> 04 multi subflows, fair usage on close  syn[ ok ] - synack[ ok ] - ack[ ok ]
> 05 no JOIN                              syn[ ok ] - synack[ ok ] - ack[ ok ]
> 06 single subflow, limited by client    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 07 single subflow, limited by server    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 08 single subflow                       syn[ ok ] - synack[ ok ] - ack[ ok ]
> 09 multiple subflows                    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 10 multiple subflows, limited by server syn[ ok ] - synack[ ok ] - ack[ ok ]
> 11 single subflow, dev                  syn[ ok ] - synack[ ok ] - ack[ ok ]
>
> Signed-off-by: Geliang Tang <geliang.tang@suse.com>

Looks good to me, thanks:

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>

> ---
> tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> index d70621700281..e48ce23d2386 100755
> --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
> @@ -1069,7 +1069,7 @@ subflows_error_tests()
> 	ip netns exec $ns2 ./pm_nl_ctl limits 0 1
> 	ip netns exec $ns2 ./pm_nl_ctl add 10.0.1.2 flags subflow
> 	run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
> -	chk_join_nr "no MPC address reuse with single endpoint" 0 0 0
> +	chk_join_nr "no MPC reuse with single endpoint" 0 0 0
>
> 	# multiple subflows, with subflow creation error
> 	reset
> @@ -1079,7 +1079,7 @@ subflows_error_tests()
> 	ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow
> 	ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j REJECT
> 	run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
> -	chk_join_nr "multiple subflows, with failing subflow" 1 1 1
> +	chk_join_nr "multi subflows, with failing subflow" 1 1 1
>
> 	# multiple subflows, with subflow timeout on MPJ
> 	reset
> @@ -1089,7 +1089,7 @@ subflows_error_tests()
> 	ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow
> 	ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j DROP
> 	run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow
> -	chk_join_nr "multiple subflows, with subflow timeout" 1 1 1
> +	chk_join_nr "multi subflows, with subflow timeout" 1 1 1
>
> 	# multiple subflows, check that the endpoint corresponding to
> 	# closed subflow (due to reset) is not reused if additional
> @@ -1112,7 +1112,7 @@ subflows_error_tests()
>
> 	# additional subflow could be created only if the PM select
> 	# the later endpoint, skipping the already used one
> -	chk_join_nr "multiple subflows, fair usage on close" 1 1 1
> +	chk_join_nr "multi subflows, fair usage on close" 1 1 1
> }
>
> signal_address_tests()
> -- 
> 2.31.1
>
>
>

--
Mat Martineau
Intel

Re: [PATCH mptcp-next] Squash to "selftests: mptcp: add tests for subflow creation failure"

Posted by Matthieu Baerts 2 years, 4 months ago

Hi Geliang, Paolo, Mat,

On 17/12/2021 07:42, Geliang Tang wrote:
> Align the output logs with others.
> 
> 01 no MPC address reuse with single endpoint syn[ ok ] - synack[ ok ] - ack[ ok ]
> 02 multiple subflows, with failing subflow syn[ ok ] - synack[ ok ] - ack[ ok ]
> 03 multiple subflows, with subflow timeout syn[ ok ] - synack[ ok ] - ack[ ok ]
> 04 multiple subflows, fair usage on close syn[ ok ] - synack[ ok ] - ack[ ok ]
> 05 no JOIN                              syn[ ok ] - synack[ ok ] - ack[ ok ]
> 06 single subflow, limited by client    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 07 single subflow, limited by server    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 08 single subflow                       syn[ ok ] - synack[ ok ] - ack[ ok ]
> 09 multiple subflows                    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 10 multiple subflows, limited by server syn[ ok ] - synack[ ok ] - ack[ ok ]
> 11 single subflow, dev                  syn[ ok ] - synack[ ok ] - ack[ ok ]
> 
> ->
> 
> 01 no MPC reuse with single endpoint    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 02 multi subflows, with failing subflow syn[ ok ] - synack[ ok ] - ack[ ok ]
> 03 multi subflows, with subflow timeout syn[ ok ] - synack[ ok ] - ack[ ok ]
> 04 multi subflows, fair usage on close  syn[ ok ] - synack[ ok ] - ack[ ok ]
> 05 no JOIN                              syn[ ok ] - synack[ ok ] - ack[ ok ]
> 06 single subflow, limited by client    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 07 single subflow, limited by server    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 08 single subflow                       syn[ ok ] - synack[ ok ] - ack[ ok ]
> 09 multiple subflows                    syn[ ok ] - synack[ ok ] - ack[ ok ]
> 10 multiple subflows, limited by server syn[ ok ] - synack[ ok ] - ack[ ok ]
> 11 single subflow, dev                  syn[ ok ] - synack[ ok ] - ack[ ok ]

Thank you for the patch and the reviews!

Now in our tree:

- 2a6be13b8c8e: "squashed" in "selftests: mptcp: add tests for subflow
creation failure"
- 226152ce39b0: "Signed-off-by" + "Co-developed-by"
- Results: 8e31f966b708..079ed80abcff

Builds and tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20211218T085941
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net