From nobody Sat Apr 20 13:36:15 2024 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 49FA11A619 for ; Thu, 10 Nov 2022 17:59:30 +0000 (UTC) Received: by mail-ej1-f43.google.com with SMTP id n12so6900505eja.11 for ; Thu, 10 Nov 2022 09:59:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wScGSn18UY93sejCAJODduUbPLYxpyPQE6Hravy+Cqk=; b=Va/rPA22T/FFVCdcK12phhM5MdXhSlSQn2KiwDzlmmJhLffjiH56N6pJYIiTV03z1W Xsgx6feRKXxSjGmg/KfofrpZqtLOk8h8UgQfLXYzNgOUMFBWyWdlATRzGJZ+svLwDwMf bU5q148h7eruNGQhtM3Lg04NtRO+Wjn+703MsZI6TG5yx0+xJukChVOktbsMTUe4oglu j6u9oQ4uRjZM11oWlKolFJlmfic/ctgK5byB+Nr037yxQRjIPgtvbE76arV6gKNl1Bx+ kI+uvC/3ZeehX3nWVkMqXO6JxHBXv6mqK63ohSfhGecU4UtjwmdY3Y+D/b1i8vEbKrO9 C8Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wScGSn18UY93sejCAJODduUbPLYxpyPQE6Hravy+Cqk=; b=Zw23UhhrGKmFHUO7J4UY03ppxAbeL4EhzvHchTBaVPDZKCnoXtT+Dc6AZIqRGU4ydK tymmsf+OuRwNhiVsEVrWbiuzaQ44kBMgm6NXqnpn/mHPlyhB5kANV5zM1aP25uwBt2Tk slTDGEDEBv6aRxcR2IwISRFQbbaGA9/9CED9y7VMgIvMomGub0BxwA+nBDZBae5Echwp x3nBzqJD3Ha8lTE/DJphu62zdBba4rcoXCCRhC5c4JGjaY8C/UMklfjNWm4T8Qe8AhHQ rcpYG7WVt4rf6Lw/bg18lCifotcpG+buIvMbtOAwMTKM7B71rRW0meSDdXIGAJLug/pV Kg5w== X-Gm-Message-State: ACrzQf1ccncgbqwThIbNuJeEepPW8P9lxcxxPoP6zVsaYEKcbSAYxNmZ psK+kmEBdp7zcau8r5Oyf+/Dhubp6uS1c8TyGp0= X-Google-Smtp-Source: AMsMyM6Nx00drsXj5R7tQvHET0Pjbq+2dgB4vr+cV7Y6UnAwTy56ciE/s72HadAKjKnfGRMBaRdWgg== X-Received: by 2002:a17:906:3502:b0:78d:3862:4488 with SMTP id r2-20020a170906350200b0078d38624488mr3198288eja.683.1668103168944; Thu, 10 Nov 2022 09:59:28 -0800 (PST) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id c8-20020a056402120800b0045726e8a22bsm100765edw.46.2022.11.10.09.59.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Nov 2022 09:59:28 -0800 (PST) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Matthieu Baerts , Geliang Tang Subject: [PATCH mptcp-next 1/2] selftests: mptcp: clearly declare global ns vars Date: Thu, 10 Nov 2022 18:58:56 +0100 Message-Id: <20221110175857.3953994-2-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221110175857.3953994-1-matthieu.baerts@tessares.net> References: <20221110175857.3953994-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1375; i=matthieu.baerts@tessares.net; h=from:subject; bh=+mwGtAUnoaes9Ul8bPfs3aARTrtWZde8GbZFxCHxuWs=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjbTuuWV2aKTU3sbEI8WTq0rfBwb2F8tBx2H6oOpye S8+yHWCJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCY207rgAKCRD2t4JPQmmgc9dvD/ 4gBaCh7z47XucyffqI7IPQE+lZwa/v9gx7erbPe7vK0rDs+pbDgIJu5k5nLyXnWj3XZ8hWVbVITEdf uWIdSC4xJqOl6Aoa80nHr+zn6qhzg6EGrd8JhrwrpNVVn7r2eWeCa4CqliEVvsXdUCYVgvypzApYOQ E04cJV/YgvRAXGKRURh3uF+GZpl1VBVR94yRSHPFaYsGigYMW454NIm/dwN69xp9CoB9xadawrC7Fj xNlgaD5XCf3PPHUb6w+ZTwT323wp7yjQFTVIKDAPjNCbg0VCmddQFyFBybsqf89OAlhPf2JZp7axD3 Jw4h41gTyr3GTde9ekJPnv7yA7T5+tdj7YxhY44V8DwsZ+rIyP4umybdXVlCrfwjXcX0IA3MNrEajh lTrREMfAqMHYg9wxk5Vz++RUsQKeqpuYu6rrK6S2d9Hx7/tFGX1Y2crFVMvraNLjNMjxcPX/0BM0iF Ao4ALtw401mo4hCrwMsL7g/Wr8q4ldcJg6Oj8iCKu6VMo+Th77I3TyOo+BblxrJIBrAIq5VFgqAtHJ LPJlS2DKMasTjUnrIiZgRFzyszhwU1spqd7nYOdXlv09CPmdxZWYzHoyj9506yG15TVryGIOvbn+D7 WD4ksI9MJOmoiQtptk7EJsGDlDdFeS8PiX1hO2JM15M9O8IRve7ozL3Yc/4A== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It is clearer to declare these global variables at the beginning of the file as it is done in other MPTCP selftests rather than in functions in the middle of the script. So for uniformity reason, we can do the same here in mptcp_sockopt.sh. Suggested-by: Geliang Tang Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index dbee386450f3..f74b237bcb32 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -11,6 +11,12 @@ timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) mptcp_connect=3D"" =20 +sec=3D$(date +%s) +rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) +ns1=3D"ns1-$rndh" +ns2=3D"ns2-$rndh" +ns_sbox=3D"ns_sbox-$rndh" + add_mark_rules() { local ns=3D$1 @@ -30,14 +36,6 @@ add_mark_rules() =20 init() { - local sec rndh - sec=3D$(date +%s) - rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) - - ns1=3D"ns1-$rndh" - ns2=3D"ns2-$rndh" - ns_sbox=3D"ns_sbox-$rndh" - for netns in "$ns1" "$ns2" "$ns_sbox";do ip netns add $netns || exit $ksft_skip ip -net $netns link set lo up --=20 2.37.2 From nobody Sat Apr 20 13:36:15 2024 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D4A1B1A61A for ; Thu, 10 Nov 2022 17:59:31 +0000 (UTC) Received: by mail-ej1-f49.google.com with SMTP id n12so6900603eja.11 for ; Thu, 10 Nov 2022 09:59:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=54tzzI8jDAZ+ybZrz0ncukn/xaU+MHBf4ofmdbpGsxI=; b=0/9L0XoQvairgSYehGtxmRzjBkYvqPYkiZC2OnUZP1mgo0VUpRp30yxjYeYWputOUG b3rxG+cVLWyJsjLhcbAAWzTG6N2OfBFR+gzJVJRJ8wlXHLId/ft7hTIdNKPUaRwC1qW3 FwIFADtQwnWZ68lltesVg9YwT35xLkNnxWp0IPZCYvU0mkwXR8iOF6nXlLETR8Jf5e+d yyvpTRFK38XWrmQdNsqApM8DatnX0IxXNDYGgB227jVQCpGL2tTMyWyZibsmzV0wZs0m 1xYdS3f6ODimxsCSxBZYXerjRTXzZaOmMO8hQdTqlX5w0lCP1A+WyeH6oGIK167q7eMC WXmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=54tzzI8jDAZ+ybZrz0ncukn/xaU+MHBf4ofmdbpGsxI=; b=fTKQRtyOIM84rgK4UtTQDbaj3nakw3S7WSMaU+1blELtwz9tO1xvxVhVoKVCSIVJBO Qk+KcwuodtUeATFdB8+nmjyLYHy5WklJ/zZRAQgGW19peDuEdCzzlFs4JSsXDIcNeLOM 2f6RjNUqLPK93ZcPgFtccrKC7mD/VmSUs+5TIeaxkCKQA+muh+U9bcdzIRSWz8nsw1ey QdM7uSNG9DojZPnQtzp8k9rxPoeWu3b0lmPzlmvnY7lHj6aHltIIezg1MaK7c0UhizTu asvDwb4KA6EiOaFWcySaGVDV0FVk7KwW3ucW41eEHfKgDDRGR1U3fWGuuU+qflu8g5Fy rD9w== X-Gm-Message-State: ACrzQf253E240O69OgKoyc3TyT9WJL3iN/uwU7cVs9FTiV1jCQeXs/q1 fBzT1MJjeGwNPLOYgLXLswmRmUiyL34CDPoR+j8= X-Google-Smtp-Source: AMsMyM4Hiy7VeAtZFhb8r5q762MZrRM0EIjCVYtdTl6GUYfxIH9GAJ3Qp2hXJcB1ePP0iWGIsiLzmA== X-Received: by 2002:a17:906:9f20:b0:78d:946e:f65d with SMTP id fy32-20020a1709069f2000b0078d946ef65dmr3408379ejc.365.1668103169742; Thu, 10 Nov 2022 09:59:29 -0800 (PST) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id c8-20020a056402120800b0045726e8a22bsm100765edw.46.2022.11.10.09.59.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Nov 2022 09:59:29 -0800 (PST) From: Matthieu Baerts To: mptcp@lists.linux.dev Cc: Matthieu Baerts Subject: [PATCH mptcp-next 2/2] selftests: mptcp: declare var as local Date: Thu, 10 Nov 2022 18:58:57 +0100 Message-Id: <20221110175857.3953994-3-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221110175857.3953994-1-matthieu.baerts@tessares.net> References: <20221110175857.3953994-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4406; i=matthieu.baerts@tessares.net; h=from:subject; bh=RLbtvUsH+3eTe8CBNKDy9fCkrlfjLTA1DDU18ffq/CY=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjbTuua/tl4v/y6EzXUvhya74SjcB3KnZRxwktEg56 ZDY+k+mJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCY207rgAKCRD2t4JPQmmgc3cREA CtdlkYJtT67p9MezLrDTz186xFP8EIEE1TSxXebvJBP0Gw1TmiHaEtMSqpKhn56LeLlY89gh/j8wXV 3ZLgZ9YpckgEzxyduLITejcdfVE8uObx8Zmr86qhOYqLJc7mdiCpEv6jtlc6MXTlrPek54Sylv5aSc /Ovs/rvmth/wNCow3jCw/09R0FlCGGcyFBnXhaxlR3zY5HhuZ2dOurOYVORweXudXNuKL1Dy2Eqrux JcAy+wQjqrysm/fxCWTKIxsA7RxnO6fnLW0Gi/CCnyfxjMf55QZvp4sbWsPfM2Q7oQpd/db0soM53h 7FgxBp06MrNWPNeayuX+2qv7trGqM+GYTvlnEI9qU0PaSwa4l3gyx905ZWaa3cBUUJ0w4YZ5KRdKeP v3K1orPpBZHiIR6/buvdgdsFz8shdsu688FIvwgES2caPXDWUKmwGiRbheAjK1jGqjsok8HBGVmw7e szNuHBFCd+bLQAUTOkf5qbr79NtoqK54cvfzr4L6pE8QTYUIQEWFhlxEfgLZbw51NhgoUtft2BwJmX FZj7mXoi66p0/5O65KHNJUgTF2Pre9usLSUnV7AFZrDCYnNQv6YPipWv8e8x7r5sgG4ih+XPPXZITo LTM0Uqa6TI7Z1AVh+2JU0KYGrmjwt/ByiMio15W9VV2vSCYcAabHnQLk408g== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Just to avoid classical Bash pitfall where variables are accidentally overridden by other functions because the proper scope has not been defined. That's also what is done in other MPTCP selftests scripts where all non local variables are defined at the beginning of the script and the others are defined with the "local" keyword. Signed-off-by: Matthieu Baerts Reviewed-by: Mat Martineau --- .../selftests/net/mptcp/mptcp_sockopt.sh | 51 +++++++++++-------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index f74b237bcb32..1b70c0a304ce 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -22,6 +22,7 @@ add_mark_rules() local ns=3D$1 local m=3D$2 =20 + local t for t in iptables ip6tables; do # just to debug: check we have multiple subflows connection requests ip netns exec $ns $t -A OUTPUT -p tcp --syn -m mark --mark $m -j ACCEPT @@ -36,6 +37,7 @@ add_mark_rules() =20 init() { + local netns for netns in "$ns1" "$ns2" "$ns_sbox";do ip netns add $netns || exit $ksft_skip ip -net $netns link set lo up @@ -44,6 +46,7 @@ init() ip netns exec $netns sysctl -q net.ipv4.conf.default.rp_filter=3D0 done =20 + local i for i in `seq 1 4`; do ip link add ns1eth$i netns "$ns1" type veth peer name ns2eth$i netns "$n= s2" ip -net "$ns1" addr add 10.0.$i.1/24 dev ns1eth$i @@ -73,6 +76,7 @@ init() =20 cleanup() { + local netns for netns in "$ns1" "$ns2" "$ns_sbox"; do ip netns del $netns done @@ -103,15 +107,17 @@ check_mark() local ns=3D$1 local af=3D$2 =20 - tables=3Diptables + local tables=3Diptables =20 if [ $af -eq 6 ];then tables=3Dip6tables fi =20 + local counters values counters=3D$(ip netns exec $ns $tables -v -L OUTPUT | grep DROP) values=3D${counters%DROP*} =20 + local v for v in $values; do if [ $v -ne 0 ]; then echo "FAIL: got $tables $values in ns $ns , not 0 - not all expected pa= ckets marked" 1>&2 @@ -131,9 +137,9 @@ print_file_err() =20 check_transfer() { - in=3D$1 - out=3D$2 - what=3D$3 + local in=3D$1 + local out=3D$2 + local what=3D$3 =20 cmp "$in" "$out" > /dev/null 2>&1 if [ $? -ne 0 ] ;then @@ -156,18 +162,18 @@ is_v6() =20 do_transfer() { - listener_ns=3D"$1" - connector_ns=3D"$2" - cl_proto=3D"$3" - srv_proto=3D"$4" - connect_addr=3D"$5" + local listener_ns=3D"$1" + local connector_ns=3D"$2" + local cl_proto=3D"$3" + local srv_proto=3D"$4" + local connect_addr=3D"$5" =20 - port=3D12001 + local port=3D12001 =20 :> "$cout" :> "$sout" =20 - mptcp_connect=3D"./mptcp_connect -r 20" + local mptcp_connect=3D"./mptcp_connect -r 20" =20 local local_addr if is_v6 "${connect_addr}"; then @@ -180,7 +186,7 @@ do_transfer() ip netns exec ${listener_ns} \ $mptcp_connect -t ${timeout_poll} -l -M 1 -p $port -s ${srv_proto} -c T= IMESTAMPNS,TCPINQ \ ${local_addr} < "$sin" > "$sout" & - spid=3D$! + local spid=3D$! =20 sleep 1 =20 @@ -189,12 +195,12 @@ do_transfer() $mptcp_connect -t ${timeout_poll} -M 2 -p $port -s ${cl_proto} -c TIMES= TAMPNS,TCPINQ \ $connect_addr < "$cin" > "$cout" & =20 - cpid=3D$! + local cpid=3D$! =20 wait $cpid - retc=3D$? + local retc=3D$? wait $spid - rets=3D$? + local rets=3D$? =20 if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then echo " client exit code $retc, server $rets" 1>&2 @@ -229,9 +235,9 @@ do_transfer() =20 make_file() { - name=3D$1 - who=3D$2 - size=3D$3 + local name=3D$1 + local who=3D$2 + local size=3D$3 =20 dd if=3D/dev/urandom of=3D"$name" bs=3D1024 count=3D$size 2> /dev/null echo -e "\nMPTCP_TEST_FILE_END_MARKER" >> "$name" @@ -264,9 +270,9 @@ do_mptcp_sockopt_tests() =20 run_tests() { - listener_ns=3D"$1" - connector_ns=3D"$2" - connect_addr=3D"$3" + local listener_ns=3D"$1" + local connector_ns=3D"$2" + local connect_addr=3D"$3" local lret=3D0 =20 do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} @@ -282,7 +288,7 @@ run_tests() do_tcpinq_test() { ip netns exec "$ns_sbox" ./mptcp_inq "$@" - lret=3D$? + local lret=3D$? if [ $lret -ne 0 ];then ret=3D$lret echo "FAIL: mptcp_inq $@" 1>&2 @@ -297,6 +303,7 @@ do_tcpinq_tests() { local lret=3D0 =20 + local args for args in "-t tcp" "-r tcp"; do do_tcpinq_test $args lret=3D$? --=20 2.37.2