From nobody Wed May 15 12:46:25 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 BC05AA923 for ; Tue, 13 Feb 2024 04:14:41 +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=1707797681; cv=none; b=k5NdrbRcgdeFyCV9G7Ju0Vfa4brQfbph70YX3MtbWIc1kmOMK3Ql5Z5sbMYb/NXTt4xm/IVjbAtdFL8fgEYimx6UHpYsdjMrGjApN2ZSMyrbcmJNxHiRbPBZNcu3cu4G1uFXur/5FSsukeXRKWjFsvLN3ZxyHVa4MrLWyl8Zx+s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707797681; c=relaxed/simple; bh=H4IffA2U5o9sY524ccj/Ls4urMqKJ4LUD7sRZbuHjfM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=i3i0Zshg+SyhlIrAjixashL0AjWz8Acs00nVB2UAuK5zxPyNHCWFaJwCQbeOyF6mzK9w7dCUuubDe4k/nKRPjZ0xSyGCc4gXQyYvf5oPvUheyfL3r+4sHKkynCDXuB5T6jSVqvkWuNR2mEMeOFj+QEIuFF3NzeEWBzaMPc7y9K8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mR3QuTnU; 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="mR3QuTnU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78C60C433F1; Tue, 13 Feb 2024 04:14:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707797681; bh=H4IffA2U5o9sY524ccj/Ls4urMqKJ4LUD7sRZbuHjfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mR3QuTnU6O7VwljFCNloLvLH9tMbILGZX6hqJACt1NbeYPgKeiNzriQWBTWeneLXV Nc8e6VxbtbZcTMYoCQnW4Gmi6HhAgeyvbE9KvdmwAf32yfD95L1/6oigKT8AydY89L ljlF7s386DDozNJvHHnd9IzEmx55guTY501oC0z9+WIaczX5eDvSiHzLcSN8OXkc7A /B24nQ6oPvq3PBi4eAv7w58myLF8D+Ry9mm3CVercioTUCAmOzsmNwJ+nMm3fgBpNU Q6WW0+Gclbe/d/pZ1YYQ72J3OSp0eYF+Nk5cQ/gvJQtKOktQe8fiOj1YvqIB/I+fw2 hXycuS6O6NZxg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-net 1/5] selftests: mptcp: netlink: drop duplicate var ret Date: Tue, 13 Feb 2024 12:14:24 +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 The variable 'ret' are defined twice in pm_netlink.sh. This patch drops this duplicate one. Fixes: eedbc685321b ("selftests: add PM netlink functional tests") Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/pm_netlink.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 8f4ff123a7eb..ed1e8380838a 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -28,7 +28,6 @@ sec=3D$(date +%s) rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) ns1=3D"ns1-$rndh" err=3D$(mktemp) -ret=3D0 =20 cleanup() { --=20 2.40.1 From nobody Wed May 15 12:46:25 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 CC8A4A923 for ; Tue, 13 Feb 2024 04:14:42 +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=1707797682; cv=none; b=Vreuhr9yVSeaWIEtY03pmksEDCaQLVppghPgnawV3wp0iKS48pPQ4Sp3hOxee40u1JJNJYh+bU7WDuNrE2VyWk/sL7UJSLTOZFEzOI4ELPe36a10WFj2fwYzdgqd+rWbP6TU9l9rstE6ON4fvNkznuXgNv0NXEp804VR3kFFt38= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707797682; c=relaxed/simple; bh=3BsDj69c+6JGJClU6Gt7cE7AFv3uJrGBrc61MwrVxwU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Eznay8oWiwan3rFpmPvkmqTu4pAb+3EbEglFk6+qRhfzlgxaoEOjIjZDP7Vl0TNC974g8Wche5KavOjFwKHg8aeOtR4LzVsxahkm5ChPlXyUsUnDPzbHdy6nCSBdLmeXVYCvOchzrYkZ1AmvIpaGts0ssYB1BdftRjOh9UNM0PI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=utBMwWIC; 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="utBMwWIC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 92242C43394; Tue, 13 Feb 2024 04:14:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707797682; bh=3BsDj69c+6JGJClU6Gt7cE7AFv3uJrGBrc61MwrVxwU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=utBMwWICe4ZGqaKRCodpwtrdtbHow2zmy1/CEnr6DrNXXkw4VVhHivIabnMZ7XSzm d3GVpOXSOd3F0W0lnbs+JRpmsvzmQ0aLeFkBdMqg5R/6VsVXY5lSqptWqPBXZVRnrg 3bGhY/I7+iEHfN3CVN+h9QOlQz6V8zbP6Qw1tpK65ITHLLeQMV1olDkpLay2d9J1Fk ftFralf4X9ds+S/5uMsighbVA+4aExxGI6inAwwsIJRHG+TSl/OGr189re5rv4ovtW vEQvvq5euCGcVvJsKFcflPdru+99YUknFFvFKc3IrNV7xRBTDH/gmV5xpc6e4wT9Bc 1NLtMljBc1hCA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-net 2/5] selftests: mptcp: simult flows: define missing vars Date: Tue, 13 Feb 2024 12:14:25 +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 The variables 'large', 'small', 'sout', 'cout', 'capout' and 'size' are used in multiple functions, so they should be defined as global variables. This patch redefines them at the beginning of simult_flows.sh. Fixes: 1a418cb8e888 ("mptcp: simult flow self-tests") Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/simult_flows.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 619be0e1acf5..3a003d47fccb 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -16,6 +16,12 @@ test_cnt=3D1 ret=3D0 bail=3D0 slack=3D50 +large=3D"" +small=3D"" +sout=3D"" +cout=3D"" +capout=3D"" +size=3D0 =20 usage() { echo "Usage: $0 [ -b ] [ -c ] [ -d ]" --=20 2.40.1 From nobody Wed May 15 12:46:25 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 E58BBA923 for ; Tue, 13 Feb 2024 04:14:43 +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=1707797684; cv=none; b=f8d6t0qNBQZdEoWRDQwNAb7EtWX3jvTF+tPED1GaYFKyRNnoFtVSfV5/CK9b3fPrQHkSP/fVA5TcbdEApr20RqFIRMq0uDb2PtiYORCW+P7F2zgkQO8ADaiiKjFwW6k+MaoMV5EWu+29oMIE64erMJlC0cBBpW58qf1D6vFL2Xs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707797684; c=relaxed/simple; bh=YKo5QkEnKiFzKdLEwklZRSdVPoqrxs9UOO3iTW4tMMc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=FdejnZFMl4aH2LUpFEaM8jmJw/OXREVbm1rH6O1hO4OGmC1Syfe8UQgI82ACh7FFZ/JbO5LOqj/eSR4sdfsevwUBeB5Y5K3gItao1A8ByyVqIPI9s8njmIyd0gzAdwSc3qxcweh7PKO3h0cwIM5i87QcwUzDR+3FpSdAI/rVEzk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=V4L5FJ01; 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="V4L5FJ01" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1DE3C433C7; Tue, 13 Feb 2024 04:14:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707797683; bh=YKo5QkEnKiFzKdLEwklZRSdVPoqrxs9UOO3iTW4tMMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V4L5FJ01gyGHMXkrcfnVfOiR7kIetNomav/54sjL2zKjt/eRZl7sdwQPaIgcCZElE ggV35RCWlNzgbMPmECNFU3Hy4VjKs9WlXZ2Ikp2FIEpAGDZE79I2LJ6N+KhxMYGFzc uBTFCWZDCb80HVLueWRAjyZmPBZfRBWWJ01roxqwHA9Tdb8KKYQb1+TNA3/adz1gHp f7VPrkn27EpGiP2eM/DbcpcDTMMpWgfdVygbpYXRoeYsBE2nno/qid5MbvGphOEk6f ZucDmYxwmImlfe2Mp6Mlbpp/BSfq5DDeB9Nvenie6qa7hLD/qjbZiJSzAh3Y9YNN85 QvWV3WGHoV4DQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-net 3/5] selftests: mptcp: add ss mptcp support checks Date: Tue, 13 Feb 2024 12:14:26 +0800 Message-Id: <8f1e695491d199be96ea6a7a9e38ffd45a30388b.1707797566.git.tanggeliang@kylinos.cn> 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 Commands 'ss -M' are used in scripts mptcp_connect.sh, mptcp_join.sh, and mptcp_sockopt.sh to display only MPTCP sockets. So it must be checked if ss tool supports MPTCP in these script. Fixes: 767389c8dd55 ("selftests: mptcp: dump more info on errors") Fixes: c2a55e8fd80f ("selftests: mptcp: dump more info on mpjoin errors") Fixes: dc65fe82fb07 ("selftests: mptcp: add packet mark test case") Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 6 ++++++ tools/testing/selftests/net/mptcp/mptcp_join.sh | 6 ++++++ tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 7898d62fce0b..c49351d85cae 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -154,6 +154,12 @@ if [ $? -ne 0 ];then exit $ksft_skip fi =20 +ss -h | grep -q MPTCP +if [ $? -ne 0 ];then + echo "SKIP: ss tool does not support MPTCP" + exit $ksft_skip +fi + sin=3D$(mktemp) sout=3D$(mktemp) cin=3D$(mktemp) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index c07386e21e0a..5ca1512c3eae 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -161,6 +161,12 @@ check_tools() exit $ksft_skip fi =20 + ss -h | grep -q MPTCP + if [ $? -ne 0 ];then + echo "SKIP: ss tool does not support MPTCP" + exit $ksft_skip + fi + # Use the legacy version if available to support old kernel versions if iptables-legacy -V &> /dev/null; then iptables=3D"iptables-legacy" diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index c643872ddf47..1b6ecbeda5a1 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -96,6 +96,12 @@ if [ $? -ne 0 ];then exit $ksft_skip fi =20 +ss -h | grep -q MPTCP +if [ $? -ne 0 ];then + echo "SKIP: ss tool does not support MPTCP" + exit $ksft_skip +fi + # Use the legacy version if available to support old kernel versions if iptables-legacy -V &> /dev/null; then iptables=3D"iptables-legacy" --=20 2.40.1 From nobody Wed May 15 12:46:25 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 DA448A923 for ; Tue, 13 Feb 2024 04:14:44 +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=1707797684; cv=none; b=LzqRoyscmz2JP6UxvrEtlRwAcgITt3G3jDcPBuyscSEHZzU2UM0aRkfWOFZaAtzfNQ5Pqw/T9g1QNVcIU2mvS84CPzDGFbNjJ8cfKGFkFZM8DGuf7L8+WWhwF7F/IbnLxenLqMb8kZNWgRuv+uleUmV+Q7dWCTOh0lyzbza+TnA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707797684; c=relaxed/simple; bh=SykQKnGYfbhFlzdD0qm/eExjndmb2FwyNJav13odpFM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Y7BcDA7twW98JsZSfCyHz6+sjZQ006WxR8OOlASYadkFw+VMNj0IbHYKtjyJC7VFsvNucV37IMLj/oVPuUr7HJwbWZhW1a2ij3c+g568Z9FQpimxyfIDzBA5HNOP44vl+3QT8G47f7fTsvS4MqMpeVb1geaE3T2eq7PM07YIGpo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cRGEtrsG; 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="cRGEtrsG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B169EC433F1; Tue, 13 Feb 2024 04:14:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707797684; bh=SykQKnGYfbhFlzdD0qm/eExjndmb2FwyNJav13odpFM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cRGEtrsG7l83uZmjyN+njenEwAEB+FRdqWLId/hzCIENKx5ubZs10eZblKPB/2xic pDthcE1xWa/HScGz1nV8wImzo4ScfcsAwQTssnZoLVFTsFqDcb8Rt2C4/bHMlolKDl ht2IXHhzQisTMpWsT+8qrmW78rf5A9OgEr3RnMpPQSrVNFl0EKXZ/Ll0P/U9zpMvIO aDvn08WOmy04NAu0JYfYu9QZQ6O4e5i2x/LtL0/40pxv13OBHZZgGXf2iffga9OcUa H/JOLwzxhGd8rpuYuYzMNFfiZoH7KMJKLrvkGoQpi1yFYdfnstjuQUCXa3AaLo4diG 0lMPFJj1+pqtA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-net 4/5] selftests: mptcp: join: change capture/checksum as bool Date: Tue, 13 Feb 2024 12:14:27 +0800 Message-Id: <616dadb2e22ba3e178d8baef90f43624cdc6e85f.1707797566.git.tanggeliang@kylinos.cn> 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 To maintain consistency with other scripts, this patch changes vars 'capture' and 'checksum' as bool vars in mptcp_join. Fixes: b08fbf241064 ("selftests: add test-cases for MPTCP MP_JOIN") Fixes: af66d3e1c3fa ("selftests: mptcp: enable checksum in mptcp_join.sh") Fixes: 3c082695e78b ("selftests: mptcp: drop msg argument of chk_csum_nr") Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 5ca1512c3eae..b3dc17daf574 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -29,11 +29,11 @@ iptables=3D"iptables" ip6tables=3D"ip6tables" timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) -capture=3D0 -checksum=3D0 +capture=3Dfalse +checksum=3Dfalse ip_mptcp=3D0 check_invert=3D0 -validate_checksum=3D0 +validate_checksum=3Dfalse init=3D0 evts_ns1=3D"" evts_ns2=3D"" @@ -100,7 +100,7 @@ init_partial() ip netns exec $netns sysctl -q net.mptcp.pm_type=3D0 2>/dev/null || true ip netns exec $netns sysctl -q net.ipv4.conf.all.rp_filter=3D0 ip netns exec $netns sysctl -q net.ipv4.conf.default.rp_filter=3D0 - if [ $checksum -eq 1 ]; then + if $checksum; then ip netns exec $netns sysctl -q net.mptcp.checksum_enabled=3D1 fi done @@ -386,7 +386,7 @@ reset_with_checksum() ip netns exec $ns1 sysctl -q net.mptcp.checksum_enabled=3D$ns1_enable ip netns exec $ns2 sysctl -q net.mptcp.checksum_enabled=3D$ns2_enable =20 - validate_checksum=3D1 + validate_checksum=3Dtrue } =20 reset_with_allow_join_id0() @@ -419,7 +419,7 @@ reset_with_allow_join_id0() setup_fail_rules() { check_invert=3D1 - validate_checksum=3D1 + validate_checksum=3Dtrue local i=3D"$1" local ip=3D"${2:-4}" local tables @@ -1023,7 +1023,7 @@ do_transfer() :> "$sout" :> "$capout" =20 - if [ $capture -eq 1 ]; then + if $capture; then local capuser if [ -z $SUDO_USER ] ; then capuser=3D"" @@ -1125,7 +1125,7 @@ do_transfer() wait $spid local rets=3D$? =20 - if [ $capture -eq 1 ]; then + if $capture; then sleep 1 kill $cappid fi @@ -1513,7 +1513,7 @@ chk_join_nr() else print_ok fi - if [ $validate_checksum -eq 1 ]; then + if $validate_checksum; then chk_csum_nr $csum_ns1 $csum_ns2 chk_fail_nr $fail_nr $fail_nr chk_rst_nr $rst_nr $rst_nr @@ -3670,10 +3670,10 @@ while getopts "${all_tests_args}cCih" opt; do tests+=3D("${all_tests[${opt}]}") ;; c) - capture=3D1 + capture=3Dtrue ;; C) - checksum=3D1 + checksum=3Dtrue ;; i) ip_mptcp=3D1 --=20 2.40.1 From nobody Wed May 15 12:46:25 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 943C4A923 for ; Tue, 13 Feb 2024 04:14:45 +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=1707797685; cv=none; b=R5tlgmcHKzjVTKzBYJGnhXlQh1E98b0/usziGolL4I78LGpv3bRfidwoKiUdQUxeXWbVogvPsPxQFUSbz9j3f7uwvlVNaEDnfP/LctPUqmgc2JfebZW09fq/DtLly795e2tiQS18SAHsZHcgUGc5z/XbysFtYEJb3RHw8bEWWJs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707797685; c=relaxed/simple; bh=84fXeDK2G++UAFMzoReGrvk1kvOjoUOCpZB2wpd8Za8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=U0WfD8SG1mMIGMO4LqyCU75J0BQr/guVB2S6oqsk3f9d9OLFIYWKeSuM56ZMNtNvjT5NhRnCsxPXFYHzhmioj8m1Ih6aYx0Avg8E3STcMKWeBRvAap0l2rvkIB/K0h7BI8+6iS2g/IkOEnCAqTTZXHKkxO2jNN++cFq0ip/9KVg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hWUSjSUW; 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="hWUSjSUW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2291C433C7; Tue, 13 Feb 2024 04:14:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707797685; bh=84fXeDK2G++UAFMzoReGrvk1kvOjoUOCpZB2wpd8Za8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hWUSjSUWyjEbKm0DBo063kAaQ14zKWsmHwQGr2E9H2Om4v6Otupv94JsBoIl0GZ0o efg7EjP65qdhXM7jhfFImcNGAbn0fUo3g7yoyvmNQkvmwDevoRJRIEpctPRHb51Y9F N54QuElUpYiwE3DD4Eg2aT07bRS6hyj6keWDab1A+08T6pc6P8qSfNSB9b3/TkOg34 P4wKOmov8piH2mqga1oeIFBZylfN6XdC3itQhjKztKTmxKYd2v5z8syhx50u1QWKpx 7dQIRGmC98W5GB0LPaO3xOajov3qKXAvnRycz3OzIQhEoGnCqglPeEUTNQO7xZXlI/ dkO+x+N4g2aIg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-net 5/5] selftests: mptcp: diag: change timeout_poll to 30 Date: Tue, 13 Feb 2024 12:14:28 +0800 Message-Id: <874a6cca73e30babfaa5f6036a929314bf1a689c.1707797566.git.tanggeliang@kylinos.cn> 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 In most scripts timeout_poll is defined to 30, but in diag.sh, it's 100. To maintain consistency with other scripts, this patch changes it to 30. Fixes: 5888a61cb4e0 ("selftests: mptcp: launch mptcp_connect with timeout") Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 04fcb8a077c9..3505c98be127 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -8,7 +8,7 @@ rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) ns=3D"ns1-$rndh" ksft_skip=3D4 test_cnt=3D1 -timeout_poll=3D100 +timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) ret=3D0 =20 --=20 2.40.1