From nobody Mon Sep 16 19:32:46 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 0C8A313C9C0 for ; Thu, 23 May 2024 08:09:08 +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=1716451749; cv=none; b=ba2mAUd4a0QQVoDcx77sZWv+6EkwBVJ3Addh8znVIr4ZCdGrtuM+Mw8uKAtZXHiJ6bhHBis4CpEjkgCc9hYpOyS7PlB13N2Lte5Pgh67hXbiSEfSIAAc+EkFz5tNB1iQVXJEv9ryZSbnJA/ncL5m1YPyWvRWhhxR1iUb3xJGdag= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716451749; c=relaxed/simple; bh=Due/G7Ua3ODM0XvZmz7UKCbv/uG+4mq5OCRG2kxb7wc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W1Zh+GK92XvVqBvGwEKaoV1XSoVWW3ocO4pY60yO5IknprQI7aL45ulKIz+yVdQ5CD3xN2Md/7rm1jrZLuumzTivuiUJeNT6sAdfUDAmcUcs6zbYO6OFVHpl9iYUSjvUi/9vWWdUzLCj5+v12n5yHOJu++6IgBlNfQJOwe/xwRU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lDoUxkdf; 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="lDoUxkdf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4EE24C4AF0D; Thu, 23 May 2024 08:09:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716451748; bh=Due/G7Ua3ODM0XvZmz7UKCbv/uG+4mq5OCRG2kxb7wc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lDoUxkdf7zT8w2gc3jvlF2OnjlVtVfY3Wfoo9WGe2EHBy9H6ypMC+yFE425STaBy9 tRBPTPv4c+FQ21X5uQ6dukwQva0fYLiw9XsaMXj72pDw0jvywrLvn+P7hW5/GbB/BX YdxBBzj0W/y8q6IWP6SyyHHD/8kcRS5ZiWnidWk+nFLzMnEPcdAfmy0rf3kcGGzJSY DZB99pzQU4ZCtuURAvAVoNE1qBu84h4k69tjjYDaghrf8JdGHR6uVh6u3xAza79klK oPKnhm+6w8PFSQz+HVKVOScktT4TB53f8KKH3hXv+/tXdMYKpIvEL1N3Z/tK03TgO5 BZuJvZS83VmVw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 1/4] selftests: mptcp: rename ns to ns1 in diag.sh Date: Thu, 23 May 2024 16:08:57 +0800 Message-ID: <8ba084333877b94a5675d7a6c8b855c4505956d2.1716451525.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.0 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 next commit will use setup_ns() helper defined in lib.sh instead of mptcp helper mptcp_lib_ns_init(). But the namespace "ns" in diag.sh makes it not working. Since "ns" is a local variable in this helper. So this patch renames it as "ns1". Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 58 +++++++++++------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index 776d43a6922d..eec1f04d231f 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -8,7 +8,7 @@ =20 . "$(dirname "${0}")/mptcp_lib.sh" =20 -ns=3D"" +ns1=3D"" timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) ret=3D0 @@ -19,10 +19,10 @@ flush_pids() # give it some time sleep 1.1 =20 - ip netns pids "${ns}" | xargs --no-run-if-empty kill -SIGUSR1 &>/dev/null + ip netns pids "${ns1}" | xargs --no-run-if-empty kill -SIGUSR1 &>/dev/null =20 for _ in $(seq $((timeout_poll * 10))); do - [ -z "$(ip netns pids "${ns}")" ] && break + [ -z "$(ip netns pids "${ns1}")" ] && break sleep 0.1 done } @@ -31,9 +31,9 @@ flush_pids() #shellcheck disable=3DSC2317 cleanup() { - ip netns pids "${ns}" | xargs --no-run-if-empty kill -SIGKILL &>/dev/null + ip netns pids "${ns1}" | xargs --no-run-if-empty kill -SIGKILL &>/dev/null =20 - mptcp_lib_ns_exit "${ns}" + mptcp_lib_ns_exit "${ns1}" } =20 mptcp_lib_check_mptcp @@ -41,7 +41,7 @@ mptcp_lib_check_tools ip ss =20 get_msk_inuse() { - ip netns exec $ns cat /proc/net/protocols | awk '$1~/^MPTCP$/{print $3}' + ip netns exec $ns1 cat /proc/net/protocols | awk '$1~/^MPTCP$/{print $3}' } =20 __chk_nr() @@ -75,7 +75,7 @@ __chk_msk_nr() local condition=3D$1 shift 1 =20 - __chk_nr "ss -inmHMN $ns | $condition" "$@" + __chk_nr "ss -inmHMN $ns1 | $condition" "$@" } =20 chk_msk_nr() @@ -88,8 +88,8 @@ chk_listener_nr() local expected=3D$1 local msg=3D"$2" =20 - __chk_nr "ss -nlHMON $ns | wc -l" "$expected" "$msg - mptcp" 0 - __chk_nr "ss -nlHtON $ns | wc -l" "$expected" "$msg - subflows" + __chk_nr "ss -nlHMON $ns1 | wc -l" "$expected" "$msg - mptcp" 0 + __chk_nr "ss -nlHtON $ns1 | wc -l" "$expected" "$msg - subflows" } =20 wait_msk_nr() @@ -105,7 +105,7 @@ wait_msk_nr() msg=3D$* =20 while [ $i -lt $timeout ]; do - nr=3D$(ss -inmHMN $ns | $condition) + nr=3D$(ss -inmHMN $ns1 | $condition) [ $nr =3D=3D $expected ] && break; [ $nr -gt $max ] && max=3D$nr i=3D$((i + 1)) @@ -143,7 +143,7 @@ __chk_listen() local expected=3D$2 local msg=3D"$3" =20 - __chk_nr "ss -N $ns -Ml '$filter' | grep -c LISTEN" "$expected" "$msg" 0 + __chk_nr "ss -N $ns1 -Ml '$filter' | grep -c LISTEN" "$expected" "$msg" 0 } =20 chk_msk_listen() @@ -173,7 +173,7 @@ chk_msk_inuse() msg+=3D" after flush" fi =20 - listen_nr=3D$(ss -N "${ns}" -Ml | grep -c LISTEN) + listen_nr=3D$(ss -N "${ns1}" -Ml | grep -c LISTEN) expected=3D$((expected + listen_nr)) =20 for _ in $(seq 10); do @@ -196,7 +196,7 @@ chk_msk_cestab() msg+=3D" after flush" fi =20 - __chk_nr "mptcp_lib_get_counter ${ns} MPTcpExtMPCurrEstab" \ + __chk_nr "mptcp_lib_get_counter ${ns1} MPTcpExtMPCurrEstab" \ "${expected}" "${msg}" "" } =20 @@ -205,7 +205,7 @@ msk_info_get_value() local port=3D"${1}" local info=3D"${2}" =20 - ss -N "${ns}" -inHM dport "${port}" | \ + ss -N "${ns1}" -inHM dport "${port}" | \ mptcp_lib_get_info_value "${info}" "${info}" } =20 @@ -267,23 +267,23 @@ wait_connected() } =20 trap cleanup EXIT -mptcp_lib_ns_init ns +mptcp_lib_ns_init ns1 =20 echo "a" | \ timeout ${timeout_test} \ - ip netns exec $ns \ + ip netns exec $ns1 \ ./mptcp_connect -p 10000 -l -t ${timeout_poll} -w 20 \ 0.0.0.0 >/dev/null & -mptcp_lib_wait_local_port_listen $ns 10000 +mptcp_lib_wait_local_port_listen $ns1 10000 chk_msk_nr 0 "no msk on netns creation" chk_msk_listen 10000 =20 echo "b" | \ timeout ${timeout_test} \ - ip netns exec $ns \ + ip netns exec $ns1 \ ./mptcp_connect -p 10000 -r 0 -t ${timeout_poll} -w 20 \ 127.0.0.1 >/dev/null & -wait_connected $ns 10000 +wait_connected $ns1 10000 chk_msk_nr 2 "after MPC handshake " chk_last_time_info 10000 chk_msk_remote_key_nr 2 "....chk remote_key" @@ -297,16 +297,16 @@ chk_msk_cestab 0 "2->0" =20 echo "a" | \ timeout ${timeout_test} \ - ip netns exec $ns \ + ip netns exec $ns1 \ ./mptcp_connect -p 10001 -l -s TCP -t ${timeout_poll} -w 20 \ 0.0.0.0 >/dev/null & -mptcp_lib_wait_local_port_listen $ns 10001 +mptcp_lib_wait_local_port_listen $ns1 10001 echo "b" | \ timeout ${timeout_test} \ - ip netns exec $ns \ + ip netns exec $ns1 \ ./mptcp_connect -p 10001 -r 0 -t ${timeout_poll} -w 20 \ 127.0.0.1 >/dev/null & -wait_connected $ns 10001 +wait_connected $ns1 10001 chk_msk_fallback_nr 1 "check fallback" chk_msk_inuse 1 chk_msk_cestab 1 @@ -319,16 +319,16 @@ NR_CLIENTS=3D100 for I in $(seq 1 $NR_CLIENTS); do echo "a" | \ timeout ${timeout_test} \ - ip netns exec $ns \ + ip netns exec $ns1 \ ./mptcp_connect -p $((I+10001)) -l -w 20 \ -t ${timeout_poll} 0.0.0.0 >/dev/null & done -mptcp_lib_wait_local_port_listen $ns $((NR_CLIENTS + 10001)) +mptcp_lib_wait_local_port_listen $ns1 $((NR_CLIENTS + 10001)) =20 for I in $(seq 1 $NR_CLIENTS); do echo "b" | \ timeout ${timeout_test} \ - ip netns exec $ns \ + ip netns exec $ns1 \ ./mptcp_connect -p $((I+10001)) -w 20 \ -t ${timeout_poll} 127.0.0.1 >/dev/null & done @@ -344,16 +344,16 @@ chk_msk_cestab 0 "many->0" chk_listener_nr 0 "no listener sockets" NR_SERVERS=3D100 for I in $(seq 1 $NR_SERVERS); do - ip netns exec $ns ./mptcp_connect -p $((I + 20001)) \ + ip netns exec $ns1 ./mptcp_connect -p $((I + 20001)) \ -t ${timeout_poll} -l 0.0.0.0 >/dev/null 2>&1 & done -mptcp_lib_wait_local_port_listen $ns $((NR_SERVERS + 20001)) +mptcp_lib_wait_local_port_listen $ns1 $((NR_SERVERS + 20001)) =20 chk_listener_nr $NR_SERVERS "many listener sockets" =20 # graceful termination for I in $(seq 1 $NR_SERVERS); do - echo a | ip netns exec $ns ./mptcp_connect -p $((I + 20001)) 127.0.0.1 >/= dev/null 2>&1 & + echo a | ip netns exec $ns1 ./mptcp_connect -p $((I + 20001)) 127.0.0.1 >= /dev/null 2>&1 & done flush_pids =20 --=20 2.43.0 From nobody Mon Sep 16 19:32:46 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 7E32F2EAF9 for ; Thu, 23 May 2024 08:09:10 +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=1716451750; cv=none; b=VJXwd1rrkpBfXPQUQ3pQgp1xCUFZJuiorxe9aNPa4M3+rUJIZwF2A/+Gfh46j3JesjdDbN/zsGcV+jPibubiEFgygvtmqHfW9LfNCDRX1dTKY5ofpd5/Um6xHsF3QqwZDv4s8IjHNvjq6Y7R0OqMicneTJSHkNZuP66TtGA0+8Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716451750; c=relaxed/simple; bh=POq2KmKnHg2VDVcDcmNr753g4G8UmkQF7LiX/NzcM4c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BCbPh29PR+2Sti/5wYQd60/OcPkKIef3qz7I8/Zaa2MEM1YQu8xON3ifftjJyZB49SKdApR3BSvpV76S2Wurr9C+DVMmkCfw7yuV1oXvMjPwQMQH4VlFUF1t+vGLcrtbWiJeVARQQ4tsSylKdeIw4ZZuyYVMeVBIL9zVuHIggxo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sSHN4zRg; 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="sSHN4zRg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A604C2BD10; Thu, 23 May 2024 08:09:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716451750; bh=POq2KmKnHg2VDVcDcmNr753g4G8UmkQF7LiX/NzcM4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sSHN4zRgPvoHB9U2RBQv4iSOulJ5ahVdOld8r+LbCXKgvfymS6nvSFghZeRtSsICm kXzS3GncWiCaxY9+XyShoLhIGvMYBCIIt138s5PadML/n+6BzU4ngg/LYta/2hxaf9 mNo7dxmdNceH0eHIX6qCbUpY6C1SDhauiK7UrC8KPxTr+IOAZ6sFb9GIzEVjSES3rk rmCH0LtK8xclwLjj85UJqLWL/7blceWuBoncsBUDPx/ZW2NlQjLyGLDF22WNsVG3b2 vlE1WFsnO9niluNykHTyaDS6qflT2WPoUJYSg8yDO1ATPGtr8zWoIfR+UtBH8EWiEZ pSduOtZc5Nkog== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 2/4] selftests: mptcp: use setup_ns helper in lib.sh Date: Thu, 23 May 2024 16:08:58 +0800 Message-ID: <644ac151204efcd05b047d4e9b1545747ba785f1.1716451525.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.0 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 includes lib.sh into mptcp_lib.sh, uses setup_ns() helper defined in lib.sh to set up namespaces in mptcp_lib_ns_init(). Then for each namespace in NS_LIST, run all sysctl commands. This can drop some duplicate code. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_lib.sh | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index ad2ebda5cb64..59eb77e7813d 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -1,6 +1,8 @@ #! /bin/bash # SPDX-License-Identifier: GPL-2.0 =20 +. "$(dirname "${0}")/../lib.sh" + readonly KSFT_PASS=3D0 readonly KSFT_FAIL=3D1 readonly KSFT_SKIP=3D4 @@ -412,20 +414,13 @@ mptcp_lib_check_tools() { } =20 mptcp_lib_ns_init() { - local sec rndh - - sec=3D$(date +%s) - rndh=3D$(printf %x "${sec}")-$(mktemp -u XXXXXX) + setup_ns "${@}" =20 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 - 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 + for netns in $NS_LIST; do + 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 done } =20 --=20 2.43.0 From nobody Mon Sep 16 19:32:46 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 AF16A13C9C0 for ; Thu, 23 May 2024 08:09: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=1716451752; cv=none; b=E6Mk5/XLWpNqfHTpHJaVxdReYmJW6g4SS9kDSVJ68XtU5LKPIqdQgQQqn4N2oqgb/8e/VyYgk8CEDr9DMdNNKqK5dArDtKZtyYdhC7Bn1fH9doMDno9mq1guLJ1qhCYupxUsasrVLInIp5gHgeFiWJg/7JNf0gApTnByKCBza6M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716451752; c=relaxed/simple; bh=aPj54Zpaw4QQ/eAL5pKV/1vKVi+5wUs1+F4qyAlxqSc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HQVfmiBdzFxm7UCY7ksTSwXZGyko6Av4/xDiUHxa8s3HCjzlSmVThrc0zXxnpUvQIT4NcbwJWrEEC5ltab8zopdoX1qxI84g1KYxuou6wxVb7YGTiH1aA2ac1iBOb6zIe55plGTJCCIOUA6hhC8kZv5K6EPg4Wyn7RIO9cLjQx8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=t5O4vkYa; 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="t5O4vkYa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 22DF1C32782; Thu, 23 May 2024 08:09:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716451752; bh=aPj54Zpaw4QQ/eAL5pKV/1vKVi+5wUs1+F4qyAlxqSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t5O4vkYayIl+5nypDBbCKHUwhMWURCPq+cReuN9hx6GRZcwkPyDfWN+ss35He/V0o Yy3WkjyFQqro9dLHZ6GHqkyBRaWFtqKujZKs28fB3nMJfU12L+KtkukvHD9K2sGdi7 eh2DM61fSS0ffvpznocBtC9/u8VDPD4rvy7O/SBJ+WpyuVflsJhagmNqmpwtHxgtpR 8W2FaCI1Dk8fypxoGQbhvNdDEGlQcsVAkg9zvhLe0xQGdGyqIQDXaKaclM/jBUrQsP M/1DZdg+KE4s4FTXtCVbTkarOcU5w9NFU94PNQSbPeTlbqDCmNVIfql1ZSobkRzr4E zEH4+bC5veg3g== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 3/4] selftests: mptcp: use cleanup_all_ns helper in lib.sh Date: Thu, 23 May 2024 16:08:59 +0800 Message-ID: X-Mailer: git-send-email 2.43.0 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 uses cleanup_all_ns() helper defined in lib.sh instead of all mptcp_lib_ns_exit() in mptcp seltests. And drop this duplicate mptcp helper in mptcp_lib.sh. In mptcp_connect.sh, drop mptcp_lib_ns_exit in check_mptcp_disabled() directly, this "disabled_ns" will be deleted by cleanup_all_ns() in cleanup(), together with "ns1 - ns4". In mptcp_join.sh, drop mptcp_lib_ns_exit in cleanup_partial() directly, each existing namespace will delete automaticly in setup_ns(), only adding cleanup_all_ns in cleanup() is enough. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 2 +- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 3 +-- tools/testing/selftests/net/mptcp/mptcp_join.sh | 3 +-- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 8 -------- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 2 +- tools/testing/selftests/net/mptcp/pm_netlink.sh | 2 +- tools/testing/selftests/net/mptcp/simult_flows.sh | 2 +- tools/testing/selftests/net/mptcp/userspace_pm.sh | 2 +- 8 files changed, 7 insertions(+), 17 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index eec1f04d231f..9e19e3e8d833 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -33,7 +33,7 @@ cleanup() { ip netns pids "${ns1}" | xargs --no-run-if-empty kill -SIGKILL &>/dev/null =20 - mptcp_lib_ns_exit "${ns1}" + cleanup_all_ns } =20 mptcp_lib_check_mptcp diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index b77fb7065bfb..4e2c5dd0de3c 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -142,7 +142,7 @@ cleanup() rm -f "$sin" "$sout" rm -f "$capout" =20 - mptcp_lib_ns_exit "${ns1}" "${ns2}" "${ns3}" "${ns4}" + cleanup_all_ns } =20 mptcp_lib_check_mptcp @@ -271,7 +271,6 @@ 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 - mptcp_lib_ns_exit "${disabled_ns}" =20 if [ ${err} -eq 0 ]; then mptcp_lib_pr_fail "New MPTCP socket cannot be blocked via sysctl" diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index fefa9173bdaa..87a518b8c19f 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -132,8 +132,6 @@ init_shapers() cleanup_partial() { rm -f "$capout" - - mptcp_lib_ns_exit "${ns1}" "${ns2}" } =20 init() { @@ -166,6 +164,7 @@ cleanup() rm -rf $evts_ns1 $evts_ns2 rm -f "$err" cleanup_partial + cleanup_all_ns } =20 print_check() diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 59eb77e7813d..bd7d78e4aa83 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -424,14 +424,6 @@ mptcp_lib_ns_init() { done } =20 -mptcp_lib_ns_exit() { - local netns - for netns in "${@}"; do - ip netns del "${netns}" - rm -f /tmp/"${netns}".{nstat,out} - done -} - mptcp_lib_events() { local ns=3D"${1}" local evts=3D"${2}" diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 68899a303a1a..e1026b028739 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -98,7 +98,7 @@ init() #shellcheck disable=3DSC2317 cleanup() { - mptcp_lib_ns_exit "${ns1}" "${ns2}" "${ns_sbox}" + cleanup_all_ns 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 2757378b1b13..5b4d83c2e280 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -36,7 +36,7 @@ err=3D$(mktemp) cleanup() { rm -f "${err}" - mptcp_lib_ns_exit "${ns1}" + cleanup_all_ns } =20 mptcp_lib_check_mptcp diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index d0b39c2e38a3..6eddb3bba2e8 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -42,7 +42,7 @@ cleanup() rm -f "$large" "$small" rm -f "$capout" =20 - mptcp_lib_ns_exit "${ns1}" "${ns2}" "${ns3}" + cleanup_all_ns } =20 mptcp_lib_check_mptcp diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 9e2981f2d7f5..0c089e7f5f0a 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -107,7 +107,7 @@ cleanup() mptcp_lib_kill_wait $pid done =20 - mptcp_lib_ns_exit "${ns1}" "${ns2}" + cleanup_all_ns =20 rm -rf $file $client_evts $server_evts =20 --=20 2.43.0 From nobody Mon Sep 16 19:32:46 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 45FF813CABA for ; Thu, 23 May 2024 08:09:14 +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=1716451754; cv=none; b=QdrRrO2EqPMiTOWaq8Pm9Y3tPAs8g1GUmm6vMKRfUQW/cw7k5E4KJxpR3QXjm6BPv3pddeM7gMAq2VIQhFYCaHWi+U0hxbA+rjlqmnHrLw8+y736rFEkCObQPJk92Xt0+T+rD079zMiHumoRThctf6v8gaozMrU7t/BWm/I1Y2Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716451754; c=relaxed/simple; bh=JPUe0s/BaXQMHT5TsI3mpMGtaAAUDqhya8omlAik5LY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bzLjHdoOfur7uZZxbHN7+fYDIkU7JhaFh16XAdmxEumoz5Ht0ZFccJEinf26VDZWN4xcc9uQ6dwq6i2h9Y3wXAwIcp2XmjoJZxR0xIjgBdQq4NOvCf8FDdkjjoJAT7vHv/nsb4K6WP/93irXJen5G95JrYqTLZycB2KTGF9hQZY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a1WnFmAd; 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="a1WnFmAd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8844C3277B; Thu, 23 May 2024 08:09:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716451753; bh=JPUe0s/BaXQMHT5TsI3mpMGtaAAUDqhya8omlAik5LY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a1WnFmAdOZJ7KPxzjeyuo/ETW7jE1G+7Ha8/JtpeWiOAQYe0XbCFmywxOvgLh4aro 9o1Id1t4FqUtt0kRwhVQGytnyMsnr5SNFYPU6p9Ev+YFsYbUWjNzDbqShy6KJQYEnp iLbilOOtXjTMblCD/WHSo4FNwJ4taFMYhQCQHvSKivBMv5+xv7HvgJVq8G93nhiimr EDU4IVBUQ3XQLk9G9tm//Z4os8GDG5zYWtUj5jZBWhXItBMmvN6bNXoUCw7KN3yuhl RV6yOR21ymPOuKbmDUK97rHVytH+2wEDgYPZiRCMqOv8teBWKdZc0vFnjlSmlAkmSy sqCRq3dw1mxIQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 4/4] selftests: mptcp: use wait_local_port_listen helper Date: Thu, 23 May 2024 16:09:00 +0800 Message-ID: <97fa6e63c052859546163fad4ff96a78ce95415a.1716451525.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.0 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 includes net_helper.sh into mptcp_lib.sh, uses the helper wait_local_port_listen() defined in it to implement the similar mptcp helper. This can drop some duplicate code. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index bd7d78e4aa83..e039c88a64ed 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 =20 . "$(dirname "${0}")/../lib.sh" +. "$(dirname "${0}")/../net_helper.sh" =20 readonly KSFT_PASS=3D0 readonly KSFT_FAIL=3D1 @@ -337,20 +338,7 @@ mptcp_lib_check_transfer() { =20 # $1: ns, $2: port mptcp_lib_wait_local_port_listen() { - local listener_ns=3D"${1}" - local port=3D"${2}" - - local port_hex - port_hex=3D"$(printf "%04X" "${port}")" - - local _ - for _ in $(seq 10); do - ip netns exec "${listener_ns}" cat /proc/net/tcp* | \ - awk "BEGIN {rc=3D1} {if (\$2 ~ /:${port_hex}\$/ && \$4 ~ /0A/) \ - {rc=3D0; exit}} END {exit rc}" && - break - sleep 0.1 - done + wait_local_port_listen "${@}" "tcp" } =20 mptcp_lib_check_output() { --=20 2.43.0