From patchwork Sat May 25 13:01:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 13673997 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 69BCC125DC for ; Sat, 25 May 2024 13:02:17 +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=1716642137; cv=none; b=IEG5lb5UsCDm8ZnxIZOSv7ANGlkLgWR2FdwbmvwmjOMN3lxIRVizUyJDRKxdSik3GNjZqOqsG9S5lKZ1NdvZo/NCX0MzoVeeEOMsBSFVISsn90wCD5kB6KGikhaIIskx1NZA3THqRgKO+OFeOsybSuMypv5Cz3ZEKPVKkIezUvc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716642137; c=relaxed/simple; bh=g4vEoRgIauKGF2wSD/mzFF7iLo5kG0VWs5K7Jn5oY7Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q21+kWWwEaLZ3FNh4F7knQnNOpKueO98D4ze0ilMA80oDjS7gxkJ5hSzJmfy1eBG6r7mS0UGiXK2zuBIXfzBfytGJNpkW/8tLn1zn20/6/1O80TyCZmfYbgHyUnVWk5THyvm+Ym8vUMrgMem0O9bK2387cm9vcwHGkTfRQYfOUA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=npF9XjSD; 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="npF9XjSD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13752C3277B; Sat, 25 May 2024 13:02:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716642136; bh=g4vEoRgIauKGF2wSD/mzFF7iLo5kG0VWs5K7Jn5oY7Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=npF9XjSDZkH43/AE2DeGKV8uiTloQ3yHUkmIzYzrjKOMYrokfu6AteCuLd/Er+a/c FL2HXnInP7m1Yt4Et2kATORqXwqTCY0n0Kl/x9h1Uzuppw0f3xdMfM6R0Vk+/vM8p8 nDxNe4m1NrJ0BLWR8kMj7PYX8uEhzh/OhstniHx8gZAIeYP9A3zTxdQe+4XAFKtgeO JX5il5nbQ9EA10/ln4mSi4CvJidf5OpxHUH+tuZYblpQSzOVVne93dCoHwsfYTEwgp 4d5FW7qpjNgNvrgCn8rfEioPHS5iVUhD5niJGetCJYt83s0A9q+pHl8FBUl8BheVZs PpkG//RFInIkg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 1/4] Squash to "selftests: net: lib: rename ns in setup_ns" Date: Sat, 25 May 2024 21:01:22 +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 From: Geliang Tang I think "ns_temp" is a better name than "_ns" here. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/lib.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/net/lib.sh index b883289ec4a1..97f3d7d6b913 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -167,11 +167,11 @@ cleanup_all_ns() # setup_ns local remote setup_ns() { - local _ns="" + local ns_temp="" local ns_name="" local ns_list=() for ns_name in "$@"; do - if [ "${ns_name}" = "_ns" ]; then + if [ "${ns_name}" = "ns_temp" ]; then echo "Failed to setup namespace '${ns_name}': invalid name" cleanup_ns "${ns_list[@]}" exit $ksft_fail @@ -179,20 +179,20 @@ setup_ns() # Some test may setup/remove same netns multi times if [ -z "${!ns_name}" ]; then - _ns="${ns_name,,}-$(mktemp -u XXXXXX)" - eval "${ns_name}=${_ns}" + ns_temp="${ns_name,,}-$(mktemp -u XXXXXX)" + eval "${ns_name}=${ns_temp}" else - _ns="${!ns_name}" - cleanup_ns "${_ns}" + ns_temp="${!ns_name}" + cleanup_ns "${ns_temp}" fi - if ! ip netns add "${_ns}"; then + if ! ip netns add "${ns_temp}"; then echo "Failed to create namespace $ns_name" cleanup_ns "${ns_list[@]}" return $ksft_skip fi - ip -n "${_ns}" link set lo up - ns_list+=("${_ns}") + ip -n "${ns_temp}" link set lo up + ns_list+=("${ns_temp}") done NS_LIST+=("${ns_list[@]}") } From patchwork Sat May 25 13:01:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 13673998 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 B76F4125DC for ; Sat, 25 May 2024 13:02:18 +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=1716642138; cv=none; b=ZbN9rx32kU3n1DT968h1NxwKnWF2SZCY5E3Ii4Hfz2Y7YlOwP7HOAygRsdMIiyuftDKMfhg1vnFkgfyZh+abi1BxcyV41HrOujgb30s8Zv9i5eLXcOGbnY6/mEVhU6ERw+bFfPUXOl1hYokGBASIz0ojMSiOPswaLwn4Fc/NHjc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716642138; c=relaxed/simple; bh=Uo0GmWZpMxpDtd8A3glQRkAZD7udeDVgJ4hJvantlBE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U9vZVEBVvSlDznv6ACcM0zPIK9YxRZVrR1FJ2pwBa/VOYQwiOsOMGvyW+fd9HO1VlevtsPu+DEHNdAehtTJtfnM5gnuyArA7qTU45KlK1+5mFiJUk2q6EPJ32XvpG+gXCeieIsW47aIu4jsI0alDcctkPoknhKUuTjAIK6fb02Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uPBy9OmR; 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="uPBy9OmR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DE01C32789; Sat, 25 May 2024 13:02:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716642138; bh=Uo0GmWZpMxpDtd8A3glQRkAZD7udeDVgJ4hJvantlBE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uPBy9OmR0S5BvrVVTXj+vNDJCYwI2DtJ+NLO4t4Ci+kxs5+mdnHUYNwve+54asJcl SK8F1Hpoo36o7fFNdlWjuP2MSg5BLhYksiVgpL02Qd0qU02GsuKqiAIhoVJ4mpuaqh AE//sKCtoPn41O4tDYXFPG200qBdH7SCSo9KNkH0xsf6uGUAESRKBMd7/BbaXBNYwy w/qlZ45wtp2UcY+q7N6uz7lgRcFR3r7BHzvEiVF4gG6WmcHg4PaeAMSVIEnuw8U3Sy Peu8eRVx/q52I5/VqaOUu+11AAoAUf6wAiBX1CM9yx8CsZdYi1mXaWIkOvNEk4x9Xq NbJUZ2k94+lnQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 2/4] Squash to "selftests: mptcp: lib: use setup/cleanup_ns helpers" Date: Sat, 25 May 2024 21:01:23 +0800 Message-ID: <029bea7a92e16983747025bc586910cbfa4dd2ac.1716641976.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 From: Geliang Tang setup_ns exits when it fails, so I think no need to exit in mptcp_lib_ns_init anymore. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh index 194c8fc2e55a..7a461830539b 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -428,10 +428,7 @@ mptcp_lib_check_tools() { } mptcp_lib_ns_init() { - if ! setup_ns ${@}; then - mptcp_lib_pr_fail "Failed to setup namespace ${@}" - exit ${KSFT_FAIL} - fi + setup_ns "${@}" local netns for netns in "${@}"; do From patchwork Sat May 25 13:01:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 13673999 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 B6952125DC for ; Sat, 25 May 2024 13:02:19 +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=1716642139; cv=none; b=jcM/zmjww2JDmN9DSw2Kwsg0/4+SNk9EuFDDDQIWWp+6fe8/3G/Ff/mQvbvfyf76o0MMIgmjFPT5sz+97l1ii8Iws1EdCZEuHgP+CtaI//4mLeMNHqlQ9lfFqngMerRUPkjmrTXvstOpG37kzT2Gq6j9rzu21IOaEv2mfhFUA00= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716642139; c=relaxed/simple; bh=cpJhF0tfkdsbMA3a9h27E9ZvdIgKuVwPsv3RdLP16vo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kjY/GTOjsGFsLSKeotuVxUbUGEgqe3hm0jrFGtT3abFxHazVPNEsScpe8OJ4S7wpsE2B7usPc6aD9AQhj+lax4I+tn2CM9gRKtB1fHsBukuYs8xa4A3AqHl6cH0vgxuat+Ee8f+UUlLdOra6qlv9QcC5yatDAMqOWZZ8BW711lk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YK2V/zlD; 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="YK2V/zlD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD4D7C3277B; Sat, 25 May 2024 13:02:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716642139; bh=cpJhF0tfkdsbMA3a9h27E9ZvdIgKuVwPsv3RdLP16vo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YK2V/zlDIMrw+670JqCyijRc+fGV7X3yCNU3peU9xOcjXmnR6oHZdG6YlmjDxuCfg C2Lrl/gyaXVDXC2XoFgYRrKFjEHdahHbHEzC+q1z+5PvTVqf6Lh4ZSPxbDMEBQ/E9a HBpk6aRoLIdzUBjwdJbenKdj0i83QrMmajLIsloSs4IK3RRZkZaMOJjtJ/glaAv1tR KanZBksXNu6STePL7MNGGZd125Zljrj/6Xu2UJ5APvnOMFycfRkDnl3RlKE76gjtuj lqgsyOP5USH5pY0vBBFt0RThI6l03mfxB3sWwmzEYOUAWvBJjK9LPJt52wphjcpJPT h677MA2UEYaMQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 3/4] selftests: mptcp: diag: add ns name empty check in cleanup Date: Sat, 25 May 2024 21:01:24 +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 From: Geliang Tang mptcp_lib_ns_init may fail sometimes, then ns isn't setup correctly. In that case, cleanup is invoked, and ns is used in cleanup. So an "Invalid netns name ''" error occurs. For example, these errors occur when invalid name is set to setup_ns: Failed to setup namespace 'ns_temp': invalid name Invalid netns name "" The patch adds an ns name empty check before using it in cleanup. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/diag.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/selftests/net/mptcp/diag.sh index 776d43a6922d..7ee43c35e0e9 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -31,6 +31,7 @@ flush_pids() #shellcheck disable=SC2317 cleanup() { + [ -n "${ns}" ] && ip netns pids "${ns}" | xargs --no-run-if-empty kill -SIGKILL &>/dev/null mptcp_lib_ns_exit "${ns}" From patchwork Sat May 25 13:01:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 13674000 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 13AD7125DC for ; Sat, 25 May 2024 13:02:21 +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=1716642141; cv=none; b=pAqkV4zW3po0OVZ36qzPZ1enokIXvj08IEWOBqY3DfRFzPrcnxxdu53R+t3OUDjTbBGJTaxuUUYHyH2NNglnuf1Vag+YtbDQEatyANB+R1tMFH+83/f393JhWp71c9WJcobp6fm0aJtsD95fbBvjZaOZDuEPS4mP/Sxqvo8XWuc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716642141; c=relaxed/simple; bh=sqRT7u1zqCVp77hX/dnok3dYjaU3tkuOKGGNWeA0Ri8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c5i8kvu932uyDTfwfpceNWJnE9dT8L/OkOeUs8AnLlLzInGEV8SSz2rZsYs9Q8PD1Et96V3bPim2brYtmM3cSN2eTEe7rQ1P6XnfZLFFS9YkJPoMXeLJ0mdAdM0wO+52a9im15R9Qzga/bcAQETy02TAqdr2noXG6nPFgpegvkE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OIDPLRpd; 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="OIDPLRpd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 29C7CC3277B; Sat, 25 May 2024 13:02:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716642140; bh=sqRT7u1zqCVp77hX/dnok3dYjaU3tkuOKGGNWeA0Ri8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OIDPLRpdcULrgPiecnEVCkwUdBimA3X305gVy3i9SNZISmI3X+Zo8CBCsOUMERmoi X8n4rcz1dQyouUlBGNTILV9jQOk0xXFPzHGGUmcLylh8Y/UCnIomZAwhZqKPmiDcHH 7scusukjIYRnM4Ggknwu3tf80RyKbd97GIVQ29kPyF2NYpnGQZ7/m+o8VRk0IZ5afr NJHa029fCa1NBiaXiXA9U/EDUAHg0srLn4bEheptybYSGxxS6hmG1zLioM8wLHP1ZZ ng8rSIsbQJqzskxFoB77UU4T5/gQRZ/iOR/FJ8ROOpNbrRVRzh0xlE4at1FQX0VRcG PINfoZ4qJgztA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 4/4] selftests: mptcp: join: print title at the end of reset Date: Sat, 25 May 2024 21:01:25 +0800 Message-ID: <7dbbb909edef2fecc46bde435fae21be6bc9ed81.1716641976.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 From: Geliang Tang init or init_partial may fail sometimes, in that case, titles shouldn't be printed out. For example, these errors occur when invalid name is set to setup_ns: 001 no JOIN Failed to setup namespace 'ns_temp': invalid name "001 no JOIN" shouldn't be printed out in this case. So the patch moves mptcp_lib_print_title from the front of init to the end of reset(). Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index 2b66c5fa71eb..d20a053eee8f 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -269,8 +269,6 @@ reset() return 1 fi - mptcp_lib_print_title "${TEST_NAME}" - if [ "${init}" != "1" ]; then init else @@ -279,6 +277,8 @@ reset() init_partial + mptcp_lib_print_title "${TEST_NAME}" + return 0 }