From patchwork Fri May 24 16:30:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 798792 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D4AF912C7F8; Fri, 24 May 2024 16:31:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716568273; cv=none; b=tW31iCZeMvPdy41KpjUNpW2pMEBsJ3qdDH9YLshKXXPzpilJPNNw6D6nJWSfjiC9jmicTATwZ3SWPT6zgEKbJEF24/3SFCMAxEuBzJAHhV3XEdIvN+ZnCQc5j6hfJ4Hoqy5igqsJQ/iMA+CVcUVc8pEIi8UENSMS5ZaufiKjdDA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716568273; c=relaxed/simple; bh=lmxCtQTHyu0kw+aS06uj4cbDABnxfvXo+bEFeYsiE5o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lp/7NzfdBxJ4cNLfZ0B2GKmii0x5naNzS5J6V6qpaQScB2xZ96Y+0pYSHi2hjUqUNV4IjaUewFe7MI/MN+D6qjRHlt+YLjYYI/oVPxY98gD9C9OgBn22D2GSTR2Ffvk7P1qcKISUgjO0Qk9wOu9VpQEudSs/uFv2ZMZfzh4r4jo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZyHC5U0l; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZyHC5U0l" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E81E1C32782; Fri, 24 May 2024 16:31:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716568273; bh=lmxCtQTHyu0kw+aS06uj4cbDABnxfvXo+bEFeYsiE5o=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ZyHC5U0lWULT1nZ+KyfNDGb7NCNC2RkpnvXkmv8VwGvJi7FlT4EWc/fznAZ6P4fAU SOoyvu4/mLzfwN19zSvsHKeQtEeA9HOAU6jz41H3RgcUjFq7b9k3zwXiPLEvdKAsba 14XibfJmvwFQMlWAZUolXMG21B8a6Gwo+Clw4wd7dyiLO5IJYiyHTilzy4nZg8+K5A DZkPFpaKTNj0vdMEBvJni+KCG2cMupNyFX4YeXvTk/SCwl4Xs1A4+BDcWahO6RgyEp eZ88jWvHrKIYlBxftIpa5tVAUyO8NTkeQqaprXE/GTb2dXWHDlDA1e+NOfhaTwUUj9 68ITkw0X4UpGA== From: "Matthieu Baerts (NGI0)" Date: Fri, 24 May 2024 18:30:57 +0200 Subject: [PATCH net 2/4] selftests: mptcp: simult flows: mark 'unbalanced' tests as flaky Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240524-upstream-net-20240524-selftests-mptcp-flaky-v1-2-a352362f3f8e@kernel.org> References: <20240524-upstream-net-20240524-selftests-mptcp-flaky-v1-0-a352362f3f8e@kernel.org> In-Reply-To: <20240524-upstream-net-20240524-selftests-mptcp-flaky-v1-0-a352362f3f8e@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2352; i=matttbe@kernel.org; h=from:subject:message-id; bh=lmxCtQTHyu0kw+aS06uj4cbDABnxfvXo+bEFeYsiE5o=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmUMDIGq202cDziEiiivGSTcaxZRm5rmgu8t6TG unZguP60HiJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlDAyAAKCRD2t4JPQmmg c7cEEADkYpxFzx84a5Yut1is7xie+THY2wRF+PZBenv6fscupaep30FLcJj5jFoWD0/CvqYe3lE 2VjxHCLQUWiiuNm5apn1jYqboO2lGOtVHbDRF7bUYa7jhpBFwWor/pt29etcKQj9cTT4wbQu8H7 cjo7tIzn+w3m06UU5K27WikXKvJ/Oz/0u4mGyAupSbQzULmfw1gXj7pGyXLtDSgDQXF+uyCyV1k idBTjxJehGf87jgKmQTJv+6OUk83I0VBTgiHfCzsQxxIG5BCugj8iltDXgdl8DL3NDxKaIvjBqZ Fa2GUSUEKfP2EtTD2TGqaFsUpeK87ASpql2PyEc0ZTrdAQTy38pMKV8cJo+lTRCeFV3N2MDJGdD BD13MM+QoDMmHgSLWlKkhqb0+CPwTWK/SIc/gTZmCkWc586D441mT+7p8fMo6+l8dHAf6GUvPYm gHrbbFqYC8P/UjVOdRd1O7u6N+mOqR4+z9Yvj5j5PlUBeOcQsfUXF+Dy+YsWdz5ytQviArwnuzq LuV/I6rcE9vZSlQJhRe03RbMrNJPHig4YIDUrGjhh6jQxBPDfLWaMklH3iezr9y0lt9RQVeYERr FTWqCjrtsLw8XUzSQsXa6786L0q/5CLkEVVDKYQeev5U4FkUsK0uXlJC5m6JYdwoovEn7Ehqddz qHTXTGs1rN8Mtvw== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 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 Signed-off-by: Matthieu Baerts (NGI0) --- 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 4b14b4412166..f74e1c3c126d 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -244,7 +244,7 @@ run_test() do_transfer $small $large $time lret=$? mptcp_lib_result_code "${lret}" "${msg}" - if [ $lret -ne 0 ]; then + if [ $lret -ne 0 ] && ! mptcp_lib_subtest_is_flaky; then ret=$lret [ $bail -eq 0 ] || exit $ret fi @@ -254,7 +254,7 @@ run_test() do_transfer $large $small $time lret=$? mptcp_lib_result_code "${lret}" "${msg}" - if [ $lret -ne 0 ]; then + if [ $lret -ne 0 ] && ! mptcp_lib_subtest_is_flaky; then ret=$lret [ $bail -eq 0 ] || exit $ret fi @@ -290,7 +290,7 @@ 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" +MPTCP_LIB_SUBTEST_FLAKY=1 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" From patchwork Fri May 24 16:30:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 798791 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C12D130A7A; Fri, 24 May 2024 16:31:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716568279; cv=none; b=WhU0lm9s8OazYKj+xX9OmRaYLY/TJhLeVRUc2FTNAaPTL+9G5wlf6xiOrX7sxLrhwxHiXiGGFY6lirCouhhSZFan24ryUl6b9IhwaYqJBxsXnJF19HrOohMedED0dStXIC95pmjj5oC5QH3doOjJTwosFyrvl3AJP6dXq6i/pYY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716568279; c=relaxed/simple; bh=Qqr2iBCRG6XI9ufgkFxNFbP4uEkYYEK3OUdo+52EU5k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sggQlA9YpatIh8I+UU6jnMe2lf3X82v5MEvOaihX9cMWo2Dkp2Et5rcm/fZNBtEpgATtkhnl4RMqf6hYvyq16/FTiSoDRAsxWCMQC9o35BWIALA7pwBGoA1QB3v09pZpZtwOJ6qJQBnQHrY4/0UBoW0FKVhessMYW/p2zfVYybE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZkLHv8Pk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZkLHv8Pk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BCF83C32782; Fri, 24 May 2024 16:31:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716568279; bh=Qqr2iBCRG6XI9ufgkFxNFbP4uEkYYEK3OUdo+52EU5k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ZkLHv8Pkxn9mUY1HnezEPGJrpbRVXwMsJKsLmhps7nNgbLnZlHPJ2COZpcYc9DmOy My3NvyHfjvsXK7AIjTX0QaRzlVeMebK7oKI/+Cjx2imHnCJSN8rzalz/+RbJ2m708v COTEHrmlM0UVpnXInU7aqauuglaUhUHHdT+evF5awhF82hHpNu83hCrsqE0gFIRLqX N3/WsfxQaDZTs0nTsVtpWx/7IcsKZQ/R0m0rYfLoMG6/oQ5I/I674IxDIjoXLIAFSw pTnJ2J21xPQp2eRmyqx0JYzVxSZxSYFZVryxUL0IGs8IySkScXLuZJyTcg1TYFXn+O eU81odHgpO5JQ== From: "Matthieu Baerts (NGI0)" Date: Fri, 24 May 2024 18:30:59 +0200 Subject: [PATCH net 4/4] selftests: mptcp: join: mark 'fail' tests as flaky Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240524-upstream-net-20240524-selftests-mptcp-flaky-v1-4-a352362f3f8e@kernel.org> References: <20240524-upstream-net-20240524-selftests-mptcp-flaky-v1-0-a352362f3f8e@kernel.org> In-Reply-To: <20240524-upstream-net-20240524-selftests-mptcp-flaky-v1-0-a352362f3f8e@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan Cc: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1492; i=matttbe@kernel.org; h=from:subject:message-id; bh=Qqr2iBCRG6XI9ufgkFxNFbP4uEkYYEK3OUdo+52EU5k=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmUMDIBXYVVB2frHAK+KWc1s+dBlNhOBQI503dG bU6GUd31Z2JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlDAyAAKCRD2t4JPQmmg c8PxEACbtIqm+60nrixYuPj6dYq4NRlkY8bPpYQrEXeHdCrQ6Vk2slfEFCEnDvou0cJ1usAFtWq MGeyoOvTeECoRrkZagFQEoMqrnFu+HeAR28qMbifCBuQCYhZS52vb8tD/xL8SiRrkN/jrDNg0JM bXQc5gUH04tNcfOzfzt9Vu5AeinUN38pmcgb7ajIMnBVTuh0Hpz15imOX9yAWThfDeJ4q9zJBh1 CSDQNLAoEdxQdpQogCgFWKApNu5t+E9PzSXVkhfJrs25+Ls3fOzyinVa4gFx0YHZHOQW4UWYJIb YBd+CO9Yyv/k29CRo3jZIzBk8egSrXYFvbvW82Fr1lSoLOqtVZS78jsViYS6xuKCPyyBYc9pqnm pfz9q7XEb1bZzebJyPaf3NNJi8zR0MntQFOFNRvDWWeP6pjAlNFeIG3G0HB2rS0UvHezsdMKvut aD2cy1UUKz4Kcdy2NpMEceslq+rPMNrWiq59FR/3kBODVhtIpZ8bOaQDYgyrJ6j8JG0bh87Jq+a 9AaQeZX4XC8lcxh/rcRVsnnJO91g9YTiGKiGHSt/4CZWkLVMRY0Ny5eDPKGdouLv1PKJrpiWO3w 9AN6s3koBl/TMVHqERKd4t5btpFremb0YjLE5hB+zq+IK20uEKymobrYKN7rl0bTGqkc2ozkMTd AfWPlHr+CsBemXQ== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 These tests are rarely unstable. It depends on the CI running the tests, especially if it is also busy doing other tasks in parallel, and if a debug kernel config is being used. It looks like this issue is sometimes present with the NetDev CI. While this is being investigated, the tests are marked as flaky not to create noises on such CIs. Fixes: b6e074e171bc ("selftests: mptcp: add infinite map testcase") Link: https://github.com/multipath-tcp/mptcp_net-next/issues/491 Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index b869b46823d7..2b66c5fa71eb 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3101,6 +3101,7 @@ fail_tests() { # single subflow if reset_with_fail "Infinite map" 1; then + MPTCP_LIB_SUBTEST_FLAKY=1 test_linkfail=128 \ run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 +1 +0 1 0 1 "$(pedit_action_pkts)" @@ -3109,6 +3110,7 @@ fail_tests() # multiple subflows if reset_with_fail "MP_FAIL MP_RST" 2; then + MPTCP_LIB_SUBTEST_FLAKY=1 tc -n $ns2 qdisc add dev ns2eth1 root netem rate 1mbit delay 5ms pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1