From nobody Sat May 18 23:23:49 2024 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 9C90CC13D for ; Wed, 13 Mar 2024 03:13:12 +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=1710299592; cv=none; b=Ym92TC9JjkrdlLmg6/gT3RaezynrPLsqvqLRuXCd6HYnHSqFmpx9qAsgv1L7TpfYjaqYNoxtAYUx9v9lQwfJHRLWLF+EIKWb1xMDGz2lnhBb1dcc2yAgoZ0cvAa0lZRCATOd8TRSkTAVzfpAYC6FC1Y6EqgW95kHRHUDwB3rg/g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710299592; c=relaxed/simple; bh=j9EXe1WutUxjz98ImRCc3F8ALyEz+psFS2lmjCxQcsQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=i7x+xtFO8jzNprkLH6lA2RyVc5moeH2Wy9s7NCavXb+t5IOdiimm/hIY3iGwGhOSCm2SLFp/ucYtr3+Wtd+9fLzIqcGADPeBTAgio77vtJcBVMz9VsZapdJZCC1C5hXnUKRgZVCOiJVlEapaAq9WX2CsTC58DSOD0qxH+icrjRQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gegXZZBr; 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="gegXZZBr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1B08C43390; Wed, 13 Mar 2024 03:13:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710299592; bh=j9EXe1WutUxjz98ImRCc3F8ALyEz+psFS2lmjCxQcsQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gegXZZBrMmTFlYrrqbQCi5g6QElUaR56HYRbGGzB1jeah8sg/FPPUH4zpUMONB8M/ 04JJ6QFchUeGJtUTN7spdPfTxMNX/KYdZYJFYqFZmXpNDgpkba7qUtafAKeMlQUssD DaHzWOB1/nYG/uvqJXYbs4xmjA/kXUt7UyOog45j8mamZWXquoXf2DzIFcGbwGwr/k S7AfE0tWBtPrpn+zszYzRFCU05fJKmO/EQrJLm6tdsq8fuCqrCAfIEoSjMo+MJx1Kk myWdCRRU7v10SNtCbyH1P369/7LboJJxQ87AemGehvpW/kleNHsccHWS7/9X4dDSkX w41RumJ1g0KxQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 1/2] selftests: mptcp: add tc check for check_tools Date: Wed, 13 Mar 2024 11:13:04 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang tc are used in some test scripts: mptcp_connect.sh, mptcp_join.sh and simult_flows.sh. It makes sense to check if tc is installed before running these scripts, just like other tools. So this patch add 'tc' check for mptcp_lib_check_tools(), and check it in these test scripts. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 2 +- tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 6 ++++++ tools/testing/selftests/net/mptcp/simult_flows.sh | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 4c4248554826..90c1c5c9caca 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -147,7 +147,7 @@ cleanup() =20 mptcp_lib_check_mptcp mptcp_lib_check_kallsyms -mptcp_lib_check_tools ip +mptcp_lib_check_tools ip tc =20 sin=3D$(mktemp) sout=3D$(mktemp) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 5e9211e89825..8f95e730f4e1 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -142,7 +142,7 @@ init() { =20 mptcp_lib_check_mptcp mptcp_lib_check_kallsyms - mptcp_lib_check_tools ip ss "${iptables}" "${ip6tables}" + mptcp_lib_check_tools ip tc ss "${iptables}" "${ip6tables}" =20 sin=3D$(mktemp) sout=3D$(mktemp) diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index d529b4b37af8..1fa05405f65e 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -384,6 +384,12 @@ mptcp_lib_check_tools() { exit ${KSFT_SKIP} fi ;; + "tc") + if ! tc -help &> /dev/null; then + mptcp_lib_pr_skip "Could not run test without tc tool" + exit ${KSFT_SKIP} + fi + ;; "ss") if ! ss -h | grep -q MPTCP; then mptcp_lib_pr_skip "ss tool does not support MPTCP" diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 68ee92eccccb..72ea563c923c 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -45,7 +45,7 @@ cleanup() } =20 mptcp_lib_check_mptcp -mptcp_lib_check_tools ip +mptcp_lib_check_tools ip tc =20 # "$ns1" ns2 ns3 # ns1eth1 ns2eth1 ns2eth3 ns3eth1 --=20 2.40.1 From nobody Sat May 18 23:23:49 2024 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 5E823C13D for ; Wed, 13 Mar 2024 03:13: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=1710299594; cv=none; b=c+T6E9wsLzUSo89tqAw5ilmbdszU5srNrLiDGi+Iq4JzzOk9mGAaMto6oBrO/7gB/nnuu9SQNThMz52KNN+XmHbsdngvWYUDwHFxcncug8oHAVDdv6OGSH6gG14bUIeRoTUUd22FoBI7Yzm9q3xzAG+kTxtKeZLo3YMSM/PCg9g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710299594; c=relaxed/simple; bh=9TldoPRGOHizoHdV5Hxc2yQFAg9h/bFUtboZBf4pWvw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hg8LK3BMEEQ817YtKVmNkIbmrE4DnV0yuiAk4XcxIEFzGpbA2lCEGQBvB4w1QKs3nAd2LcEb7gEhafMgTLre4m1byDBBt9tkiQramJRY3Fa2O2BxRnE4qr+8i4YVZkfMiNeBi2dG/wat92HwMXdAXaQuxJ9GA3M4qx/xa9pil8w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=A8ZGZ8vK; 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="A8ZGZ8vK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE24DC433F1; Wed, 13 Mar 2024 03:13:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710299593; bh=9TldoPRGOHizoHdV5Hxc2yQFAg9h/bFUtboZBf4pWvw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A8ZGZ8vK1WDKnqfYn8SWalhMcUEr77kWLT3/pNIUESgz+p/wiFHj9MRg0gmwCJUhy V0BOcIznZh8XUV20CbTBdBfypKtwFQx8pZvHrc9uYIxMzECk+aqUpJJLYCDlY2rq/P shvfOxCcohu1GCRpMn4OSnmgieNbgmwCGJKIA1k0+ReLIgQkSnQZwUhi6KHrYIY7iU iSTmrI/z6wFCHZfjzIEwRwx2fAI2OziCIsfDXZV3HV8vaO+rAtDrEjxcbCLduQYju3 8Nemmiho1RZ+Zl6n3cYOri+YdRmnPSjhb6tElDQWfvsUYoi/gQ2Z8M5b9/fMTTuBT0 vk17jgB9xzFHg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 2/2] selftests: mptcp: add ms units for tc-netem delay Date: Wed, 13 Mar 2024 11:13:05 +0800 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang 'delay 1' in tc-netem is confusing, not sure if it's a delay of 1 second or 1 millisecond. This patch explicitly adds millisecond units to make these commands clearer. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 6 +++--- tools/testing/selftests/net/mptcp/simult_flows.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 8f95e730f4e1..70621cbbab09 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -125,8 +125,8 @@ init_shapers() { local i for i in $(seq 1 4); do - tc -n $ns1 qdisc add dev ns1eth$i root netem rate 20mbit delay 1 - tc -n $ns2 qdisc add dev ns2eth$i root netem rate 20mbit delay 1 + tc -n $ns1 qdisc add dev ns1eth$i root netem rate 20mbit delay 1ms + tc -n $ns2 qdisc add dev ns2eth$i root netem rate 20mbit delay 1ms done } =20 @@ -3212,7 +3212,7 @@ fail_tests() =20 # multiple subflows if reset_with_fail "MP_FAIL MP_RST" 2; then - tc -n $ns2 qdisc add dev ns2eth1 root netem rate 1mbit delay 5 + 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 pm_nl_add_endpoint $ns2 10.0.2.2 dev ns2eth2 flags subflow diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 72ea563c923c..e129fcb5a598 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -216,8 +216,8 @@ run_test() shift 4 local msg=3D$* =20 - [ $delay1 -gt 0 ] && delay1=3D"delay $delay1" || delay1=3D"" - [ $delay2 -gt 0 ] && delay2=3D"delay $delay2" || delay2=3D"" + [ $delay1 -gt 0 ] && delay1=3D"delay ${delay1}ms" || delay1=3D"" + [ $delay2 -gt 0 ] && delay2=3D"delay ${delay2}ms" || delay2=3D"" =20 for dev in ns1eth1 ns1eth2; do tc -n $ns1 qdisc del dev $dev root >/dev/null 2>&1 --=20 2.40.1