Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests: mptcp: simult flows: mark 'unbalanced' tests as flaky

These tests are flaky since their introduction. This might be less or
not visible depending on the CI running the tests, especially if it is
also busy doing other tasks in parallel.

A first analysis shown that the transfer can be slowed down when there
are some re-injections at the MPTCP level. Such re-injections can of
course happen, and disturb the transfer, but it looks strange to have
them in this lab. That could be caused by the kernel having access to
less CPU cycles -- e.g. when other activities are executed in parallel
-- or by a misinterpretation on the MPTCP packet scheduler side.

While this is being investigated, the tests are marked as flaky not to
create noises in other CIs.

Fixes: 219d04992b68 ("mptcp: push pending frames when subflow has free space")
Link: https://github.com/multipath-tcp/mptcp_net-next/issues/475
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240524-upstream-net-20240524-selftests-mptcp-flaky-v1-2-a352362f3f8e@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Matthieu Baerts (NGI0) and committed by
Jakub Kicinski
cc73a657 5597613f

+3 -3
+3 -3
tools/testing/selftests/net/mptcp/simult_flows.sh
··· 244 244 do_transfer $small $large $time 245 245 lret=$? 246 246 mptcp_lib_result_code "${lret}" "${msg}" 247 - if [ $lret -ne 0 ]; then 247 + if [ $lret -ne 0 ] && ! mptcp_lib_subtest_is_flaky; then 248 248 ret=$lret 249 249 [ $bail -eq 0 ] || exit $ret 250 250 fi ··· 254 254 do_transfer $large $small $time 255 255 lret=$? 256 256 mptcp_lib_result_code "${lret}" "${msg}" 257 - if [ $lret -ne 0 ]; then 257 + if [ $lret -ne 0 ] && ! mptcp_lib_subtest_is_flaky; then 258 258 ret=$lret 259 259 [ $bail -eq 0 ] || exit $ret 260 260 fi ··· 290 290 run_test 10 10 1 25 "balanced bwidth with unbalanced delay" 291 291 292 292 # we still need some additional infrastructure to pass the following test-cases 293 - run_test 10 3 0 0 "unbalanced bwidth" 293 + MPTCP_LIB_SUBTEST_FLAKY=1 run_test 10 3 0 0 "unbalanced bwidth" 294 294 run_test 10 3 1 25 "unbalanced bwidth with unbalanced delay" 295 295 run_test 10 3 25 1 "unbalanced bwidth with opposed, unbalanced delay" 296 296