Commit 315203a2 authored by Matthieu Baerts (NGI0)'s avatar Matthieu Baerts (NGI0) Committed by Ma Wupeng
Browse files

selftests: mptcp: decrease BW in simult flows 

stable inclusion
from stable-v6.6.22
commit e2ee3c628a6f6d613ad96812036d61e36748a0b8
bugzilla: https://gitee.com/openeuler/kernel/issues/I99TJK

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=e2ee3c628a6f6d613ad96812036d61e36748a0b8



--------------------------------

[ Upstream commit 5e2f3c65af47e527ccac54060cf909e3306652ff ]

When running the simult_flow selftest in slow environments -- e.g. QEmu
without KVM support --, the results can be unstable. This selftest
checks if the aggregated bandwidth is (almost) fully used as expected.

To help improving the stability while still keeping the same validation
in place, the BW and the delay are reduced to lower the pressure on the
CPU.

Fixes: 1a418cb8 ("mptcp: simult flow self-tests")
Fixes: 219d0499 ("mptcp: push pending frames when subflow has free space")
Cc: stable@vger.kernel.org
Suggested-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240131-upstream-net-20240131-mptcp-ci-issues-v1-6-4c1c11e571ff@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent eff66eb1

tools/testing/selftests/net/mptcp/simult_flows.sh

+4 −4
Original line number Diff line number Diff line
@@ -302,12 +302,12 @@ done 


setup

run_test 10 10 0 0 "balanced bwidth"

run_test 10 10 1 50 "balanced bwidth with unbalanced delay"

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 30 10 0 0 "unbalanced bwidth"

run_test 30 10 1 50 "unbalanced bwidth with unbalanced delay"

run_test 30 10 50 1 "unbalanced bwidth with opposed, unbalanced delay"

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"



mptcp_lib_result_print_all_tap

exit $ret