From nobody Wed May 15 14:07:22 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 5D3A439FE9 for ; Wed, 21 Feb 2024 07:06:32 +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=1708499192; cv=none; b=bCPx/eTwjg/JHoRlZUUbs2nb2cvwbk2f2mmKffJFWBIxwtnoYR8TXkLPICC1zqThLCngKm5dDP3TwHxdos7HOWle4W0rDMp9UJAAk/8EYz5RklHJ8HDEzTx/ZbxT5fm900ECUmWZJ440dC7nVgFCg7jxs96XN/7YhI6c2x6D3Vw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708499192; c=relaxed/simple; bh=hFDmwvYqLJ+IXscibcUN069qhKRMAEVbtEXrUs1AQMQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=C8zTErkrLnQnJBM1qFL5D/MZapI27X7ru50bUtgzSvxBeGuQBiM9uWFlu2HgxI8/6b5NiHBJKMyCd7oGsmByvFI74hJnPV+Gm9AwghV624xS0P1UuHFZkIQXAZMkH+1OIHiVlACq73paGjp7mIFECe9IZ5xqHDuw040kMoALJqM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dQIt6plv; 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="dQIt6plv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D18EC43390; Wed, 21 Feb 2024 07:06:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708499191; bh=hFDmwvYqLJ+IXscibcUN069qhKRMAEVbtEXrUs1AQMQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dQIt6plvhu2zLv31JMUsbM8Izn5eqa38sAQJZBdSRyVTaNYH9cfUuTOJ1Ho6Or8yZ 7ChiNW1pQzEOktVY/g5XbmoysP1QV3UnlyVLJnHPrCtIz/OOci0wb9FwQjTeMBghMW Gnl5s91VFk8kXqSBw7Hg35jbw+qBHGA+fGdAavMODuAi+XzLzD3Q6IMZfw0dlBN74Q JuOFPiL/hAhiKGelzEd3tJccJxwfycKsx7fRsekbocR8aj1TG6ThTybq5z8V1jbrE4 YjzQhlqXv4E01ULwxETiF4mgPHXeTxoz4dWYII3178obPmefe9gO2BQivtqAY+BxR2 zlSN7BWUIg8lg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 1/3] selftests: mptcp: connect: add local variable rndh Date: Wed, 21 Feb 2024 15:06:20 +0800 Message-Id: <2ca83d472f3ba157ddfc97dbbfb20e2ccbd35c29.1708499011.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 This patch adds a local variable rndh in do_transfer(), setting it with ${connector_ns:4}, not the global variable rndh. The global one is hidden in the next commit. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index ea52110c3fbc..b609649311f6 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -348,6 +348,7 @@ do_transfer() =20 if $capture; then local capuser + local rndh=3D"${connector_ns:4}" if [ -z $SUDO_USER ] ; then capuser=3D"" else --=20 2.40.1 From nobody Wed May 15 14:07:22 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 B60EB3A1D3 for ; Wed, 21 Feb 2024 07:06:33 +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=1708499193; cv=none; b=ekAKNlgFKsW6x4HkLcLx60p6lFpsMPBxn2z5ocu+4FpzlWRW692cGBWvk24PpmMibx4mOvtkSttpLWF3yXa9TtEs2ejfMAUOkbefoEbzMg3vsP+OdbVhm7r+FALDoLkvFZn8dyhsWezwuOPFxb9L0P3b+Xh8rcaeRpDt9JFNCBo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708499193; c=relaxed/simple; bh=1+bu8CRAQZMVbqmN5G+Qb+YVV9j+z6ybq1h6UfJR9l8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NRRc4MrKZ8BfX9MBuSlcxq5S/gK+AdxnaGTPfjXp665Ic3yam1IIzYOtkyTrs8u/42fnAyPCYZIAWBl66h+X3MxDdXODrFuSQnjp2OjbFdGeyXWtWHuP6GMsXt0TZ9AV/ZNIb91BwjfLh55KVdmocJHOnbNzHMd1SMCs+bxxAZ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FgxAemsj; 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="FgxAemsj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66C48C433C7; Wed, 21 Feb 2024 07:06:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708499193; bh=1+bu8CRAQZMVbqmN5G+Qb+YVV9j+z6ybq1h6UfJR9l8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FgxAemsj16uWMeroMhsxeitAgkprWm1yl5zxaSW9gLfNPrHkSrFqXEkLjKe7QVIbW fmCdXQWnjp9GoCe50fVWm5fNYA+woTgJTLu3d+BpwtXCWbWEe6iODaQk01axKD2FqI PwtKrUR35Hw0gv5SBSsH5mF+LXCyplHHzXnNBF+cI91uhu8qG+64Bm7+ABuVAHiSci pznLBzarHTdTLaCPipRVxFVjCuCWhZEtS/fWZp1ZYh6BNFdFf3vSksrsFBkk+iVP0h /y526iDq02/F7gAgXTyodXZ89IJ9lP9d4a3eRVyaqy4/o6ZPYkBNqDU6L17V3dQh2I s4QaoZeUmrJrw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 2/3] selftests: mptcp: add mptcp_lib_ns_* helpers Date: Wed, 21 Feb 2024 15:06:21 +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 Add helpers mptcp_lib_ns_init() and mptcp_lib_ns_exit() in mptcp_lib.sh to initialize and delete the given namespaces. Then every test script can invoke these helpers and use all namespaces. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 9 +++---- .../selftests/net/mptcp/mptcp_connect.sh | 24 +++++++------------ .../testing/selftests/net/mptcp/mptcp_join.sh | 11 ++------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 23 ++++++++++++++++++ .../selftests/net/mptcp/mptcp_sockopt.sh | 16 ++++--------- .../testing/selftests/net/mptcp/pm_netlink.sh | 9 +++---- .../selftests/net/mptcp/simult_flows.sh | 16 ++++--------- .../selftests/net/mptcp/userspace_pm.sh | 14 ++++------- 8 files changed, 54 insertions(+), 68 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 60a7009ce1b5..162d7b90c3f5 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -3,9 +3,8 @@ =20 . "$(dirname "${0}")/mptcp_lib.sh" =20 -sec=3D$(date +%s) -rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) -ns=3D"ns1-$rndh" +ns=3D"" +mptcp_lib_ns_init ns ksft_skip=3D4 test_cnt=3D1 timeout_poll=3D30 @@ -30,7 +29,7 @@ cleanup() { ip netns pids "${ns}" | xargs --no-run-if-empty kill -SIGKILL &>/dev/null =20 - ip netns del $ns + mptcp_lib_ns_exit "${ns}" } =20 mptcp_lib_check_mptcp @@ -205,8 +204,6 @@ wait_connected() } =20 trap cleanup EXIT -ip netns add $ns -ip -n $ns link set dev lo up =20 echo "a" | \ timeout ${timeout_test} \ diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index b609649311f6..6900f7f4d88d 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -121,12 +121,11 @@ while getopts "$optstring" option;do esac done =20 -sec=3D$(date +%s) -rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) -ns1=3D"ns1-$rndh" -ns2=3D"ns2-$rndh" -ns3=3D"ns3-$rndh" -ns4=3D"ns4-$rndh" +ns1=3D"" +ns2=3D"" +ns3=3D"" +ns4=3D"" +mptcp_lib_ns_init ns1 ns2 ns3 ns4 =20 TEST_COUNT=3D0 TEST_GROUP=3D"" @@ -140,9 +139,9 @@ cleanup() =20 local netns for netns in "$ns1" "$ns2" "$ns3" "$ns4";do - ip netns del $netns rm -f /tmp/$netns.{nstat,out} done + mptcp_lib_ns_exit "${ns1}" "${ns2}" "${ns3}" "${ns4}" } =20 mptcp_lib_check_mptcp @@ -158,11 +157,6 @@ cin_disconnect=3D"$cin".disconnect cout_disconnect=3D"$cout".disconnect trap cleanup EXIT =20 -for i in "$ns1" "$ns2" "$ns3" "$ns4";do - ip netns add $i || exit $ksft_skip - ip -net $i link set lo up -done - # "$ns1" ns2 ns3 ns4 # ns1eth2 ns2eth1 ns2eth3 ns3eth2 ns3eth4 ns4eth3 # - drop 1% -> reorder 25% @@ -251,8 +245,8 @@ fi =20 check_mptcp_disabled() { - local disabled_ns=3D"ns_disabled-$rndh" - ip netns add ${disabled_ns} || exit $ksft_skip + local disabled_ns=3D"" + mptcp_lib_ns_init disabled_ns =20 # net.mptcp.enabled should be enabled by default if [ "$(ip netns exec ${disabled_ns} sysctl net.mptcp.enabled | awk '{ pr= int $3 }')" -ne 1 ]; then @@ -266,7 +260,7 @@ check_mptcp_disabled() local err=3D0 LC_ALL=3DC ip netns exec ${disabled_ns} ./mptcp_connect -p 10000 -s MPTCP= 127.0.0.1 < "$cin" 2>&1 | \ grep -q "^socket: Protocol not available$" && err=3D1 - ip netns delete ${disabled_ns} + mptcp_lib_ns_exit "${disabled_ns}" =20 if [ ${err} -eq 0 ]; then echo -e "New MPTCP socket cannot be blocked via sysctl\t\t[ FAIL ]" diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 9f1476f0e2ae..bea7627c7313 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -86,17 +86,10 @@ init_partial() { capout=3D$(mktemp) =20 - local sec rndh - sec=3D$(date +%s) - rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) - - ns1=3D"ns1-$rndh" - ns2=3D"ns2-$rndh" + mptcp_lib_ns_init ns1 ns2 =20 local netns for netns in "$ns1" "$ns2"; do - ip netns add $netns || exit $ksft_skip - ip -net $netns link set lo up ip netns exec $netns sysctl -q net.mptcp.enabled=3D1 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 @@ -147,9 +140,9 @@ cleanup_partial() =20 local netns for netns in "$ns1" "$ns2"; do - ip netns del $netns rm -f /tmp/$netns.{nstat,out} done + mptcp_lib_ns_exit "${ns1}" "${ns2}" } =20 init() { diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 556a7d9784d7..14c0b97a153e 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -373,3 +373,26 @@ mptcp_lib_check_output() { return 1 fi } + +mptcp_lib_ns_init() { + local sec + local rndh=3D"" + + sec=3D$(date +%s) + rndh=3D$(printf %x "$sec")-$(mktemp -u XXXXXX) + + local netns + for netns in "${@}"; do + eval "${netns}=3D${netns}-${rndh}" + + ip netns add "${!netns}" || exit ${KSFT_SKIP} + ip -net "${!netns}" link set lo up + done +} + +mptcp_lib_ns_exit() { + local netns + for netns in "${@}"; do + ip netns del "$netns" + done +} diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index fd7de1b3dc55..58bf83d4e7fa 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -14,11 +14,10 @@ timeout_test=3D$((timeout_poll * 2 + 1)) iptables=3D"iptables" ip6tables=3D"ip6tables" =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" +ns1=3D"" +ns2=3D"" +ns_sbox=3D"" +mptcp_lib_ns_init ns1 ns2 ns_sbox =20 add_mark_rules() { @@ -42,8 +41,6 @@ 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 ip netns exec $netns sysctl -q net.mptcp.enabled=3D1 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 @@ -79,10 +76,7 @@ init() =20 cleanup() { - local netns - for netns in "$ns1" "$ns2" "$ns_sbox"; do - ip netns del $netns - done + mptcp_lib_ns_exit "${ns1}" "${ns2}" "${ns_sbox}" rm -f "$cin" "$cout" rm -f "$sin" "$sout" } diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index 1ec9d8622fc9..c117eea92b6a 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -24,15 +24,14 @@ while getopts "$optstring" option;do esac done =20 -sec=3D$(date +%s) -rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) -ns1=3D"ns1-$rndh" +ns1=3D"" +mptcp_lib_ns_init ns1 err=3D$(mktemp) =20 cleanup() { rm -f $err - ip netns del $ns1 + mptcp_lib_ns_exit "${ns1}" } =20 mptcp_lib_check_mptcp @@ -40,8 +39,6 @@ mptcp_lib_check_tools ip =20 trap cleanup EXIT =20 -ip netns add $ns1 || exit $ksft_skip -ip -net $ns1 link set lo up ip netns exec $ns1 sysctl -q net.mptcp.enabled=3D1 =20 check() diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 7d8388ecc966..67cddd40f211 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -3,11 +3,10 @@ =20 . "$(dirname "${0}")/mptcp_lib.sh" =20 -sec=3D$(date +%s) -rndh=3D$(printf %x $sec)-$(mktemp -u XXXXXX) -ns1=3D"ns1-$rndh" -ns2=3D"ns2-$rndh" -ns3=3D"ns3-$rndh" +ns1=3D"" +ns2=3D"" +ns3=3D"" +mptcp_lib_ns_init ns1 ns2 ns3 capture=3Dfalse ksft_skip=3D4 timeout_poll=3D30 @@ -36,10 +35,7 @@ cleanup() rm -f "$large" "$small" rm -f "$capout" =20 - local netns - for netns in "$ns1" "$ns2" "$ns3";do - ip netns del $netns - done + mptcp_lib_ns_exit "${ns1}" "${ns2}" "${ns3}" } =20 mptcp_lib_check_mptcp @@ -66,8 +62,6 @@ setup() trap cleanup EXIT =20 for i in "$ns1" "$ns2" "$ns3";do - ip netns add $i || exit $ksft_skip - ip -net $i link set lo up ip netns exec $i sysctl -q net.ipv4.conf.all.rp_filter=3D0 ip netns exec $i sysctl -q net.ipv4.conf.default.rp_filter=3D0 done diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 629fc5d0ecc5..10074709420a 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -50,10 +50,9 @@ app6_port=3D50004 client_addr_id=3D${RANDOM:0:2} server_addr_id=3D${RANDOM:0:2} =20 -sec=3D$(date +%s) -rndh=3D$(printf %x "$sec")-$(mktemp -u XXXXXX) -ns1=3D"ns1-$rndh" -ns2=3D"ns2-$rndh" +ns1=3D"" +ns2=3D"" +mptcp_lib_ns_init ns1 ns2 ret=3D0 test_name=3D"" =20 @@ -118,10 +117,7 @@ cleanup() mptcp_lib_kill_wait $pid done =20 - local netns - for netns in "$ns1" "$ns2" ;do - ip netns del "$netns" - done + mptcp_lib_ns_exit "${ns1}" "${ns2}" =20 rm -rf $file $client_evts $server_evts =20 @@ -132,8 +128,6 @@ trap cleanup EXIT =20 # Create and configure network namespaces for testing for i in "$ns1" "$ns2" ;do - ip netns add "$i" || exit 1 - ip -net "$i" link set lo up ip netns exec "$i" sysctl -q net.mptcp.enabled=3D1 ip netns exec "$i" sysctl -q net.mptcp.pm_type=3D1 done --=20 2.40.1 From nobody Wed May 15 14:07:22 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 93CA839FF4 for ; Wed, 21 Feb 2024 07:06:35 +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=1708499195; cv=none; b=rIOExWZW4myg5tiYpccQ5N9RZUBUrdSCmr5+fcOLmUcBrZnDgTZZN7pYIjS7ccUY8i/ONSe8guat++/O3HhQKalOmN44NufdCf9YMyBvEGX9J50/th4CWefoCdr98fhEDUf/+nTV/yYU9mtMViFyJm8Vke45zKrcpaZb2WaTJu4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708499195; c=relaxed/simple; bh=K/cMKVOV4dV6ScAorofxySSwNQBUrD1a24gRcxz3Poo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=si/ikIo4hoCU8sc4+ZvyiPpezpPw7Rv+CDNRkilaRAJMgHQzsngZ0tH4l5dZtMK/Xf1YMdHDTCs9npKtkvf0vPm+WHzU8bF62LXwY7xgA/F5VUuy8Dj8jAjKMYkZzleAAdL6T8EQXrOxpVI+TtaXF1BCrCTeZ282ZvIUCML/kf8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TNyaoZbe; 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="TNyaoZbe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BFFC5C433F1; Wed, 21 Feb 2024 07:06:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708499195; bh=K/cMKVOV4dV6ScAorofxySSwNQBUrD1a24gRcxz3Poo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TNyaoZbey48XJBs27q1WzH+DKiq4Sm5mn733HVsw8XUAb/bRfN1t8dF/5PPNZA2HO dgP0P5x+g+Osh112OcYDlfuEuIqnPsHHZRkrecm6F8+xsFeAFgqgIE+CA7y39KkxFR q2dQm7qXQJ8qll6UQZbuE/AaGLE5W6yfYi23J+fJE8cHBPEZy34xpT/XnB992u3nWm ynNZ+URVhKsbTwG2gVqKe7dDHI/Gt+AtZSp0LbtVP7FUnZN1UaavsnHL0ZbAi/+dNI SWmpZTkZu7mgYaa4EwKFgKqHCJK9FhNzpSPn9UGvCoEcOcDBTHdf4OirCeK1ofgs8r 5j1MSjcNhWaxw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 3/3] selftests: mptcp: add mptcp_lib_evts_* helpers Date: Wed, 21 Feb 2024 15:06:22 +0800 Message-Id: <82a62a697fa15f7f430076f67d6bb23a1827eb7b.1708499011.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 avoid duplicated code in different MPTCP selftests, we can add and use helpers defined in mptcp_lib.sh. This patch unifies "pm_nl_ctl events" related code in userspace_pm.sh and mptcp_join.sh into four helpers: mptcp_lib_evts_init(), _start(), _kill() and _remove(). Define them in mptcp_lib.sh and use these new helpers in both scripts. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 16 ++---- .../testing/selftests/net/mptcp/mptcp_lib.sh | 55 +++++++++++++++++++ .../selftests/net/mptcp/userspace_pm.sh | 28 +++------- 3 files changed, 67 insertions(+), 32 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index bea7627c7313..006fefaf2e2a 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -158,8 +158,7 @@ init() { cinsent=3D$(mktemp) cout=3D$(mktemp) err=3D$(mktemp) - evts_ns1=3D$(mktemp) - evts_ns2=3D$(mktemp) + mptcp_lib_evts_init evts_ns1 evts_ns2 =20 trap cleanup EXIT =20 @@ -172,7 +171,7 @@ cleanup() rm -f "$cin" "$cout" "$sinfail" rm -f "$sin" "$sout" "$cinsent" "$cinfail" rm -f "$tmpfile" - rm -rf $evts_ns1 $evts_ns2 + mptcp_lib_evts_remove "${evts_ns1}" "${evts_ns2}" rm -f "$err" cleanup_partial } @@ -437,12 +436,8 @@ reset_with_events() { reset "${1}" || return 1 =20 - :> "$evts_ns1" - :> "$evts_ns2" - ip netns exec $ns1 ./pm_nl_ctl events >> "$evts_ns1" 2>&1 & - evts_ns1_pid=3D$! - ip netns exec $ns2 ./pm_nl_ctl events >> "$evts_ns2" 2>&1 & - evts_ns2_pid=3D$! + mptcp_lib_evts_start "${ns1}" "${ns2}" "${evts_ns1}" "${evts_ns2}" \ + evts_ns1_pid evts_ns2_pid } =20 reset_with_tcp_filter() @@ -614,8 +609,7 @@ wait_mpj() =20 kill_events_pids() { - mptcp_lib_kill_wait $evts_ns1_pid - mptcp_lib_kill_wait $evts_ns2_pid + mptcp_lib_evts_kill evts_ns1_pid evts_ns2_pid } =20 pm_nl_set_limits() diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 14c0b97a153e..9573edb4efb1 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -396,3 +396,58 @@ mptcp_lib_ns_exit() { ip netns del "$netns" done } + +mptcp_lib_evts_init() { + local arg + + for arg in "${@}"; do + declare -n evts=3D"${arg}" + + if [ -z "${evts}" ]; then + evts=3D$(mktemp) + fi + done +} + +# $1 ns1, $2 ns2 +mptcp_lib_evts_start() { + local ns_1=3D"${1}" + local ns_2=3D"${2}" + local evts_1=3D"${3}" + local evts_2=3D"${4}" + declare -n pid_1=3D"${5}" + declare -n pid_2=3D"${6}" + + :>"${evts_1}" + :>"${evts_2}" + + if [ ${pid_1} -ne 0 ]; then + mptcp_lib_kill_wait "${pid_1}" + fi + ip netns exec "${ns_1}" ./pm_nl_ctl events >> "${evts_1}" 2>&1 & + pid_1=3D$! + + if [ ${pid_2} -ne 0 ]; then + mptcp_lib_kill_wait "${pid_2}" + fi + ip netns exec "${ns_2}" ./pm_nl_ctl events >> "${evts_2}" 2>&1 & + pid_2=3D$! +} + +mptcp_lib_evts_kill() { + declare -n pid_1=3D"${1}" + declare -n pid_2=3D"${2}" + + mptcp_lib_kill_wait "${pid_1}" + mptcp_lib_kill_wait "${pid_2}" + + pid_1=3D0 + pid_2=3D0 +} + +mptcp_lib_evts_remove() { + local evts_1=3D"${1}" + local evts_2=3D"${2}" + + rm -rf "${evts_1}" "${evts_2}" +} diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 10074709420a..b6a03d96e786 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -111,15 +111,16 @@ cleanup() =20 # Terminate the MPTCP connection and related processes local pid - for pid in $client4_pid $server4_pid $client6_pid $server6_pid\ - $server_evts_pid $client_evts_pid + for pid in $client4_pid $server4_pid $client6_pid $server6_pid do mptcp_lib_kill_wait $pid done + mptcp_lib_evts_kill server_evts_pid client_evts_pid =20 mptcp_lib_ns_exit "${ns1}" "${ns2}" =20 - rm -rf $file $client_evts $server_evts + rm -rf $file + mptcp_lib_evts_remove "${server_evts}" "${client_evts}" =20 _printf "Done\n" } @@ -176,24 +177,9 @@ make_connection() =20 # Capture netlink events over the two network namespaces running # the MPTCP client and server - if [ -z "$client_evts" ]; then - client_evts=3D$(mktemp) - fi - :>"$client_evts" - if [ $client_evts_pid -ne 0 ]; then - mptcp_lib_kill_wait $client_evts_pid - fi - ip netns exec "$ns2" ./pm_nl_ctl events >> "$client_evts" 2>&1 & - client_evts_pid=3D$! - if [ -z "$server_evts" ]; then - server_evts=3D$(mktemp) - fi - :>"$server_evts" - if [ $server_evts_pid -ne 0 ]; then - mptcp_lib_kill_wait $server_evts_pid - fi - ip netns exec "$ns1" ./pm_nl_ctl events >> "$server_evts" 2>&1 & - server_evts_pid=3D$! + mptcp_lib_evts_init server_evts client_evts + mptcp_lib_evts_start "${ns1}" "${ns2}" "${server_evts}" "${client_evts}" \ + server_evts_pid client_evts_pid sleep 0.5 =20 # Run the server --=20 2.40.1