From nobody Mon Sep 16 19:09:06 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 99BB513B780 for ; Mon, 27 May 2024 10:58: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=1716807525; cv=none; b=hAQAcCaSPs2YB14IHS/QU26bwEGIRnDVnJN6cXJIUCWbsC9p4a1iG+xhi3dSQB2q53/93iU3rsrmhYqQSvnC6oA3+vavu9xg0KA6dBE8m/C8lAa9YoU5wRnzExF77IP0HhoaeyNuhcjQoxCvXCZgufcbmGeDaRz4y5iWtaZZ7vA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716807525; c=relaxed/simple; bh=5sF13AQ0XQYTT9ojTSNuw2FASfABGqn7HXvokl2i96o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FdtI/5eWGfA4sjQQRZvM64E7p+O+3b0Tfj3BPXTIrklSt2Cysd/CtmjLASS2UFuY4GFfYEsavKqdyz8RDZ7jeMFR0bNNJOlq04RdtTTwLwAhesLghzdDZMT1Au4cXbWXSTocpWjiBua7CdZOum/RTtCj3qSsfHOG+lVcT/r8RBY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RGSf6lII; 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="RGSf6lII" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63045C4AF08; Mon, 27 May 2024 10:58:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716807525; bh=5sF13AQ0XQYTT9ojTSNuw2FASfABGqn7HXvokl2i96o=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=RGSf6lIIGryuqOLOQg5O/5/bG3pJiSaDg/WQyJxoUHdZhKhlLmlWlL+YcMUrCAOrv 5ReWlJVFd+OWQhYABXbjyU0iaCJlpBo7LtDYu+lGOrWZgiYNf5OflT+B2wmc6pwwxO F0kyjXp65RYYj3GZSmxbb7h+k8FZln2UiW4QW8oIRLRrI0mk6Uxo/Tues1K0aJYADx vexf7ajeUEAgC0JFwvDTaRrPP+zG73ggclBkZOHow4DkuzN+PpHO597OgqaB4c03oL gE1Um4/jB8EjqdAc93riQ6O9mBHSv3pE1jUdibgG5bjxg4dLS3kvDMEKGNsQCOpBT0 GLVhJFwbUeHOw== From: "Matthieu Baerts (NGI0)" Date: Mon, 27 May 2024 12:58:28 +0200 Subject: [PATCH mptcp-next v6 1/9] selftests: net: lib: set 'i' as local Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240527-selftests-net-lib-fixes-v6-1-72411ff2460e@kernel.org> References: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> In-Reply-To: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> To: mptcp@lists.linux.dev Cc: geliang@kernel.org, "Matthieu Baerts (NGI0)" X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1112; i=matttbe@kernel.org; h=from:subject:message-id; bh=5sF13AQ0XQYTT9ojTSNuw2FASfABGqn7HXvokl2i96o=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmVGdhapsnEiXho2pd1VqlLhcwq37iLKJrZ8p0v Ax+gvyqzIGJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlRnYQAKCRD2t4JPQmmg c9TeD/4xgAiqbmpS3STvrW+V3qOCufGhdYX7dvd2dpIdEdl86gvbMl8FJHZZP0NmrFWaBvLJl3A mwbArYZm3NC46jtlwof9iy6yQ1csR1KvsaIGQdDigPzi9CCLHF6gwW1ozjGm/CI1c/ZmNOAtc3s o1QeJyrJCwjJt8h7ZLWdSB+gCguM4TRQwwARwNhKt3eR4b5AzA3iICuXnQwy3RzYodlraMqbRIL nbAKj4JRzCi91GHDyrD7mBHcLY/QYCs7jDj7GPlGEe0pb2nXfTQiH8iecbr48TlVyxOQAU6qIKw AcuXFlXpvPVkke7FotUKzYkaLjkPV9XmtM7XfkuUuCODvDtP88AOL8UQXdkyyElXmjzJvCq599I XcLzAHhTZJOakXGlLsR4FlE1lFYzyyK+9s9MBfKK6xAjYLSLhUX2pkmM/RXWsfks94MFC1SCZfB d2MvceztYQpyFuNOEVYu0Xcu0Cev5wo9rWvSU9GXTLulOHZZrwSmZGJLagnkW08whWKcB3K7A18 xicyi5TwyG/+echg8h11j2zQ8VxOn73753pmYnThei0UcShLgpEwoyDtV+zcTjTTe76DCt8hp0Q Ru9dYGA/RjBR1A8ZLal9m40hQkKHlHuEFGpr8OGdXQwwU+dB2hJtIK8x+7EhOd88ha5+SBNvKGT IoDiUwc3CBLMNiA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Without this, the 'i' variable declared before could be overridden by accident, e.g. for i in "${@}"; do __ksft_status_merge "${i}" ## 'i' has been modified foo "${i}" ## using 'i' with an unexpected value done After a quick look, it looks like 'i' is currently not used after having been modified in __ksft_status_merge(), but still, better be safe than sorry. I saw this while modifying the same file, not because I suspected an issue somewhere. Fixes: 596c8819cb78 ("selftests: forwarding: Have RET track kselftest frame= work constants") Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/lib.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/n= et/lib.sh index edc030e81a46..be80f7b1f9d7 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -27,6 +27,7 @@ __ksft_status_merge() local -A weights local weight=3D0 =20 + local i for i in "$@"; do weights[$i]=3D$((weight++)) done --=20 2.43.0 From nobody Mon Sep 16 19:09:06 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 AEBD313B780 for ; Mon, 27 May 2024 10:58:46 +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=1716807526; cv=none; b=tgnvVBlA08Kj92eRoUcBbQ5V+szBwv2Ybvtw7kuZLKCBqm8hWCEnQrZYOHrTMSqT7dg0b9hs9Q0vsekmDrigVookxgpra6GqFOzhXq2TKI6aNjLfAgx5AmJS+4ZRTqwKkmHzTMBt+RgUqThO1MvZvWB++7+zsOYEfmFDnVxnt9I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716807526; c=relaxed/simple; bh=isSgg6Nbw4paOmQkxswWWXT5wo3Wu8UKlwr7DvZsRVE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ESQDWIMiHsSDqc+eB9pmsyTziuLThVxkEkIumjbXslFTjySrzYZiTKFByreL3JsPCJBfIie1W1FNRkqkUYgDEJIKbb+4rMmusafdqJPRcwhk+p5X2hoy/il4R///d0yvDG3UN63LSOWSgHr462ym85dH5vwOgTjn/79Ej8foq1U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fVqj4jNS; 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="fVqj4jNS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 910E1C32781; Mon, 27 May 2024 10:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716807526; bh=isSgg6Nbw4paOmQkxswWWXT5wo3Wu8UKlwr7DvZsRVE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=fVqj4jNSv9fesv/RsY6HnFOrDqTSI7/Rg2ferGTrmnePupSv5mrX3qbxz9sgIpTdj eVXh52c8OdLciHBmQiP8lxwut2FdUAB/c3SNhSCsLdylY1j8bErhJcyVzQtFsHqIhW q+C0r6B9+deyaH61btC3D8kVAUxqZa6w9bY0O2ewEXvT+uLlPp+28F0YsF+4ZK4CP2 mgUuFdNy12vGu4I9o+b5eg/3eExQTUturzFK9lBW+lQ9cTWeQWBTYiimisXxwuzimn eiAn0nubeQYJLSRu1RRoUB7G+kQbs/Jp+q2x4jfRA35buv+5UbxDtb1mL232XiKcc6 H6Y39U5iYUHWQ== From: "Matthieu Baerts (NGI0)" Date: Mon, 27 May 2024 12:58:29 +0200 Subject: [PATCH mptcp-next v6 2/9] selftests: net: lib: support errexit with busywait Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240527-selftests-net-lib-fixes-v6-2-72411ff2460e@kernel.org> References: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> In-Reply-To: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> To: mptcp@lists.linux.dev Cc: geliang@kernel.org, "Matthieu Baerts (NGI0)" X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=882; i=matttbe@kernel.org; h=from:subject:message-id; bh=isSgg6Nbw4paOmQkxswWWXT5wo3Wu8UKlwr7DvZsRVE=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmVGdipIAFNcWBXmnhlR00kBFXp6pd7YkjjjErK kp3X0BqgWWJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlRnYgAKCRD2t4JPQmmg c8ucEACWqN40Q3AhX27SZeblBIowVwcS7y6eAWrO/ENxAc/VtTOwTdx0RV0XxLqPG5/F0dnUDHw jJ3icm+Qw5Sp7OBxHlCzdhHE1ajSQNRf2fE7ILdDbs4foKlgrOxIma87hgbeNs08CEVQ3S9mgp7 lT7yDWjvLQuAv28fKdo0PWgbl1hQ6cm7921BJnRKsZFx2agIIdRLg1LGpWWEQjc2hO8C8DosdkS FsvbK8FVFS38+09qDrcPVyH4fkcz8Hl6alcyeBozoFpJjFbDO9D6ICVN9x/GEc9JFAnPA0Q0Lq3 FYwwZZ03sZHWIFx+K+Jop5LSbDFXoxxezbfmsn5diFPW5ULEotbZyr8LLAPstijamkcqaJI67gu K24Gv62Ebj8gD+bD/4tw2JLQthzbjQqce/bN+c70vwLxYWhm7eNKwtCKT2PGoK2EuCSMS7VVrxY dsBTueLND1Qo6m3bxUXw4/bsTtFW6pZqYZGoKyp+09Ocv21ziyEc4iujwOJ9TS5CCzy3YT7iYrl 3rMc0ofoMExbuQ5TYbwqLj4AmB73QAugtF3PelXfLUCc5Lf4nZZvnjbCz7kCf61z1l03UaFA16Z f6nGDJbZO8AH9Ui45AI5iirsG85S3yO6Pk8vVWNT87KsJKR9G96R4ifpk31qxdbe7umDzUftuPx uiGqmdtRn0NvaxA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 If errexit is enabled ('set -e'), loopy_wait -- or busywait and others using it -- will stop after the first failure. Note that if the returned status of loopy_wait is checked, and even if errexit is enabled, Bash will not stop at the first error. Fixes: 25ae948b4478 ("selftests/net: add lib.sh") Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/lib.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/n= et/lib.sh index be80f7b1f9d7..2fbc01003b0f 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -68,9 +68,7 @@ loopy_wait() while true do local out - out=3D$("$@") - local ret=3D$? - if ((!ret)); then + if out=3D$("$@"); then echo -n "$out" return 0 fi --=20 2.43.0 From nobody Mon Sep 16 19:09:06 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 9A05613B780 for ; Mon, 27 May 2024 10:58:47 +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=1716807527; cv=none; b=tse9RNCnM3FLALkNbR9C+gbjfAhGZjrR87J568Fo70Rp6KzevytH3ZwA2yLSrDuwnMztzfjNOLKT5O2soD03YK2p0XUZdyiX1hvqmgrqs/9AeHYxSO2IrJOZmmsho13Ox5IM0GScWhWDNqSqCPAAdv/pLeAhy9rdPx0sviOloZo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716807527; c=relaxed/simple; bh=CRkpD64FtxDqs5tvTLqLkgdEkfYYf7WaDTjqEk5a6Nw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WqV7FEmMiup7+3f1GUOEm1rf3Ehp7LaBK2q5qfNidEH/Ye0yYez/yGVP9XtE3uLgKu5gcAFMTtKs0JZW15y5xwLhKtAwt75XWE7tWVtxtT3pHqbLF063F1XJyoiWgRA0FzxLSKRfRaSMP1qCaJbj5EpXNnTgrxFQ+6rclg0R25A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BrylMWPg; 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="BrylMWPg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDF66C32786; Mon, 27 May 2024 10:58:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716807527; bh=CRkpD64FtxDqs5tvTLqLkgdEkfYYf7WaDTjqEk5a6Nw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=BrylMWPgdhpoKmTj4FDLKLdfCkm1cKBa5a78VfdLzZq+0wc9xNfs1bMKCSeN/0z67 XSbaawzAisCsp13M09LogGgmmCWPWh6sRBrPPOja/QhabiWhSsMYDm8lDW4Vx9RSfP ZNbDeE3ClhPnYaIG3ttFtEpVOtVWHlw24Oawr3+rhfSCGd/Ihg/46/xt9GFII6FYaJ voYAiQa7B3GYp3z25L5AqKmxOt4kafD1YljLHE3RptPrSDF6c18RvU7GyP6p8dItqF AHLgC+WCLN8amyljbDYpt135KEttDc2Bnhw42pxVwxt13mi/ZgXN3/X1cGQSEXl/ee MSW/2L1r8bZBQ== From: "Matthieu Baerts (NGI0)" Date: Mon, 27 May 2024 12:58:30 +0200 Subject: [PATCH mptcp-next v6 3/9] selftests: net: lib: avoid error removing empty netns name Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240527-selftests-net-lib-fixes-v6-3-72411ff2460e@kernel.org> References: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> In-Reply-To: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> To: mptcp@lists.linux.dev Cc: geliang@kernel.org, "Matthieu Baerts (NGI0)" X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2208; i=matttbe@kernel.org; h=from:subject:message-id; bh=CRkpD64FtxDqs5tvTLqLkgdEkfYYf7WaDTjqEk5a6Nw=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmVGdiUkKjQ/zfAhIkamDLx9jU+UrszVGY4YwE/ ejhV/Rjbi2JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlRnYgAKCRD2t4JPQmmg c1rZD/9qjiNX2P5ZpgwFI6d+DMqF79MGP0TO5LNQXBY8ljkNZc4/p9x7s1sPDe80Jle7tipzV5f Hcl0iF8t/mkUJAGSOTYrt/WMenSHQ83Xuk+0J3AvWZ4zwRN0VajsnLcNPifav2vu/Um643pGkdf h/ZO4qiPJVsoXl+9GzekUj2anca4xfQlwbCht/fzGn0OwKSFqqVHYN0FYhqiI5kqSjHQ8U6usfF LbybTybJ4Gd4oYE/QzXGBtCXNs8FZxbg9odpXwRL8YPzPJIlXrLPF9mNEc9n3hjFWPXOvhCDgKE zGi4PBhfwgM/pMvTHKbQ+HxbSG5H8adhaSi0UeGcAn6gaI8k4leH4OuBPH+3uIX2UJLYYniWJ9R VEwRlX4+13zdrV/DB5AkpisvfySH58s1qOBAwUVN/xVGrifdNHUWFQdcHEX7wDym0Rp1t3BmFyN jbfJREo9nBa9JrdhWyc2rGtvvCxxZ52TLQShxwUKInIKNI0OZDGI5gblK0KgoMo9x/SyYDZtKaw zttW5a+19sxzHxk7QtKbw7soKbI8kcG62n/RYT1rnBfLLjvemS+iiXtZmQFIlYHzcEvl24BPk+H I0whSLYHnLNhEQMAIaOlDNz/lCcsaCNxPuhxd583bPs0mz5fsGpkYmXtAuFEj1SsOjNZT1hGNuO hpp3DY/Z7FCzsqg== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 If there is an error to create the first netns with 'setup_ns()', 'cleanup_ns()' will be called with an empty string as first parameter. The consequences is that 'cleanup_ns()' will try to delete an invalid netns, and wait 20 seconds if the netns list is empty. Instead of just checking if the name is not empty, convert the string separated by spaces to an array. Manipulating the array is cleaner, and calling 'cleanup_ns()' with an empty array will be a no-op. Fixes: 25ae948b4478 ("selftests/net: add lib.sh") Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/lib.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/n= et/lib.sh index 2fbc01003b0f..9155c914c064 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -15,7 +15,7 @@ ksft_xfail=3D2 ksft_skip=3D4 =20 # namespace list created by setup_ns -NS_LIST=3D"" +NS_LIST=3D() =20 ##########################################################################= #### # Helpers @@ -138,6 +138,7 @@ cleanup_ns() fi =20 for ns in "$@"; do + [ -z "${ns}" ] && continue ip netns delete "${ns}" &> /dev/null if ! busywait $BUSYWAIT_TIMEOUT ip netns list \| grep -vq "^$ns$" &> /de= v/null; then echo "Warn: Failed to remove namespace $ns" @@ -151,7 +152,7 @@ cleanup_ns() =20 cleanup_all_ns() { - cleanup_ns $NS_LIST + cleanup_ns "${NS_LIST[@]}" } =20 # setup netns with given names as prefix. e.g @@ -160,7 +161,7 @@ setup_ns() { local ns=3D"" local ns_name=3D"" - local ns_list=3D"" + local ns_list=3D() local ns_exist=3D for ns_name in "$@"; do # Some test may setup/remove same netns multi times @@ -176,13 +177,13 @@ setup_ns() =20 if ! ip netns add "$ns"; then echo "Failed to create namespace $ns_name" - cleanup_ns "$ns_list" + cleanup_ns "${ns_list[@]}" return $ksft_skip fi ip -n "$ns" link set lo up - ! $ns_exist && ns_list=3D"$ns_list $ns" + ! $ns_exist && ns_list+=3D("$ns") done - NS_LIST=3D"$NS_LIST $ns_list" + NS_LIST+=3D("${ns_list[@]}") } =20 tc_rule_stats_get() --=20 2.43.0 From nobody Mon Sep 16 19:09:06 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 C5C1B26AFA for ; Mon, 27 May 2024 10:58:48 +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=1716807528; cv=none; b=LcrksgbRh3EgaWF4Z5kSMzgbC0cSzJL5uSfKN64URPzF+u5tJhOxkCIcxGzaJ+ruf1xwvkzV0JiTdQj+bGmNFOXhVSljDt72cN5QlOYfhyyflIe9stw7RD4Km+ipqVmqJL7xdqxLf9FA28RHLTOHoexh+ULhBHxaDDvlpgRyRHE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716807528; c=relaxed/simple; bh=JXMQEe3zsXqCqykV0TiMzHSF/bLvNSHAVqPzoUmJcJI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Atn/L1jsQ8voVJF/WiCV6oxGof4+BRzB7dBsj4mi/eldMtvuF2+b0Bv7nrrgH7qxtbozblKPri7qWbckVaqZ4C3JxsORXXQlqM6ZjHhn2ohsKS2uErHWDnjJ4AZ7u/7cf/nUH1t3VEAiTKBhZaB9QesFaju3phrjgK+SGbtKYEo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=axIWYFu8; 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="axIWYFu8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EBCBDC32781; Mon, 27 May 2024 10:58:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716807528; bh=JXMQEe3zsXqCqykV0TiMzHSF/bLvNSHAVqPzoUmJcJI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=axIWYFu89dJ9o/zIIiFtUfuBfKb96i5+DPobvHXtN7ex5t+AfKFsA3v9I7yJOTygv sA1sictYT/gJMNXYasxg7gU5bUYJEQvA6sfS2FtQbheeip0uPIU6YKWmt18TGBq2JP xQJTaEFO9JCfCZV9jOMUIPsAMA5GGkOO2yFVBOjjRTonJ0M+CW5/SQaZNdzNBijeLs HIgOmrBIUnJmoXPXAe0+sFskkOClTf2G/Lm7jNEki/CGreg6JK/ukiqNhklMgghZ+t Z+Oh8f9czU1/nUrQp55sQ+D95YxPoSbL7FW5mlWCRe4Of6hHSveiG/Km5winehuCt0 B4se4sFQGoKEg== From: "Matthieu Baerts (NGI0)" Date: Mon, 27 May 2024 12:58:31 +0200 Subject: [PATCH mptcp-next v6 4/9] selftests: net: lib: ignore possible error Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240527-selftests-net-lib-fixes-v6-4-72411ff2460e@kernel.org> References: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> In-Reply-To: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> To: mptcp@lists.linux.dev Cc: geliang@kernel.org, "Matthieu Baerts (NGI0)" X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1044; i=matttbe@kernel.org; h=from:subject:message-id; bh=JXMQEe3zsXqCqykV0TiMzHSF/bLvNSHAVqPzoUmJcJI=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmVGdiVwh2eHZmoQGEd+JOxMjPRkzDsVTnEns7B V1yfypm7BWJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlRnYgAKCRD2t4JPQmmg cyVBEAC6g1CjkMr/nAQ+DLtUcSmRVujg/uyjwkDuhVZappJtmbSn88xT8cUfaqsy5MOzJeMAwXr FIgysnvGSLNaVBLbE42e1oebRgpj86xX0PfVh76rNRnjeNwLGRTnDCMYNqT++Y7Ly2q4yrQeA/J jUnvnJVV7L+VUFi255eXdA9lioncLhOsaz6w/AWR+loGtMiDPb+M6+Wlly6dbLBln63NmBbUCR4 aYQf4xBVD/oYhQgvMX4wRHp9Q539j027Tbur+ctcOTz7yfpDtehzItUmRAdZGKb8dcN7RtlL340 6O1s5sF96JaR55OLHJ81UiiQvhB7SDN/yHFJeUicX7rKE0KISf+g9VJboK/HnBPdqzT1EVXIP0Q VdfBEYc3KxD9CWBRh8mlLgaQMWL959f05k4H/M5ZFKgeU8u3svkay+wHtyb94WZ3SvYwEdahSzt 1kVaJZxYsvDs9iSJcIrYuSeyq1mgZMIHxjqIjRaylQvG4WdrFm99vfkNoYjG1F0ksw+45Lhxv/x 4LmVeICcRdcrISA335ERd9NBnC4j57o3UB3oUmL5GxBtC+yIiVGJeZOpyJZpnvmT8sCiFx8slkk 4YyV4BhqX2K+zq9Inp08m/lmVETKn8xDGAesLMIsWH1QGf4xTNLRjEs3LPyskdfYRuSlrybL3Jc nrVy4C2zGiHCLbg== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 No need to disable errexit temporary, simply ignore the possible error. Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/lib.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/n= et/lib.sh index 9155c914c064..b2572aff6286 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -128,25 +128,17 @@ slowwait_for_counter() cleanup_ns() { local ns=3D"" - local errexit=3D0 local ret=3D0 =20 - # disable errexit temporary - if [[ $- =3D~ "e" ]]; then - errexit=3D1 - set +e - fi - for ns in "$@"; do [ -z "${ns}" ] && continue - ip netns delete "${ns}" &> /dev/null + ip netns delete "${ns}" &> /dev/null || true if ! busywait $BUSYWAIT_TIMEOUT ip netns list \| grep -vq "^$ns$" &> /de= v/null; then echo "Warn: Failed to remove namespace $ns" ret=3D1 fi done =20 - [ $errexit -eq 1 ] && set -e return $ret } =20 --=20 2.43.0 From nobody Mon Sep 16 19:09:06 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 4544826AFA for ; Mon, 27 May 2024 10:58:49 +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=1716807530; cv=none; b=PJ7UO+9SHecOwNguDZu+GMYPgNI2g3Goxh394Kf8iHfqR3o1hMz+eiKTNtWovG8uRjLiwa9rg9njQu3XFM3ToxkF2FXW2oF1H/RbAZkpcfXFR89ITx+fTrG0qoEAcSsCaxBxf2l85tNpuUTWuz6BYhZJ/txIKB6wg4GknDsutjo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716807530; c=relaxed/simple; bh=sGr2uTeKlT3jZmTEvKLVKhD90ck6MQ67snxcFD1F3VA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=g2/zoBI4QvqK4wGUKJyjR5npLX+co3EFxTs42vcnC5ilSRGsu/1uDO95bqOB2fUK/FFRsgxe+FeWojWwpQTmelXisfr/0DaUHtiSd4DFUlMXWsqAtW2SI37dtsZh//Cf3zndjiEXEuDUq2fsrSLYLY1q4OwH4LaMPq84+eibCQY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QZyo6qa5; 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="QZyo6qa5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2458BC4AF08; Mon, 27 May 2024 10:58:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716807529; bh=sGr2uTeKlT3jZmTEvKLVKhD90ck6MQ67snxcFD1F3VA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=QZyo6qa5jckejtIa+g6ibDvveZPgI3e4qB3As9CK0LO+E6EaSh0k3DKrLBy2ZBQi5 dLmUz45VFsR/D96zFzj6BnJy2DyZPo+q/xuxry1RQAv0RPujYQNhLme+tUD7NoSuvh q9INzGXfYTbntxnWlcMdDLYwOPq8w3XViDsttCgpxh39JVbyeICDFSY0xY7hN8VCN0 4qHyHFWYnXjcFMVSLBS+KmIR8Eg3i12vitgbzERQL1cGWYiEJBj/lgijMeQfNQdrd4 SWg/mYkdC/vUY+q5mev0JbWO6cGR+EKHvSfiIIw5eMIUltFudOKGU1FZ1vGohR9UYX qeh4II0rKQq5A== From: "Matthieu Baerts (NGI0)" Date: Mon, 27 May 2024 12:58:32 +0200 Subject: [PATCH mptcp-next v6 5/9] selftests: net: lib: remove ns from list after clean-up Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240527-selftests-net-lib-fixes-v6-5-72411ff2460e@kernel.org> References: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> In-Reply-To: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> To: mptcp@lists.linux.dev Cc: geliang@kernel.org, "Matthieu Baerts (NGI0)" X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1863; i=matttbe@kernel.org; h=from:subject:message-id; bh=sGr2uTeKlT3jZmTEvKLVKhD90ck6MQ67snxcFD1F3VA=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmVGdikuSiqcSemsCMtIfeqF4avuftvdwoO79ev oekFYMEjIKJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlRnYgAKCRD2t4JPQmmg cxbeD/9TbF6IAactOHpOOZqRsezXqXzRqIxMKG92fGDaNX3rQn8sY/F2g/nd4S9iZ5Z7JVp+/BU yGg/QfrecyRfzoJ8WdJs0H4HMZrP4/5h/omAJ7OGSZLg4QZ5XsobJNunkADbVoZU6riLZH08Q63 J1vIKIiNpA2QBzvJbtKVaMvDY6wV8EB8b3JqPhZQwEvVeJl6YZMI9NQ4ocoT3CdITmBUTMUxNLw M5bZni972tvgFZK3zzWH4Vb4Q5MxrCNWF2hLRbQmWO9k9VR3fsBkfri8/sN4TbLJPNH9ad0wym0 sbCZBnyF1WoCLGQSneYsDdRwJ4lBRKiorMqzbLXbuB0L9xPtn1KzbuSIt81LILCCLWj7IrGdeNP rSFgnp9DOhylmFRAMCBVw33dqQ6/HsUaDalyLSqYGZ9T3tzVmIBoWxVW0/uSz71IzAuQLmCM8Kh ypVy95JCt7itz+bd2DDIpC96kLX4nAyzgORB6fNh+xDpAhnVDC68l72tys4ofMgCiU/TZR6rlG+ 1xy4bR2Y1EZNQVJUuzW/uqG8MDTkiYyhNbT6wylufGz8rHW/JPlDI8KTy7ZDD0hpFT1sXXzzIKU 1Y41NCRE4gx/OLdYcPlwLzVuJtjWGiM/w9YtvB++QSq9Nh+eJxNRZFeNWtrxyc3FFxe+v4Xnggz pjjyIOVgs58XIDQ== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Instead of only appending items to the list, remove them when the netns has been deleted. By doing that, we can make sure 'cleanup_all_ns()' is not trying to remove already deleted netns. Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/lib.sh | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/n= et/lib.sh index b2572aff6286..c7a8cfb477cc 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -125,6 +125,20 @@ slowwait_for_counter() slowwait "$timeout" until_counter_is ">=3D $((base + delta))" "$@" } =20 +remove_ns_list() +{ + local item=3D$1 + local ns + local ns_list=3D("${NS_LIST[@]}") + NS_LIST=3D() + + for ns in "${ns_list[@]}"; do + if [ "${ns}" !=3D "${item}" ]; then + NS_LIST+=3D("${ns}") + fi + done +} + cleanup_ns() { local ns=3D"" @@ -136,6 +150,8 @@ cleanup_ns() if ! busywait $BUSYWAIT_TIMEOUT ip netns list \| grep -vq "^$ns$" &> /de= v/null; then echo "Warn: Failed to remove namespace $ns" ret=3D1 + else + remove_ns_list "${ns}" fi done =20 @@ -154,17 +170,14 @@ setup_ns() local ns=3D"" local ns_name=3D"" local ns_list=3D() - local ns_exist=3D for ns_name in "$@"; do # Some test may setup/remove same netns multi times if unset ${ns_name} 2> /dev/null; then ns=3D"${ns_name,,}-$(mktemp -u XXXXXX)" eval readonly ${ns_name}=3D"$ns" - ns_exist=3Dfalse else eval ns=3D'$'${ns_name} cleanup_ns "$ns" - ns_exist=3Dtrue fi =20 if ! ip netns add "$ns"; then @@ -173,7 +186,7 @@ setup_ns() return $ksft_skip fi ip -n "$ns" link set lo up - ! $ns_exist && ns_list+=3D("$ns") + ns_list+=3D("$ns") done NS_LIST+=3D("${ns_list[@]}") } --=20 2.43.0 From nobody Mon Sep 16 19:09:06 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 34C5926AFA for ; Mon, 27 May 2024 10:58:51 +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=1716807531; cv=none; b=tAQte5sxAS4xiDnkTXa1UaGSPPO5UZlpmTiTqKobrWlZC/0BQVxNv5a8tZPIfTu10/9ZbXwLGwRtsuyntqf9um/qNPOiFC7+4jFB5lxXkn6B/Xna9uIG43+NyO9w5Si42PxGTIL/X+jkefRSlR7nRgUTUIJKI6FOq01yR8XaROo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716807531; c=relaxed/simple; bh=9VuYqdICtJfu90SkZyo3iZFyC6Rb4UbZ4hQh9WQWxBQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=REa/0KblzQ4NgYjc8sSW9rBnav7Xz1+O/Ov7ROOAguhsx2i4+n0hAdoRY0ZeSRON8zw7/H+MNMoQ7/uKxVKPmZjGiyPAhDXbbDN5OQvLx6Iwy8yQVZZq7v/ry0EHbOeZX2h56Cf5R4/QpgQaOsLzaJEBi0D7ESbL1TYAU+OgUW0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H2grnv18; 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="H2grnv18" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5134CC2BBFC; Mon, 27 May 2024 10:58:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716807531; bh=9VuYqdICtJfu90SkZyo3iZFyC6Rb4UbZ4hQh9WQWxBQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=H2grnv18ZjoIGcpzad9qPi7JZHqopLFVj5vCZa7f+QFHs6E9yRcOYlO/SyHyzrxwE uGK1CJPaOx1QyExddfQcLoRGSGss7Sr5it8eoArPgrq1+JSX4imZNWgP6TPMfhC6ZY 4WoNVrRETg31Dz6EiaQpQUCwYc2Ve8u7Wmc89ylN3NDGyNenfIE4bLSfWojVI2+YsL qIyXAU3USbxQJAMhJjhrHxWp1W5Qx77LxTmni9IR14gxfd5M1UzzRVN8J07+j3bTDD epEms3Vx9+i6AYVqLVZSb0jRnZfZxjh5uQASPs2TSSdZU7R/kyPcfTVMDgHuIS/kEy N3wj5p7xbwkEw== From: "Matthieu Baerts (NGI0)" Date: Mon, 27 May 2024 12:58:33 +0200 Subject: [PATCH mptcp-next v6 6/9] selftests: net: lib: do not set ns var as readonly Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240527-selftests-net-lib-fixes-v6-6-72411ff2460e@kernel.org> References: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> In-Reply-To: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> To: mptcp@lists.linux.dev Cc: geliang@kernel.org, "Matthieu Baerts (NGI0)" X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1378; i=matttbe@kernel.org; h=from:subject:message-id; bh=9VuYqdICtJfu90SkZyo3iZFyC6Rb4UbZ4hQh9WQWxBQ=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmVGdiIKPDZBEoiap+q0MXzI7/Cd/1ofUd3riZX 5ZvBfi9HSiJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlRnYgAKCRD2t4JPQmmg c+4vD/0SprY2rR9hjVNQtyamnFG0GUrzpEg2Nrz1JwPmnuARc/ed9ukwToKPOgnskxmLpIdo1ge yqCcYOy5085Wp15uxsKXX/YDZtAJYDhqJTpTpAdixuMhloKMYlBath+RREG5CzeUm3RHXRf/yk2 I3pZLsNZ8k4MF8xj8qY/FWRrPKm2aiHQJYOxqh8ErwavG49ZrZ/XnJrYrWNFkwy1kTWmUs3Uj6J t56GC8xQvBYqw2HNWphUCunc88ixeBUeSORuZkInjlxZI1e3A3jdYx1I+KCfVRuPaGNogsF7oBf eeHUQ06/ONgtj/yXklLwjlsQi0PjyHVY7RCLDa5L0nvRTH5L+fDEujBGfHv/Vl8tTW43WF6Iypq XvH2pIk0Eo71tpqobEDjKF8jlY2TMM0Qhjf8mWbi7tecWQHwnIzTrtilSkfUPKbEtGNIlzlTjkg neT9NLE2YDwHDSL6IwtZaMV4ywYmwSRzMjfMeOrTsh3poG6/0qf01XlHUSFdX0bILGhy6k/ky4e qb7sXTEr6yk7nT/TsGc0oSXSVuCcZrkF5KV1VUT2nr2qJHM8HPOY9LLs0uoh9CAieAYYyoPHG7T enzhpkrz8HvoeqxUlThG3aNFh0k7K7O+w2CCtwsFtyXx38Y+s1HjOrTd2zMy13RupPovF1JwKj3 dCe65Rccxb8v4Sg== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 It sounds good to mark the global netns variable as 'readonly', but Bash doesn't allow the creation of local variable with the same name. Because it looks like 'readonly' is mainly used here to check if a netns with that name has already been set, it sounds fine to check if the variable with this name has already been set instead. By doing that, we avoid having to modify helpers from MPTCP selftests using the same variable name as the one used to store the created netns name. While at it, also avoid an unnecessary call to 'eval' to set a local variable. Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/lib.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/n= et/lib.sh index c7a8cfb477cc..114b927fee25 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -172,11 +172,11 @@ setup_ns() local ns_list=3D() for ns_name in "$@"; do # Some test may setup/remove same netns multi times - if unset ${ns_name} 2> /dev/null; then + if [ -z "${!ns_name}" ]; then ns=3D"${ns_name,,}-$(mktemp -u XXXXXX)" - eval readonly ${ns_name}=3D"$ns" + eval "${ns_name}=3D${ns}" else - eval ns=3D'$'${ns_name} + ns=3D"${!ns_name}" cleanup_ns "$ns" fi =20 --=20 2.43.0 From nobody Mon Sep 16 19:09:06 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 D30D226AFA for ; Mon, 27 May 2024 10:58:52 +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=1716807532; cv=none; b=HXvRF4jL243n8ibZV4FPeGxkUUQD/lnXVTWxXDDV4PzdYkNBYLwKkwDdLTk4MswBSYFRETfQ9/hFyAL2hZsM7oCbkcWq3kaVQJmUSwvzR1tTH7ZgdiQoSPUVvcuD9EKqHOi8rfUbMWLf/22dRdfOYVm5lLEw2vpHFt6qzo7KWAg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716807532; c=relaxed/simple; bh=v07HtAOFNZo3mgcCFp7Ei+IU6Ufyv1bihLw243ca9xI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fdWGBWFIxzUS8fy0xY/mIVls0AI3x6Rsv9kCs+LvUs+Rzrp6XYvmSguTy5G3OGhTqCjxyhEXBZ1lOhR0sxW8YMVLxZQw//VOvNol5yRuKF7BiISG+cB4OfecXCIBBEaVOt4rscpp0wF1sbvfOHWAn1vxnt6cANZwzWerYR4j5K4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FgLto0E2; 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="FgLto0E2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DDD8C32781; Mon, 27 May 2024 10:58:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716807532; bh=v07HtAOFNZo3mgcCFp7Ei+IU6Ufyv1bihLw243ca9xI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=FgLto0E2CccPSbkWTOLfYhXf5DgMHm+H3S/c4/Ful/XvLpKjNsweUm85aCFGaQdZo 6d24oUlUROfbdVXgPjf7AZSNKwoiBBPpasM5u0Abg2J8Gwl1MuGvJ1MK70XkOSgnjO wmZMbEoU/VcSa5JzzPj8MQ9Ym/yxtlprA7RsZbCvCV10KU2B+AYoJChviesCFqbCxO Miy9lmvm5mpYbcADWBcQTXkoxInNP5STWSCgcIzxoEtbnDdKTr1cQs6No4TBI7DzPe lk9t8xtdW/ckNQTdQMgIAGk/yVb06mdsmTysn3SIVl8XZxL0vkM0wwZkLl1xXIE9+n UwNX+N8HMGmIQ== From: "Matthieu Baerts (NGI0)" Date: Mon, 27 May 2024 12:58:34 +0200 Subject: [PATCH mptcp-next v6 7/9] selftests: net: lib: remove 'ns' var in setup_ns Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240527-selftests-net-lib-fixes-v6-7-72411ff2460e@kernel.org> References: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> In-Reply-To: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> To: mptcp@lists.linux.dev Cc: geliang@kernel.org, "Matthieu Baerts (NGI0)" , Geliang Tang X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2565; i=matttbe@kernel.org; h=from:subject:message-id; bh=c7+F646DzRoswLZI5eyfnXvpB8pRU/Lbp4+dhQyIdak=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmVGdi+nN5qUhb8KGGmJF4ZMapJN+Q/yHUbYB7/ ucpczstgO2JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlRnYgAKCRD2t4JPQmmg c3MfEACNspABoIWNRkOqmZsj1ESh5MbUh1FtAjQ2+k6F46PKC4MI6o4f/+cMz9YlMOBtoDnC2ft jkV7XlnViNzV/f3CBWGgywHmD+7RTqjrwHRPmfCjdJS+Y9KZe3r27Q9LPCwPCsTSlZUf5p7HeBm KgmN+76Ow+SjAXyFqswuQrwkQbTURw/QyH0wY7kop1ttM/ImFbBNxvlcJ/AtrtjuaBvD7nhQHH5 qRyYtHgujbaH0htmKuR6z0vJy+tGmSObaQby9Xq3LsGQF9eH7DEAKNftrAKwE2WKkgGWb5gA9YS CCPDN7lQJFF4scZOxu3vSicKupTGAwjQS9AqX/pw6/kiXF4KCSN2tXxBksCazbCdM9fcDAzyB6C ybXYQi4enb1bZ+kiJ1W0zstyH+vD0PLlejSpN0nzjhG2D2vQ8whSFrgL4gEJDFelaZlWAyApSpq /NOfmWBQF0LedGTbh8WrWx3RJvkLeEntv3nC/znxl5mAq6RkJaDbe/PBX24jwnu+LG5yTEWy3Sr ozzlFkCXLLoais27NWzFxq3me8uaZ7KSgrPssHHrHxeaLDesGhgIrUcsYM7wTmvkpc8z/0/3kDh jHQodn9oxtBuEUBL/gOae/LyQneEwmeiLkaYAEnwsYDdgvOG3b1waJHpwqt06bz0FAI6dvR3JqC cFVEug/yYUGJE1Q== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Geliang Tang The helper setup_ns() doesn't work when a net namespace named "ns" is passed to it. For example, in net/mptcp/diag.sh, the name of the namespace is "ns". If "setup_ns ns" is used in it, diag.sh fails with errors: Invalid netns name "./mptcp_connect" Cannot open network namespace "10000": No such file or directory Cannot open network namespace "10000": No such file or directory That is because "ns" is also a local variable in setup_ns, and it will not set the value for the global variable that has been giving in argument. To solve this, we could rename the variable, but it sounds better to drop it, as we can resolve the name using the variable passed in argument instead. The other local variables -- "ns_list" and "ns_name" -- are more unlikely to conflict with existing global variables. They don't seem to be currently used in other net selftests. Co-developed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) Signed-off-by: Geliang Tang Reviewed-by: Geliang Tang --- tools/testing/selftests/net/lib.sh | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/n= et/lib.sh index 114b927fee25..915f319bcc8b 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -167,26 +167,30 @@ cleanup_all_ns() # setup_ns local remote setup_ns() { - local ns=3D"" local ns_name=3D"" local ns_list=3D() for ns_name in "$@"; do - # Some test may setup/remove same netns multi times - if [ -z "${!ns_name}" ]; then - ns=3D"${ns_name,,}-$(mktemp -u XXXXXX)" - eval "${ns_name}=3D${ns}" - else - ns=3D"${!ns_name}" - cleanup_ns "$ns" + # avoid conflicts with local var: internal error + if [ "${ns_name}" =3D "ns_name" ]; then + echo "Failed to setup namespace '${ns_name}': invalid name" + cleanup_ns "${ns_list[@]}" + exit $ksft_fail fi =20 - if ! ip netns add "$ns"; then + # Some test may setup/remove same netns multi times + if [ -z "${!ns_name}" ]; then + eval "${ns_name}=3D${ns_name,,}-$(mktemp -u XXXXXX)" + else + cleanup_ns "${!ns_name}" + fi + + if ! ip netns add "${!ns_name}"; 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+=3D("$ns") + ip -n "${!ns_name}" link set lo up + ns_list+=3D("${!ns_name}") done NS_LIST+=3D("${ns_list[@]}") } --=20 2.43.0 From nobody Mon Sep 16 19:09:06 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 E0DE013B7A3 for ; Mon, 27 May 2024 10:58:53 +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=1716807534; cv=none; b=aBHsclmq31Ks/UdU9WcG8+Ga9BA0HkvM6Nyfe8G6IkpThCpBTfMptQIi2cDcX9EcLrEz3X+gBI7xHVShsTwxiK9N62YAbrKpnCeNIUu4Ya/7lzX1FgKmV+p1viRUNTwwjsTF6Yapnx9cPKsL2t/3h2IprKkoElxwXaonoodSsxE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716807534; c=relaxed/simple; bh=ClSxmwWO2U9SG4cXkYEmj9cxaLnaOSwzWkJRxKT9oWE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hzDPdikcdgzprvZhEgToAeoG9EVesCV6WQcfFTvNeoGtW8lKxeh5by1NV0tW8uNlYuCp6oBT2AYZqK41DHac9eEkIz0WOHoYSRa5Sgj0P4BfvAopJKrFxWEgomdBXp5RgstjQlUaH+1atp7Iofs0leQD6KcsUQwvAp2RXWz+2Ws= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HAAzbTph; 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="HAAzbTph" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D97C1C32789; Mon, 27 May 2024 10:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716807533; bh=ClSxmwWO2U9SG4cXkYEmj9cxaLnaOSwzWkJRxKT9oWE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=HAAzbTphpepuvvwjMMlz9baAicf6R2y1xv5MHrJzbT7E/dIVo1Kl7CAqc/TmCrcxC +TdbhzpJF2NzeGCJUd0d9uQRXXV3t6LJ0NA9fpm5GLo0u0YMULUySh03aPThC/UFSw PDOkXr9bWOcwRRTrK+jhsFXfkkh2jZPwl26UpsKXZz79LmDgdgW9YZdWI+2t9zTjTm Uu7wT6AUgjuqZbZyoVdmoFQt/i2JOLvyHfamEU4Vms0vwvMdBZ8SbXfmvX3kZ5+1PI OiWaGWxNpnDFsmWPL+5caE9oj50jqNclfjWQZKshy4g8BgB+L4Gja1K9xkz5TG39Jr Ia3pzfz4i2k3g== From: "Matthieu Baerts (NGI0)" Date: Mon, 27 May 2024 12:58:35 +0200 Subject: [PATCH mptcp-next v6 8/9] selftests: mptcp: lib: use setup/cleanup_ns helpers Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240527-selftests-net-lib-fixes-v6-8-72411ff2460e@kernel.org> References: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> In-Reply-To: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> To: mptcp@lists.linux.dev Cc: geliang@kernel.org, "Matthieu Baerts (NGI0)" , Geliang Tang X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1713; i=matttbe@kernel.org; h=from:subject:message-id; bh=aGrjt/RDOMUUSXTZAa9PaA4YVy1Qtna2bT4y7qjVvdA=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmVGdipIjGF8byWUHSPYuKwBQhFTgdJeIHmEHVh X4dRPyfMd2JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlRnYgAKCRD2t4JPQmmg c9w3D/9rqUD1EaMMvoLIVTORoycb0zBnZNZHWRp/8mLlVXmAglZyc+A5WpvN2zKbyyfuUcl2UW4 TTDu69B9HNp70FdGw3vB0XMhyt6YGXRfY1GTxxk89Khp856xRjp2R+f2n21p3B9Z/QKlk3fx+h1 VZISFm96RUqrDoQpdO5IVJoO9CdibiYyyd3bmY+1rqxr5xEXOYjpF/wdG6ZoVZ4b/z8aDPxEjM6 W8aGy8IC22AjQ/Zv8wVYlQWTiFBaNYct++rZaYQANWGfeIbw4FXa2LFs7NxBrurNady3lUnli2Q f3SR6lIEuV7jBQMUBGATkk446Tvkl7RpwGNk0P7KUDR89Csv22DSqPQS9laPtLYKZ4z3Rq3rSi+ 2lFKQ5vQCSJq7C2ZGl/iVfS9YSI5Lal+4eMLCy/Vs4L5GrjU6rUv2inpYwdajQXmwguLA2SsdK8 zB7J6DGhkGLvByVRO71YrrzyMVeLbfIW+qC89trAhBsNIXcfIoKSF3lFyRBAfdGzKegxLCYxihD plTBf0dDfYAIgDFEONtJjnk1I9vkypbqoDLWj7GOEBozF/sbfnbRxhOxGP6no9ctwAdjKpor5uD 14nbvf/q+1in3x/tXUM5vXVZUyEiOAEtcsZexF8XF7BjsthsGaUMlrj2+S1SizOEHjHLtGuJJKA /bpst8czihiwKrQ== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 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(), and uses cleanup_ns to delete namespaces in mptcp_lib_ns_exit(). Signed-off-by: Geliang Tang Reviewed-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 6ffa9b7a3260..d9e30516dc72 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 @@ -438,17 +440,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) + if ! setup_ns ${@}; then + mptcp_lib_pr_fail "Failed to setup namespace ${@}" + exit ${KSFT_FAIL} + fi =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 @@ -456,9 +454,10 @@ mptcp_lib_ns_init() { } =20 mptcp_lib_ns_exit() { + cleanup_ns "${@}" + local netns for netns in "${@}"; do - ip netns del "${netns}" rm -f /tmp/"${netns}".{nstat,out} done } --=20 2.43.0 From nobody Mon Sep 16 19:09:06 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 5196F13B794 for ; Mon, 27 May 2024 10:58:55 +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=1716807535; cv=none; b=Z5dVbVpb6XDV6kVgMccNFx5CSaAvSQT5lYKTj84VFa2l2IaOmuW0/UD2uu7k/ETZqoZVQOi6LBSCt9Pp5I/iyNE9xdzBxvVUlpHymxZxzUDpuhE68TcG0qTofzKyrGBh3/35OHTp898bq7cYzSystKEnISHA6Gb4/CKFQ2ij6Hw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716807535; c=relaxed/simple; bh=DtCExlmNCV5nIVF1XfgLqzZeQrnTvaIAbFhZvqoCSRI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kbh4qLH3Rsm+bHCUH0u+SYlodxYpzmgnkd1m84mmBn4/4ATbB2XxozJ9jzrnfhaTqgknHUNnmkfpL69qwLaFraFBzBYNZTWsdWcCcMqJh4cclFenKeN9RphkT7fCYVaRPymBfsD0ZHx5XZOymUBqV/GCqJTioEjaVqwVz1P6d58= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nv0do+xu; 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="nv0do+xu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40544C32789; Mon, 27 May 2024 10:58:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716807535; bh=DtCExlmNCV5nIVF1XfgLqzZeQrnTvaIAbFhZvqoCSRI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=nv0do+xuQVAAa1Gn3ykbJm5wD1LhyGZyZG2ULKukwnwnns82T4HT9cOU7stcyNfuZ lRvWgSjPRHdgtUT9pI4y8kNu4IZhGdGHV5qdnFAEjWhjOlrZATKDUwlDAcgic8cgPX 0faRUy1RpMriUPaI73nmq3oh3W3AnTS0QWHLPYoxqeS913CR0nkSIlUpI/59+prYhf YGqdVA8WIhjF3VPtoGSdX2MvhtBjHD+88Sf68ca7yuXrtRSLOkvY/9h1yoCd2SVMbq rbjEZ+zKU/VIMu6qnpjBW7OH/UHp+0zT/7n71K8SEyA1REVtf7N0zn+A0tpMVHB5xh UDC1na7V/fhjw== From: "Matthieu Baerts (NGI0)" Date: Mon, 27 May 2024 12:58:36 +0200 Subject: [PATCH mptcp-next v6 9/9] selftests: mptcp: lib: use wait_local_port_listen helper Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240527-selftests-net-lib-fixes-v6-9-72411ff2460e@kernel.org> References: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> In-Reply-To: <20240527-selftests-net-lib-fixes-v6-0-72411ff2460e@kernel.org> To: mptcp@lists.linux.dev Cc: geliang@kernel.org, "Matthieu Baerts (NGI0)" , Geliang Tang X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1366; i=matttbe@kernel.org; h=from:subject:message-id; bh=M4yuN0/x24oDKmyONxrmmlEBz0wy8GcFXZxdRY1Nt+4=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmVGdieWe9fBYV8mohka11Qf0+iHvIDQK19vjhN 0Bk7BB44/KJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlRnYgAKCRD2t4JPQmmg c92gD/9TJ7+TsSllzQQ2bIvDFjA2VNbXh27BVDMYij4deYzjY76dZxqCJ2E0Z8pXS/BwNfIW7I5 Ar/3hiiZg0KXc3nDTx3DUR5kn0bosnrbQLb33U77YudR1WGvX0sMRtJoDn2Tt6lG/BJqnuIPu4p jprkd4iuHTpGAYCTit+x3iNu8VvXHfqOF61uVLSjlSLy1Y2gNGoQ6GYDj6ajURoMNC3h4AtGKhJ RN9ODzZbgnRDf09wftlNfDhgBwht31yNA5QI1HGfrNvbepD2ATpIZxUdSsJ5qMV/XL01EaupZwZ 9Aj+YrMMxm/cTWBpYK+kUi6BqYRWMnau1+Z0SlsnyuBWQlm4wL3/DEbV5NuYuBejrUA2Z9F7TaB 4Ql4MPe8vk264k37UshzzMC5qzw84FpKLwTMfi16m3xbtfDL2gcLbii0EVvpzGu9zfroQ4oiQvk fjkczX0r8qbQwGUvaasrjigzNaR6QG/w0pOcAPzxPSVY3RPH6oqY6xSXWaI12GJeWtI5veSMVe7 i8bbTxnoQ87z5Z+WLeD69gfhdoeR10N1cPtD7FROywaSCUg2rpgGpLarPnzzHGCbpqUvq77pn+/ OeMpqtttt66hL9aFVNnEDPJP5bWfZ8bsNlOR6R+NBEqhofPjSffToxpHu6fjOxbixyAG0a+xzTY rVF704/A8XRJ99w== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 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 Reviewed-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 d9e30516dc72..194c8fc2e55a 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 @@ -363,20 +364,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