From patchwork Fri May 24 15:13:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthieu Baerts (NGI0)" X-Patchwork-Id: 13673259 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 7C84584FB0 for ; Fri, 24 May 2024 15:13:58 +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=1716563638; cv=none; b=JdxOJxdb3J3EwPeUqUjrbavRVBZ+I7zI2SbWJXcHMox4+dnp81ziOqmI3SvBJIGBCtNirheRhz+jZHGpt7bh/tqrSbWsSOIJC5zk8seS5W4+AoPZ5Sf4osQyWak9CXfd2NlhAg0T68kB83/zIeRTZ5MiGRyTZLWC/C3vJ8HabbI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716563638; c=relaxed/simple; bh=5sF13AQ0XQYTT9ojTSNuw2FASfABGqn7HXvokl2i96o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TJqx+I67Ja6FU6d0LXBsxRzHjQ+gNP1aYx+2SK2twv3VwRWNMIwzvLA3UWn9hQF30RHvupjwftnVm2I8uX4JHIBF27x/L9XT5gYl5a/Pc3xBLmWvb5X+xnFIQW/st8+1k/IBFacHgB2stXcZdhoN2IW8sd+tJOrljxva1jaaONc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YZWVD/6L; 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="YZWVD/6L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72928C4AF07; Fri, 24 May 2024 15:13:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716563638; bh=5sF13AQ0XQYTT9ojTSNuw2FASfABGqn7HXvokl2i96o=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=YZWVD/6LShvFj22Q3ZyXFy9Q0dRIYx1s49qWDZfAW6yZiGnsgO83hsh/GBJ3pU+Wu Hd8mVsBx4jN1WsdwnZZJBWrX2vr8a9jXNWQO4h+sAEsNB+tpF/jIPs3728SkbHhdS8 Fu5X+ut94dCVU+MuhY9VCrhgWN3ILOJGp2djMBx4ptzlXatBrrXDkkrs2ftRXA8gzK fonRh7H8M+cziZAlyiKnFZanZA8hA8hOpsB7L5ruzMxPdVRXWGfXZJBBiXI1aC2CN/ uqIeN/iJXWeWCn7wL1VysvlINvzGoaAk64FqkCNDpAdv62JUH0pTFcCArhEAdo1G7x eCcN+j/aKaGDA== From: "Matthieu Baerts (NGI0)" Date: Fri, 24 May 2024 17:13:24 +0200 Subject: [PATCH mptcp-next v5 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 Message-Id: <20240524-selftests-net-lib-fixes-v5-1-b9e0968571a3@kernel.org> References: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@kernel.org> In-Reply-To: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@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/ZANAwAIAfa3gk9CaaBzAcsmYgBmUK6yh3fCKOwNvBlpGvGfTcphtq/zWnetB79A9 sZ7qVFQYc+JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlCusgAKCRD2t4JPQmmg cwzMEAChUn7BJAYzIS6Cz53pSNOwynH7dHCHJQa+rjgZ7IE7pFk4jwEi3ZI4FJyMkbDAM3m+DvD tiDH0ulia5e4k+B0RyboS2p/SdjibDH4a1QJtGspCkRNME8t2yBnAgkXAaIzZoVZ0fNrZuvFHCp +YgQD8VfQT+Mc+gD7Ol5JdYqwyregSBcqdh8LSUcc2bX+2QxDZ6mT+zzclqrNTzUNAbkhSJpNqR UDSWo+dHhb0QmTHJxzbWho+X6NQU212quJy8Lq7lnCYpbibCywI2VxgwrgcsMqvdLp7qh0ScIxH r6VdjVjzV6zvMlt9GfhGA5PbOTHOa9TZdoXfKkrhGB5S8fyXXX0I4TDsANEF0aGh/Bdbb3RKNIi a75rgiFJ8ghTX8M5eykKBAWsZgiFqPYEXEPOL8FChon4Ozx+BrMWmEqLxCp6v/hZdNmi0uBGm43 cGDxEdqUon3m7SbApmHwF0VuYF+Ks2g73lxT9WqcxvixE0JI0XZMoEBNKS7BncWqPmBJHhHBA6M uiDUZ7vLQPTlIl48NG6X1DdFEMJa3JIPF7E+wXpJzltYseIc81wrisehHGXWGCawHS+ffzflvme rNydB5efjcP5tc7dAtcBowc+Txk+jDFK2c+NSJiKsASy+HJ/Q8iva2gieTTkawViMT2XL3OJExt AeSowTkC69dXeeA== 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 framework constants") Signed-off-by: Matthieu Baerts (NGI0) --- 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/net/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=0 + local i for i in "$@"; do weights[$i]=$((weight++)) done From patchwork Fri May 24 15:13:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthieu Baerts (NGI0)" X-Patchwork-Id: 13673260 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 8E8ED12DD84 for ; Fri, 24 May 2024 15:13:59 +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=1716563639; cv=none; b=Y2sw0aWwpDpkIsYGx51FPGbnyes3tlQQQMAUKDp7lxzjffJmQREuCe910TJXIEgz+nV7wW0YAXokvT4khZl2Eg4KJJq08pV5eYph3KBPGuIu0Om4ud4gSY3vfVEXa2AH0jmpoLsY7uMi8YQ8uG47zDFrOjw/x/kLTP+n3tgsjY8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716563639; c=relaxed/simple; bh=isSgg6Nbw4paOmQkxswWWXT5wo3Wu8UKlwr7DvZsRVE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EUADxyw8jPR3rDweJUl3hogjoL0SNJfqvS9Ox7quXhLokeFYY/nksHJEf7ZEsUN6oJT4Uejd8uQdzGDblrZ1cAaVmcdva2V1i/688r03c/OECHFeMvoBGQPJWjNH5FO4tWRMsGCvko6F4LcIcqqW/EiEQ06pNyCYlMg8kKIm38M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aNGR464m; 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="aNGR464m" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A62D3C2BBFC; Fri, 24 May 2024 15:13:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716563639; bh=isSgg6Nbw4paOmQkxswWWXT5wo3Wu8UKlwr7DvZsRVE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=aNGR464m/4f89TKVnQ5i21M4V9/WrTnGZfNn1kAXP2Rc2tRocMAlOkPFq5jUdqE+I GgDdJ5V4fdHEN1tHSkMtx18SDgAUn2fidwwVpv5hwQaup6CQHObI/+0gENDC+cI2Q0 4C0VHDkpKWf5Hzeu5Re4z3Y13So5S1bMDRiFXGL0SI2N1ijhgzL+CnnwiIi0oO6WHF FvEnp1EszIff0d5sDqdnhJP+6Y4HcAxYXmGQA3yDl+BgcTKHz9KNyBifozhI6vdTjY sSiy+s0MtZCR663b6I0jFGEHqVBTsulvXTq2cqQg6S4OlqX9Gc8eeZhvC3Tao1GuCC w+PmlLRcYq7Kg== From: "Matthieu Baerts (NGI0)" Date: Fri, 24 May 2024 17:13:25 +0200 Subject: [PATCH mptcp-next v5 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 Message-Id: <20240524-selftests-net-lib-fixes-v5-2-b9e0968571a3@kernel.org> References: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@kernel.org> In-Reply-To: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@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/ZANAwAIAfa3gk9CaaBzAcsmYgBmUK6ykgJwPl0+Z/7XOmGk6ni2G8k+Qnu3fNIa9 K23sxmIb9KJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlCusgAKCRD2t4JPQmmg c0ImD/9Tda9bqGQNxFsz+/JPBe2R7dVNrx7gT0YcwcMd2oit/HW3XpeZD2ooE1jEV1fxL/tEjRK vA6GMMGFyTkH8L7JarhZEQAZtPyYdAqUCFRqJ7FuY70KV9paZm+Cd/tgQRcB0+NCaJJoOThZJpR jx9WTu8JEc+QlAJ87ob+1zTgDJdKmDQyNcbrtR4n/FpY9hhwTGM4E15d/UEdk+7w55XuiG5Z33W tCnCpuHMWWMGkgSFotahXriYe85je4BlIQSimnYp/xEMPUK0UGkq++ZU1AjSjdX0ol6H3FZFV9R huCLd0+qf1YbQ2gjX0prJxm7FKS3BMHG/C5lvSkGoNInW25IFPVNzKyTdnl7JN+h+E2itla80k1 LJG/u/DnmJMlx1evXxdNOqX0HL52zY9hnGoG5nhlHhX23V2rlIJg5a3UZvN8omtoxchdQGqbLmW DLt1BlaLziFIajYa0w95hIr87+6N1NhNVBnycWmZw/yRTv9wX1M5H0K0tKN5KmdDvHkbV5njYTH 6Yj35K6iuJ7szCdIHstIQdQqM7wem1+0BXW9qtYzMpmjjKYWrEXBCxgsMirc6VuWKnsXuHrOur/ FHuSE5cGVG+Ba1RYM48SOGn14aeFo1HhuShNSPumnjospknuJjaZh7cNoEcjy1WHjWBYTnuvno2 xXW2nb+tPYvohQw== 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) --- 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/net/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=$("$@") - local ret=$? - if ((!ret)); then + if out=$("$@"); then echo -n "$out" return 0 fi From patchwork Fri May 24 15:13:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthieu Baerts (NGI0)" X-Patchwork-Id: 13673261 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 C05B412DD82 for ; Fri, 24 May 2024 15:14:00 +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=1716563640; cv=none; b=LnJ6bdVJNERVXuZr3wncmQVkUxhsroAnq4t98QYZPxbJyeg0u++8aHeTJ6MO1/Kpr1x2uBv+aKnDFwDeO034BxNCoCyK/qSASOZrcVfCymNi+8psvL/jWj7gcHdJSOeM0sna8HYk3tvgH/FX6CxY3Ux122NcljocNzyEftLOL5I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716563640; c=relaxed/simple; bh=CRkpD64FtxDqs5tvTLqLkgdEkfYYf7WaDTjqEk5a6Nw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iM585TULAc/+J6CURuv8BiIS7Dnz82izzwENSifVLBU0GQxVx2QHyyN5ibigG7eRKjqjxUunO/SETa2hPcRq7s2rsmHiPfpZPip9wyzfcV1izfC1Tm2JOMU6LinqTJuaL7CA3/B8szGCe6YsMt7M+l/tsMip7UB2w9ilaURwh/8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=caXEWwNH; 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="caXEWwNH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DAC28C32782; Fri, 24 May 2024 15:13:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716563640; bh=CRkpD64FtxDqs5tvTLqLkgdEkfYYf7WaDTjqEk5a6Nw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=caXEWwNHJh/4oDYc5b4TSqX+P3fj6jy4UXxyTUHp0HABxEa4TyY7F44gghEOls9DA Ex/AWeIcu2v12V58TNu7GeXX5KJKBGjUtfNu8k987srXZOEpn4Suzmk6psUTCL13tF 7yknj42IZIyqhPT8MPW3gr6AoeH1jp7XHg36LiZ4eAWZEhf/c7sPsENv8vLykl8iSZ 0n9f+/xaZ7nFbMDkHCPmwOny0UR1NrjDUXxJdiryNG64nFafuaqjy2t7oQtr51lonH 5/x1FCS/RXaujacR3FMMB2PoOh3P0/YL6imNW93lTW0Id8EOkUErdKpg+aN1gz6y+z S4i12ToGAs4Vg== From: "Matthieu Baerts (NGI0)" Date: Fri, 24 May 2024 17:13:26 +0200 Subject: [PATCH mptcp-next v5 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 Message-Id: <20240524-selftests-net-lib-fixes-v5-3-b9e0968571a3@kernel.org> References: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@kernel.org> In-Reply-To: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@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/ZANAwAIAfa3gk9CaaBzAcsmYgBmUK6zdxo8gSy7+iBEVLTcvDr4L41Goc/9xLA1i ffJdGl92XOJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlCuswAKCRD2t4JPQmmg cxWLEADvt4Urnf7gFuqZBUjV5bWpuy4dbZNJBnFrFVPEb3Cmyo3eCc/pcn9J1H+SKxrKzhPwtsB m8cFyGFCcVp3J17RwdqsMUeh476lCBwuMb/MK+4vE8CRr+VE681ohZ20sg7obSsVkyxR1gsTD2Z PekbLmpXgqVcLwxzdu8aJ3jPgRn/14005LH2GKU8Ja+/RXI3as0hp+hoJ8xX6oYb5IJD3Kz8F5D 3RLITpx+3O9ga0w2dW+08AE+gwM8Ghh3g4Ps/c7B+8MxB8QsEbFasxVf/GVRxfR2sXX2rTH9xsu CRGj9gQtyi31s+QKS/XGNsu2Ysf5PzrdPijk4Z3PCy66e8AkCt+/KcgCBl7B5a0jcQr5tB74Ltd ZuyLHKNqNqUwKyB8NEO1RdyjIcoY2W0QJ04izewOePnDOevgSiIGkT3ZbQj8YHTmAGMz5VzbxyD 9CZf0B8LyR/RquwPECuaSZFsQn4PjBi4ZPpbXa+yTA/4HI7ASCgVpSuXS3Ckt7b/djLbJDpVhuY YLRPALcZ/WLfNwWudWzfbV9fZaV9Al0rDo6IZh+MjUFch/Ps5AFuPWPZ2JqnjYFNq2cwedf0pcW gpSnJF85Jf81R0462p8x9dIoy4hObe7rJP0FU44bky+UBTYTx/ONad1Ypl7Z3BCT/JAl0vQRaws 4za2jKQulMH7Jrg== 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) --- 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/net/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=2 ksft_skip=4 # namespace list created by setup_ns -NS_LIST="" +NS_LIST=() ############################################################################## # Helpers @@ -138,6 +138,7 @@ cleanup_ns() fi for ns in "$@"; do + [ -z "${ns}" ] && continue ip netns delete "${ns}" &> /dev/null if ! busywait $BUSYWAIT_TIMEOUT ip netns list \| grep -vq "^$ns$" &> /dev/null; then echo "Warn: Failed to remove namespace $ns" @@ -151,7 +152,7 @@ cleanup_ns() cleanup_all_ns() { - cleanup_ns $NS_LIST + cleanup_ns "${NS_LIST[@]}" } # setup netns with given names as prefix. e.g @@ -160,7 +161,7 @@ setup_ns() { local ns="" local ns_name="" - local ns_list="" + local ns_list=() local ns_exist= for ns_name in "$@"; do # Some test may setup/remove same netns multi times @@ -176,13 +177,13 @@ setup_ns() 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="$ns_list $ns" + ! $ns_exist && ns_list+=("$ns") done - NS_LIST="$NS_LIST $ns_list" + NS_LIST+=("${ns_list[@]}") } tc_rule_stats_get() From patchwork Fri May 24 15:13:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthieu Baerts (NGI0)" X-Patchwork-Id: 13673262 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 1B6B412D77C for ; Fri, 24 May 2024 15:14:01 +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=1716563642; cv=none; b=MiFLqrXvWTgm6ELqznP0RdKTb1w5uz0cMD8Xhe5RifIiXtvPr0htHgvSqIqgjQfmgTkbtnCJI4Bj40So+U9Z3Cb54lSts/YpbUZq4Yq8FfjwXEjg3guZOsG0cRm36n/am3Nlu9n91fM56JQDRrX0NIWhoPwWZV+7D86X70egZA0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716563642; c=relaxed/simple; bh=JXMQEe3zsXqCqykV0TiMzHSF/bLvNSHAVqPzoUmJcJI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XR7sdf9rs3lMP57yE+9KI8thbnw7ue5IhqtGGnc4e6a8wlYHc21OY27a0JFXoqaZfdEGHgrcjPA0aItM7rEnJJUuWo0IKkOKCEOfomusUIPcxQmWLndiLe7f2ExgZIQ6NzQ/Y7qpTf3VNvrtiYwMdIH0rb2EgybfTl2gsJ+id5s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZL1/P3AS; 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="ZL1/P3AS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A5C4C32782; Fri, 24 May 2024 15:14:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716563641; bh=JXMQEe3zsXqCqykV0TiMzHSF/bLvNSHAVqPzoUmJcJI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ZL1/P3ASVG8hau4zhdX+SREX7RaRCO3/HVY0oQQdLXLBafUFfChnBAQ9SSues8ZXZ SIaIh4NtYBmMnDjvb7f3rxNV1IcHPGw9ivhmzsGxagHBOyOPS9omd8F8/64v/oQO3J z0MwP621XXeo3GY1AJRIKH9jE2amfTLzWCDd9hbOgVcud2qut6PFiGT/RBKFyuMpdG cwVzxZvT4/NaVIJlMf2qnCZ6Mad+T/MHmif3SUW1ftaKt85hWDsy0XCQCuHZ9NbI2L Ip/h+uh6cvVxewH+o/NTykEXAZoX1radbFCTnbWG29E7Y8OQ8i1fBQWr2EJx03lC7Z k53k4KeE6O4Fg== From: "Matthieu Baerts (NGI0)" Date: Fri, 24 May 2024 17:13:27 +0200 Subject: [PATCH mptcp-next v5 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 Message-Id: <20240524-selftests-net-lib-fixes-v5-4-b9e0968571a3@kernel.org> References: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@kernel.org> In-Reply-To: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@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/ZANAwAIAfa3gk9CaaBzAcsmYgBmUK6zQsMmWzZZg4rq7SCU5FAt8jFEgF+8PdvB5 FHW6oyo/+OJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlCuswAKCRD2t4JPQmmg c9EqEADAdaIQk3BePIqXhJTkZzXeHECJb++AeXbSdDkPpPwvpb9WRU6smm1gPQc8NS29ZZzyuVh +sRYYTuhlIJat09hlC5WaBG6n3cjT3f3+WUYUsjz1a7u8gjOrN2u9qo/ZY34dVfwK98edvdbcRO 9Sx1ELvglQnRA9S29kLEyFo33P2ak2plmZIB9v4rLzkbbN19H28Rvkx172/brcTeAYJ7Iz/SDcG yKz9HmsILOFewI96BFEms2eQtW3eYooQIR2Q0Z0DhrquP0qV1nltByU2q9iLrinRL5zxwSazwHK Zv/OAN54tJSOmnd4r8VMC4J3c8sPeoflinKX4gEncOOwp4mHXwQRq32b2rY97Wb0ZfqTIQsai/w zdUuiYTh96+V3Kbn+O3IQgewsdJN8+cIBmywNXbY2A10wmHGFRg6qoPjkZpN/fdO4fJKInHdnNK iNXiw7X8JK911FzkFK5E3QJvmGQBbBjkyhrTZIKXJMruEj7zdm7BVso8RWU4olqRth+VL1P/R7A gYoKbmxdnXF8PoB90Gz37a2F5aGwo4MVfSkG8k2J2tw9m4Cpo34q2TiVlw+y43hCG04QAp9X7NM SVDcETbE88E7+gAmW8aJMz3vVPz7tPigM5wNSeRDX61dpafEyR3u1lhJx57vHZ2mjT5Qh16AFNq 2r/mDbzhHb5nASQ== 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) --- 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/net/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="" - local errexit=0 local ret=0 - # disable errexit temporary - if [[ $- =~ "e" ]]; then - errexit=1 - 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$" &> /dev/null; then echo "Warn: Failed to remove namespace $ns" ret=1 fi done - [ $errexit -eq 1 ] && set -e return $ret } From patchwork Fri May 24 15:13:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthieu Baerts (NGI0)" X-Patchwork-Id: 13673263 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 3AC3284FB0 for ; Fri, 24 May 2024 15:14:03 +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=1716563643; cv=none; b=RAh7hPi99iwCDqAsoCtKc1e1U+mGk+r7nAOvQUiOuwFczNC6+eEV+gOCFzTDFPrQJaMayKG3/LdIbGjmi+5Cg8GWfIc44jK2Xgw0qghUR/m/2ryHNhrKfrnYyg5sGacQw2u3+7zcF0QQcr1P9y6CS2YKAZX8z9wWZ59JjovVu1c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716563643; c=relaxed/simple; bh=sGr2uTeKlT3jZmTEvKLVKhD90ck6MQ67snxcFD1F3VA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QghJxlnyUmNHgNzuInLuLd5bOCKmhS/EOOn9cvNLiBFV/qdFdMQ2+2W184lQ5EhB9UCnuzYRD+bHWfcQPIhR0vvQNh7H3rQOX9pjO6QcJV/V5Nj1073+qUya9a9po6g2KjOyVTfLtpyDvKgwSJ4RSUul3QXnC+vuGkP6fWbC3Sk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tUksn74+; 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="tUksn74+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D2E9C2BD11; Fri, 24 May 2024 15:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716563643; bh=sGr2uTeKlT3jZmTEvKLVKhD90ck6MQ67snxcFD1F3VA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=tUksn74+bwD3Rh4cC98JIP0fUd2pXYxlic/oNajEEIQEws5eN+8MQUbOg9wxwNvoM xFetcXaos7mtFwGXjDor8Z3MdID/7b91JpH/mGZMlkuHU4NO0/UALX2H74Rke0Tb71 jjx+mNHKLYB7+XHLitIB1ITvjmOyZf6ZwfmxlV4GzwIiJgSA0sTADzipZy5ag0a431 wbVxp55H0Ysmbw9EhKSNyN1J/pX8GcWN26ZvSV2Eo8rugxV77oE/B27Wuqt2Jespjz 4zc7AkCnDFvAxKHSwgIotPcc6h6GP+JkRxfoAsvtxsZ9eVFcXxwk9+/+ISVq+ItCkv 30S2obvHG2gSw== From: "Matthieu Baerts (NGI0)" Date: Fri, 24 May 2024 17:13:28 +0200 Subject: [PATCH mptcp-next v5 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 Message-Id: <20240524-selftests-net-lib-fixes-v5-5-b9e0968571a3@kernel.org> References: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@kernel.org> In-Reply-To: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@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/ZANAwAIAfa3gk9CaaBzAcsmYgBmUK6zj2axfXIbxRJmMUe53CrdB215AXPOVK1iN EhY7JAm1NmJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlCuswAKCRD2t4JPQmmg c5tBEADqbuZS4M2zIRij+NszDyWvS3cH3dEN3AumbFm7ou/3BxSoK0VXl+pDDgXnno0z8sg7ht0 RZjOjzWdlXHS8tnOTmrtM1pvtCXsUSIEwwWctx6NCLBwPOLkebUEvq/URwGexhWM+ID6QirINKV YVmOGIX6wveJMZkRIT/iOUkBiUseI7hp/Qkyaux4YojpXu7II8JZeSc8rnWt4bI5Q8k1RPF3y5a yxtDj4f+HbQN5nj5FivGcnLtt2/uL0dcR0PpMTpEyA7v2NQGQppEypZlWQo+T78UtcyTf75bHWL OnhkxA3RrH7+YrFbxrXxNZ3h+gFlup9UygduoiaeFIp5orY05+VKOHKey8jgseXZTZUM/A5QPsJ 6+JUh1W5sCdRuhiUkD0WzNj8agDQxi+NUUB/zm99BNkSPsvzg6rFPeySI+Y1DhykAm2NVaGXLEn 2n7yR0amDVreVqWl8RdemdJZTxYRBZCrc5PsPpprZUS46kvCKIUQpItl1u0aaOARS+kUsKZzExE 24+drJGmMCMiy/tp0MCpP7aSvWsoNDC5O1bbOvOZkdi0GQ5Fr3VdurDvBoA76nCaEuq9IAybguV sFZQ6mNoSKhB8bqWEKnzmOv6USEgnVytlquTDg8S8HFFaifAIQFRsVuZtWF5BubWZCi2j6rY/pX Yh2lF8NAO9VWgog== 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) --- 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/net/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 ">= $((base + delta))" "$@" } +remove_ns_list() +{ + local item=$1 + local ns + local ns_list=("${NS_LIST[@]}") + NS_LIST=() + + for ns in "${ns_list[@]}"; do + if [ "${ns}" != "${item}" ]; then + NS_LIST+=("${ns}") + fi + done +} + cleanup_ns() { local ns="" @@ -136,6 +150,8 @@ cleanup_ns() if ! busywait $BUSYWAIT_TIMEOUT ip netns list \| grep -vq "^$ns$" &> /dev/null; then echo "Warn: Failed to remove namespace $ns" ret=1 + else + remove_ns_list "${ns}" fi done @@ -154,17 +170,14 @@ setup_ns() local ns="" local ns_name="" local ns_list=() - local ns_exist= for ns_name in "$@"; do # Some test may setup/remove same netns multi times if unset ${ns_name} 2> /dev/null; then ns="${ns_name,,}-$(mktemp -u XXXXXX)" eval readonly ${ns_name}="$ns" - ns_exist=false else eval ns='$'${ns_name} cleanup_ns "$ns" - ns_exist=true fi 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+=("$ns") + ns_list+=("$ns") done NS_LIST+=("${ns_list[@]}") } From patchwork Fri May 24 15:13:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthieu Baerts (NGI0)" X-Patchwork-Id: 13673264 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 74A8A84FB0 for ; Fri, 24 May 2024 15:14:04 +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=1716563644; cv=none; b=guqt2RcKpqfIVbeZL4l4tkywf/xh6ThpWH8ndi5O+fnuorqw4MBzbreO9WWjxv5o5qdDAREFsOGB/piiCoDjKK1c8Y/AJESSBFdf4QH7kA7SeXBTHBwainKpif8Ou4bdCigfMLfbq4hdEJYNy4Zf5AJ6/GI3phHL7UB6k5eYC4Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716563644; c=relaxed/simple; bh=9VuYqdICtJfu90SkZyo3iZFyC6Rb4UbZ4hQh9WQWxBQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SkNPRSqjQHFQ9d9gerAPZAh61dqci/Y3FiSNjmHPh7xth52iSNvRcn9q6sD+ZHVyVK0w5WKPicw1MT6Q9smfMYFn0wTh8xaPyQNaRqWfUcmj0T/oeGea6K/+3srnvhtq1rrUWAjbaGqst445YHgLVmZ/EO1P/m7HyKkGkaoOkE0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aW7itrCt; 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="aW7itrCt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FCFFC32782; Fri, 24 May 2024 15:14:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716563644; bh=9VuYqdICtJfu90SkZyo3iZFyC6Rb4UbZ4hQh9WQWxBQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=aW7itrCtOAn/U09v4aV3ccDAHngs3S4bNe655b3gX6QyivF4iGcCMxSW1XLUbnIZ9 61J6nURReBv6UWzjfa4KXiIF9lPp1JGO7lgViE+6U7tZZMwdPCoKkcDLMmitq07OEw 95nHlU/NTKFjacWZgbwdjwAIG6GYrmQjBJ10F2oHOTjKdi+jSTojs2xlAFyAMregtM BuoXdZOrIB3r4iabk2/N48MJfNbdQ6UKfOa+j63zNAPlPMb7UYxPOnfTSBZDesm36T 2ZXQ3VuvedLsjLF50xTdBKPn+XX3xQigJBHVD/putHDm5mZAt2SltXfh74Z98qzbHw 44P1r4zmo1wuQ== From: "Matthieu Baerts (NGI0)" Date: Fri, 24 May 2024 17:13:29 +0200 Subject: [PATCH mptcp-next v5 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 Message-Id: <20240524-selftests-net-lib-fixes-v5-6-b9e0968571a3@kernel.org> References: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@kernel.org> In-Reply-To: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@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/ZANAwAIAfa3gk9CaaBzAcsmYgBmUK6zMvF3L+Rz5MDYxHwabpkJsXMGMCICVzebW XY9y7KOt/SJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlCuswAKCRD2t4JPQmmg c4isEACk9u79jjVIIWFaOIIOiKTq5k1UKOB8Bvj5ess0dMyjZ7WhhClsH8dduUpkztMV71ivad3 mvUGBtXnWOaVstT+nGz0gvlLUu0p6FTJH7sAY4Y9RW7ssmQbsNAzyLGaguIiNE/grk/l1uXHmxn veS01desg9Z8je/Qi4sHGZP67Y1jCs17H7sfFDe66N1VZI4cLHESayn0nJkHfylqVZzwmwddQyn hoyrhVRlJ6D0AkwuLIJrSK5aE5+b7BhD+ipaMeq3xFiOQbXn/5jcPtY8HUW9C44N4YpG+15aZwL gxWK6x6XQihfJPmQ16583oDaWltwfQZGBV5YaIigXuPguyZ48L7VVOR6x2ww0+mv6UqvwAe4e/C ycTIZTfdGbxQr5cw6wghDtulrKCSx7fgefedL1OMNPjNnv1Y4hTNfikfFQBrTvvSxmlMkbItMa+ u8qENtI/JIOfJnDqT1zlCgZpZBNMuVRLQyEpSFfFsBQjaFET/U7tMmG3yVntlX3Rb/OdWh6cKSJ YX+VjLPN0kJ8bew9MtyGzx9EtqhvkWkcobVJh9oUACKGg/4q5ZmovBd8hS7Ysg80luZ96Dykrsk 9p3j0+BSux9omjiVeVQCH78lt5bfEsXoiTuJki51uxQ77sINBaSViFyZeH3oiM6q5C12/nqNQDK R9oHoJ7jkIlg/aA== 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) --- 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/net/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=() 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="${ns_name,,}-$(mktemp -u XXXXXX)" - eval readonly ${ns_name}="$ns" + eval "${ns_name}=${ns}" else - eval ns='$'${ns_name} + ns="${!ns_name}" cleanup_ns "$ns" fi From patchwork Fri May 24 15:13:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthieu Baerts (NGI0)" X-Patchwork-Id: 13673265 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 C26DC84FB0 for ; Fri, 24 May 2024 15:14:05 +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=1716563645; cv=none; b=TTjy7cNWKgTwH60h1+zvuKTVE0DgeaGQsdx0u2DcAH10nOQ4wuL+X/exhtWqWUTIy6UAUnjVgEQ+0CZ8YCQtCeMWr5FodkO+3Gb3ZgGhDuZX6vp6de59UpciIl1lbzNCSgvbI04pvR1dBjzcs0E/Mq8NCX966ZCeqHKp5iZV65c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716563645; c=relaxed/simple; bh=0MEfHChxbCcyUZsx5zYSOR7hH45OfjbGLiKMN++S5SM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RQWHuPyuQ9jUGn8Jhcn3Rd2IRxIPLvTWyJNh5vmAeo6E/URO4s+S9bWdiDNJu0XafVEhx5845jcn4oExaMI84BBDgmUZ9gCjkfC6UGzULHCPTfElszHCQk5YpTZLL+8unjCBjY0+B+iZQesdRSbHrh+JavpIQKYUy7xWsTHkZvk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TkF5s66u; 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="TkF5s66u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2900C2BBFC; Fri, 24 May 2024 15:14:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716563645; bh=0MEfHChxbCcyUZsx5zYSOR7hH45OfjbGLiKMN++S5SM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=TkF5s66uMMmGKZBYmZAz0jcakosXKU2yzcqSCTyjBg7WI5V3oPCz/l9Fv+/BMn0lL NPM4n+XsYLdOLVtchKg0Vt5FCVzuoN3nZbQzsDQXGESNpaayhSkIdq85k9XSZOO5bN vZaok9uaUR6DCzHIrxES5y/pKZ5oLJB9WvMfNaXThTURIOmUkIRrHSUk6/mM6ietXN oSJvLEYBOHSYZ9UtY1ijOEJ+oqUPQeKcPhhGH1rOvW2z38h21E4Wh35lNStjZfmAAX z+Bp9LpBq6YXyY+0927qeTz0H/8DHKYUGjej7hSjua41eXt2R+/98r8/X8fHoBK0sH KyAs4YUknQtFg== From: "Matthieu Baerts (NGI0)" Date: Fri, 24 May 2024 17:13:30 +0200 Subject: [PATCH mptcp-next v5 7/9] selftests: net: lib: rename ns in setup_ns Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240524-selftests-net-lib-fixes-v5-7-b9e0968571a3@kernel.org> References: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@kernel.org> In-Reply-To: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@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=2382; i=matttbe@kernel.org; h=from:subject:message-id; bh=S3ZPa6Pod63Zqt9gRWBkNXadIWY+bR7OrSPgRZI65T0=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBmUK6zgPIPtE+YpSnYbj7lEM0y1AuvR7gmUFY5e sY44RlFzm2JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlCuswAKCRD2t4JPQmmg cxuSEADbSGJyy+61gJiEKi2Tb4ywUTPPA/a9amDQz4BccXU9MnhAdmd+gn9INW2Tz+eay0tvQla 7luEf/17VuZtujNAeNKVbDF+GXdIOqX5qz6sOU9ep7RrrVtrkbXYQFFx7ljR1J0KaRMT+ZTseMK szWT9LfnKyTln/l9S+BgLgtRi8FzwGCJwq0uoNl9HlFUikFJgAskViUCZHvVzkgQjTK9WGGXqPs bZLiD2KW0hsZbNu1qtePWIinMLUN0OEeDf0g/mBFufT6pkcfUPvACm+3H8qjtfQ52xO5xjG8Gsn sn6E6VsDPt1vtW+e6UyfKVJZHV0VSFMW9VWH0eHTaiusnapMi6wy+5388IMUfjkkIS9gjoZLpVI 4pJlOaVcPmiPPQzZtMJ5eRuJ7HORg9nmUo1D2CzxYDCPeOYjN6/v05kvVbNxdivAptwaqbd/q53 cnZ7xc4y4qiYJPM+MErpt9ED7lI+NK62t2t3tXyUUYQhYQY7VA5iJbrL9SGXK71BScq+dJ70rTh M1RnKO4uztlOLNRqFC8rXjXk+EG5NcV4dR+3ir0SXj0vuQLFSNzBjqB4l8srJ68cfzZ5idbQI7V uLj4nm9dy6VPe6xlKwO+veexS+LkHON/3pQrVsJKr8EPPk56d+qftj0VAxa67gLyPQTcLgQYZcG ZGgA81wHyHKbdxA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Geliang Tang The helpers setup_ns() doesn't work when a net namespace named "ns" is passed to them. 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, this patch renames the local variable "ns" as "_ns", which is more unlikely to conflict with existing variables. "_ns" name appears to be unused in the net selftests. Also a check has been added to setup_ns: if "_ns" is passed, setup_ns() helper will exit with an error. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/lib.sh | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/net/lib.sh b/tools/testing/selftests/net/lib.sh index 114b927fee25..b883289ec4a1 100644 --- a/tools/testing/selftests/net/lib.sh +++ b/tools/testing/selftests/net/lib.sh @@ -167,26 +167,32 @@ cleanup_all_ns() # setup_ns local remote setup_ns() { - local ns="" + local _ns="" local ns_name="" local ns_list=() for ns_name in "$@"; do - # Some test may setup/remove same netns multi times - if [ -z "${!ns_name}" ]; then - ns="${ns_name,,}-$(mktemp -u XXXXXX)" - eval "${ns_name}=${ns}" - else - ns="${!ns_name}" - cleanup_ns "$ns" + if [ "${ns_name}" = "_ns" ]; then + echo "Failed to setup namespace '${ns_name}': invalid name" + cleanup_ns "${ns_list[@]}" + exit $ksft_fail fi - if ! ip netns add "$ns"; then + # Some test may setup/remove same netns multi times + if [ -z "${!ns_name}" ]; then + _ns="${ns_name,,}-$(mktemp -u XXXXXX)" + eval "${ns_name}=${_ns}" + else + _ns="${!ns_name}" + cleanup_ns "${_ns}" + fi + + if ! ip netns add "${_ns}"; 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}" link set lo up + ns_list+=("${_ns}") done NS_LIST+=("${ns_list[@]}") } From patchwork Fri May 24 15:13:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthieu Baerts (NGI0)" X-Patchwork-Id: 13673266 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 2EEEE84FB0 for ; Fri, 24 May 2024 15:14:07 +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=1716563647; cv=none; b=udZ1w98z1HhJxEAh7Js/ZSBbBdNXxUuQhFgT732OMtAOu3avHX+ujZySq9dHRt1Q3RPKxOhMhAQcQzpEulO0VrLH3CumgwAXn6pFpTeSSAXAJBiOAl2ppUGe5EvTtgz3j8oWraq3314xRj44GIaZ/x29gjvIfrtFSldLaMGYqpU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716563647; c=relaxed/simple; bh=ClSxmwWO2U9SG4cXkYEmj9cxaLnaOSwzWkJRxKT9oWE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mL3zGppKBuTW2i323tSvvxCTgKFzXNc0wo4L6xrMj28Du2YrCD4tKb58+fF6FVcSC73a6fRkWP6LqQNLNZ3I6IX8CkoPAg6aWRqND3VXqF2QT5tMNYG5RRacIhlDMlO5EXBf05EFfxp/jMJhOukz/H+iFPscmP7bF85xabtHN+w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=StloDT7h; 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="StloDT7h" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20AC6C32782; Fri, 24 May 2024 15:14:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716563647; bh=ClSxmwWO2U9SG4cXkYEmj9cxaLnaOSwzWkJRxKT9oWE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=StloDT7hxDqBSew7YDIdx02eTzWdstq6EZwlFJe2WnGhj7GMmb8cDqmhtwpiPwFOE 5GCUsxnqJqaaD31LN/1puoWboy3UJt2o2wFwHzhQs7NxISZk/r+mSk8nTXhE5JRFsF Gyahzt150a44ndgaSikof/JSVmvZCcpaLTjHCIrWMm76lMh9DQA6AzWj45rU3tUqJt NSNjnmH3S+04TOuNVr8b/xVgf7W14GxSBlDvLvN+K8udxL7Euz+JJTvuksw1Pc3X0j 9LGhwxnYmVWRpQqjsKYNY2HDinmMFZE+laurm/1Pl3NCvXwbUKg76GBL9cSvUifUGL VvR/AiMRbwWrw== From: "Matthieu Baerts (NGI0)" Date: Fri, 24 May 2024 17:13:31 +0200 Subject: [PATCH mptcp-next v5 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 Message-Id: <20240524-selftests-net-lib-fixes-v5-8-b9e0968571a3@kernel.org> References: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@kernel.org> In-Reply-To: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@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/ZANAwAIAfa3gk9CaaBzAcsmYgBmUK6zX9SIJDHqpd5ja6uc5OAyVvbCuvHB/TPIM YW4MNx57jmJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlCuswAKCRD2t4JPQmmg c6TkEAC8rcocds7EkLNhSzk8gnd5H9kAmO+8ENOdZ/b2Wgyycb4hHr/r11tUWgGSx8v5KOb/t5v U4v0vj9CzLdNJkEaDyctKF42XFAqsmIg1fqWw9u/pUUxqPcVgoWFHdPLQENYy4WSMHnpyhhoaMx IdxvRralsC025i6XkiBM2gWLehNlHYX1lacLIyqVDaCuREGk5HNC0me1awBRNTub2IOCOw2vE+9 VSZWnH1CEbpzhs6WpRV0Hc5TikSZRk0bLgm0iJ2HoLAvaeWWfph+gWW5hTlthdTwzKRRIaWhxTK ufl4PaAOoKWAArn8pkJvwEmcXN6msMooQPelSZ+Tgujsg+i3qNXr5Ua6Ppf2tRG0O1K8BOodA86 sv/GhC34AsuGTnDvkIHVq+T0aXvVLfzvjvnqNMQrplI0g63Y8pLYRI4j3Y6m0qUIzD4LzD9/8fX 2NspfOML5/py2cztNRq2ThoA9eS2Z/Rcy/++6aI/slWfGGw2oCxVi4xI4bMhVh8U7JCL/LMbJxV Pnf//ZP+P5NlSzcKfGu2iZSZ8iP09p5w942A0PDlfsvvBtB2W7KpbHnWqKV53S1UTswd6VcZdb8 aYnyvetH1xb5OVhP5+lVvqJj9ZClpjOeG8ObQ+/p5wLJlSRHFdaDDffLCiSamiXjUelbuiJi9uW mqwPLV7uZYLYjQA== 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 --- 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 +. "$(dirname "${0}")/../lib.sh" + readonly KSFT_PASS=0 readonly KSFT_FAIL=1 readonly KSFT_SKIP=4 @@ -438,17 +440,13 @@ mptcp_lib_check_tools() { } mptcp_lib_ns_init() { - local sec rndh - - sec=$(date +%s) - rndh=$(printf %x "${sec}")-$(mktemp -u XXXXXX) + if ! setup_ns ${@}; then + mptcp_lib_pr_fail "Failed to setup namespace ${@}" + exit ${KSFT_FAIL} + fi local netns for netns in "${@}"; do - eval "${netns}=${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=1 ip netns exec "${!netns}" sysctl -q net.ipv4.conf.all.rp_filter=0 ip netns exec "${!netns}" sysctl -q net.ipv4.conf.default.rp_filter=0 @@ -456,9 +454,10 @@ mptcp_lib_ns_init() { } mptcp_lib_ns_exit() { + cleanup_ns "${@}" + local netns for netns in "${@}"; do - ip netns del "${netns}" rm -f /tmp/"${netns}".{nstat,out} done } From patchwork Fri May 24 15:13:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Matthieu Baerts (NGI0)" X-Patchwork-Id: 13673267 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 92B7184FB0 for ; Fri, 24 May 2024 15:14: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=1716563648; cv=none; b=O5Y3EUh6Ig/L3jTeuqWJIUQ23xfQF8YrrFrbLl/TRNSYSJFAglSmljl89JpAf7ZP5oWjSnKfLOtmv8Dni8ZorOc8LR77uNQo6BoBiX/Cj5eZMeYojnzDaj2sRdUn8rAKTrv5s9uzH8ryv5psJf0YC3jJqH/DbYI2R/2rKXZibn4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716563648; c=relaxed/simple; bh=DtCExlmNCV5nIVF1XfgLqzZeQrnTvaIAbFhZvqoCSRI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HqVWkOoy5xR89CET4pFN6j2LKb2vWknfPD291jsN2MMgR9686Y+I4xtr8lmY8oMK7GgjoPLalhfSZKBKNye0H2zjVjmdFgRfoXLmLBt6dvg/aF8pTxpqyfcYru947bZBhUFKgDqtMF3dgTFKl+aifg49YnWZTQzH+xqH7/eg9Bo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=raj9qvzM; 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="raj9qvzM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83247C4AF08; Fri, 24 May 2024 15:14:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716563648; bh=DtCExlmNCV5nIVF1XfgLqzZeQrnTvaIAbFhZvqoCSRI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=raj9qvzMQrzZrbJfER06CuucXqwgm0KW35UCQ+jr2T4ep6Iri6mrI18SRmUwooDKi k5nn6lw5ZdWjw1ModRIA7QeFdBUtydMI2ZL/D7CiIIPK4dLV0T2UDfvcQqKzIsKrpm k7fB7uFTREbQqXy6WAp7ZOm/f7yUbPVLG934q3gFO+Sg+JlBoILPIcxoYycC5bTggh nWTKgfqCL2jTWMovHR24FpE0jhEs2XWzWFgYhRpowZlId6Iln/UInxezQdg3V8x8Um 2gMfkolFPUBUpVgxLxjGuxE9ZYkGX91E5xw08z2JORxqkR7R7QMdNthBBLuq3x0ENy 64nLj2xm8tV1Q== From: "Matthieu Baerts (NGI0)" Date: Fri, 24 May 2024 17:13:32 +0200 Subject: [PATCH mptcp-next v5 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 Message-Id: <20240524-selftests-net-lib-fixes-v5-9-b9e0968571a3@kernel.org> References: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@kernel.org> In-Reply-To: <20240524-selftests-net-lib-fixes-v5-0-b9e0968571a3@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/ZANAwAIAfa3gk9CaaBzAcsmYgBmUK6zSNMHBaCafwtQveN+v2eSY/WbWzNRPBKRe B1136Na6JSJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZlCuswAKCRD2t4JPQmmg c9DSEACytNz1P9iMB3gjbzRdwm8431KKMdrHrdGoiI/G7VcodD5CxbPXdadajn+m1s+LffeDA6Y dqwoObVyLHY+I60E8WdYEjqizsAypnVWFvgM9/Z2i3zSC2QO8sd7WhgWJdo9YiyRmUh+OgN/OS3 OrAaqyd07GqnaPQITZYMr+dpi5WOqVJLg2qh4RUNC42/OrMUIwlhHckHQfzIb4d+BefDCe0Btii AgwBn7TKr11SyP0BT3cW/NeS0IIReKPxVghyeOZGdfIY1wjb+pEtw4NiUaLvdnz9APBg+coWK6U T7WQHYizAKbPU+Q1FCETUa8JMpHvXgFhYCnNbKdjmKuyyB1u1yVR92LOY1RTxoYREchEuHFJFm0 hLVs3Jl4q5C3sMz3Bul03CTl35+SyXOVgQxzg3nt4Vjs82VLgiqC2ikLHk0SJZhNQC6nbEAKbYI 9fI+7wCJpEwnDtF8X2kLwej3spd5Xr4LVgczBUYg0tIIYLOnIBtFD2ubqn2i0vmTSVhn/Rcvav3 A1qmQo8gC4z/QQ/XbeBKK7p1Oc7b3BORLg5m724MftLXhgCrJxtIzTdGZ7avi9KjFsvCPV+I0oz r0Hi91yI5tuTgC+O2Luht1OAfiTVPv4vaNPQdXOQuNMH53gKcK4nIesIlFugfXyTPKoS5Cet4v8 mKgdO1iQ41urf3g== 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 --- 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 . "$(dirname "${0}")/../lib.sh" +. "$(dirname "${0}")/../net_helper.sh" readonly KSFT_PASS=0 readonly KSFT_FAIL=1 @@ -363,20 +364,7 @@ mptcp_lib_check_transfer() { # $1: ns, $2: port mptcp_lib_wait_local_port_listen() { - local listener_ns="${1}" - local port="${2}" - - local port_hex - port_hex="$(printf "%04X" "${port}")" - - local _ - for _ in $(seq 10); do - ip netns exec "${listener_ns}" cat /proc/net/tcp* | \ - awk "BEGIN {rc=1} {if (\$2 ~ /:${port_hex}\$/ && \$4 ~ /0A/) \ - {rc=0; exit}} END {exit rc}" && - break - sleep 0.1 - done + wait_local_port_listen "${@}" "tcp" } mptcp_lib_check_output() {