Recently, the bandwidth in simult flows selftest has been reduced. The
idea was to improve the situation in slow environments. It helped in
some, but not in all of them. With a longer transfer, it is also
possible to get more instabilities along the way.

We can increase a bit the rate limit for the unbalanced bandwidth cases,
but limit the total of the two links to 20 Mbps, like the balanced
bandwidth cases. The same 3:1 ratio is still being used like before, not
to change the nature of the test.

Fixes: 5e2f3c65af47 ("selftests: mptcp: decrease BW in simult flows")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 tools/testing/selftests/net/mptcp/simult_flows.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index 0cc964e6f2c1..619be0e1acf5 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -287,9 +287,9 @@ run_test 10 10 0 0 "balanced bwidth"
 run_test 10 10 1 25 "balanced bwidth with unbalanced delay"
 
 # we still need some additional infrastructure to pass the following test-cases
-run_test 10 3 0 0 "unbalanced bwidth"
-run_test 10 3 1 25 "unbalanced bwidth with unbalanced delay"
-run_test 10 3 25 1 "unbalanced bwidth with opposed, unbalanced delay"
+run_test 15 5 0 0 "unbalanced bwidth"
+run_test 15 5 1 25 "unbalanced bwidth with unbalanced delay"
+run_test 15 5 25 1 "unbalanced bwidth with opposed, unbalanced delay"
 
 mptcp_lib_result_print_all_tap
 exit $ret

---
base-commit: c2469b38e369c3f2b9577beeb9470cc757abc1b9
change-id: 20240208-selftests-mptcp-simult_flows_faster-0a3b46f5cde6

Best regards,
-- 
Matthieu Baerts (NGI0) <matttbe@kernel.org>

On Thu, 8 Feb 2024, Matthieu Baerts (NGI0) wrote:

> Recently, the bandwidth in simult flows selftest has been reduced. The
> idea was to improve the situation in slow environments. It helped in
> some, but not in all of them. With a longer transfer, it is also
> possible to get more instabilities along the way.
>
> We can increase a bit the rate limit for the unbalanced bandwidth cases,
> but limit the total of the two links to 20 Mbps, like the balanced
> bandwidth cases. The same 3:1 ratio is still being used like before, not
> to change the nature of the test.
>
> Fixes: 5e2f3c65af47 ("selftests: mptcp: decrease BW in simult flows")
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

Looks reasonable, thanks Matthieu.

Reviewed-by: Mat Martineau <martineau@kernel.org>

> ---
> tools/testing/selftests/net/mptcp/simult_flows.sh | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
> index 0cc964e6f2c1..619be0e1acf5 100755
> --- a/tools/testing/selftests/net/mptcp/simult_flows.sh
> +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
> @@ -287,9 +287,9 @@ run_test 10 10 0 0 "balanced bwidth"
> run_test 10 10 1 25 "balanced bwidth with unbalanced delay"
>
> # we still need some additional infrastructure to pass the following test-cases
> -run_test 10 3 0 0 "unbalanced bwidth"
> -run_test 10 3 1 25 "unbalanced bwidth with unbalanced delay"
> -run_test 10 3 25 1 "unbalanced bwidth with opposed, unbalanced delay"
> +run_test 15 5 0 0 "unbalanced bwidth"
> +run_test 15 5 1 25 "unbalanced bwidth with unbalanced delay"
> +run_test 15 5 25 1 "unbalanced bwidth with opposed, unbalanced delay"
>
> mptcp_lib_result_print_all_tap
> exit $ret
>
> ---
> base-commit: c2469b38e369c3f2b9577beeb9470cc757abc1b9
> change-id: 20240208-selftests-mptcp-simult_flows_faster-0a3b46f5cde6
>
> Best regards,
> -- 
> Matthieu Baerts (NGI0) <matttbe@kernel.org>
>
>
>

Hi Mat,

On 09/02/2024 01:30, Mat Martineau wrote:
> On Thu, 8 Feb 2024, Matthieu Baerts (NGI0) wrote:
> 
>> Recently, the bandwidth in simult flows selftest has been reduced. The
>> idea was to improve the situation in slow environments. It helped in
>> some, but not in all of them. With a longer transfer, it is also
>> possible to get more instabilities along the way.
>>
>> We can increase a bit the rate limit for the unbalanced bandwidth cases,
>> but limit the total of the two links to 20 Mbps, like the balanced
>> bandwidth cases. The same 3:1 ratio is still being used like before, not
>> to change the nature of the test.
>>
>> Fixes: 5e2f3c65af47 ("selftests: mptcp: decrease BW in simult flows")
>> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
> 
> Looks reasonable, thanks Matthieu.
> 
> Reviewed-by: Mat Martineau <martineau@kernel.org>

Thank you for the review!

Now in our tree (fix for -net):

New patches for t/upstream-net and t/upstream:
- 7e6c60f9e796: selftests: mptcp: simult flows: re-adapt BW
- Results: 6075087dd1c3..bef0b46af378 (export-net)
- Results: 081844c2b78a..78a4d8e40bf5 (export)

Tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export-net/20240209T140100
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20240209T140100

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.