From: Petr Machata <petrm@nvidia.com>
To: Matthieu Baerts <matttbe@kernel.org>
Cc: Petr Machata <petrm@nvidia.com>, <mptcp@lists.linux.dev>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
"Jakub Kicinski" <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Shuah Khan <shuah@kernel.org>,
Hangbin Liu <liuhangbin@gmail.com>, <netdev@vger.kernel.org>,
<linux-kselftest@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<stable@vger.kernel.org>, Geliang Tang <geliang@kernel.org>
Subject: Re: [PATCH net 2/3] selftests: net: lib: avoid error removing empty netns name
Date: Wed, 5 Jun 2024 16:30:51 +0200 [thread overview]
Message-ID: <87h6e7796c.fsf@nvidia.com> (raw)
In-Reply-To: <0f85551f-dd67-4d88-abc2-cdf80293a604@kernel.org>
Matthieu Baerts <matttbe@kernel.org> writes:
> Hi Petr,
>
> Thank you for the review!
>
> On 05/06/2024 12:38, Petr Machata wrote:
>>
>> "Matthieu Baerts (NGI0)" <matttbe@kernel.org> writes:
>>
>>> 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")
>>> Cc: stable@vger.kernel.org
>>> Acked-by: Geliang Tang <geliang@kernel.org>
>>> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
>>> ---
>>> 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 a422e10d3d3a..e2f51102d7e1 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
>>> @@ -137,6 +137,7 @@ cleanup_ns()
>>> fi
>>>
>>> for ns in "$@"; do
>>> + [ -z "${ns}" ] && continue
>>
>> I think this is now irrelevant though? Now cleanup_ns() will be called
>> with no arguments for an empty NS list, so the loop does not even kick in.
>
> If you don't mind, I think it is "safer" to keep it: some selftests are
> using 'cleanup_ns()' directly, not via 'cleanup_all_ns()', e.g.
> netns-name.sh, cmsg-*.sh, fib-*.sh, etc. which can call it with the
> variables not set if 'setup_ns' failed during the init phase.
>
> For the moment, all these selftests are calling 'cleanup_ns()' with
> parameters added without double quotes: so it is fine. Until someone
> changes that to please shellcheck, like we did on our side with MPTCP
> selftests. So this line will be useful soon when we will publish the
> rest of our patches to use 'lib.sh' [1] :)
All right.
Reviewed-by: Petr Machata <petrm@nvidia.com>
next prev parent reply other threads:[~2024-06-05 14:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-05 9:21 [PATCH net 0/3] selftests: net: lib: small fixes Matthieu Baerts (NGI0)
2024-06-05 9:21 ` [PATCH net 1/3] selftests: net: lib: support errexit with busywait Matthieu Baerts (NGI0)
2024-06-05 9:44 ` Hangbin Liu
2024-06-05 9:58 ` Matthieu Baerts
2024-06-05 9:21 ` [PATCH net 2/3] selftests: net: lib: avoid error removing empty netns name Matthieu Baerts (NGI0)
2024-06-05 10:38 ` Petr Machata
2024-06-05 14:12 ` Matthieu Baerts
2024-06-05 14:30 ` Petr Machata [this message]
2024-06-05 14:33 ` Matthieu Baerts
2024-06-06 2:15 ` Hangbin Liu
2024-06-05 9:21 ` [PATCH net 3/3] selftests: net: lib: set 'i' as local Matthieu Baerts (NGI0)
2024-06-06 2:13 ` Hangbin Liu
2024-06-06 15:40 ` [PATCH net 0/3] selftests: net: lib: small fixes patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87h6e7796c.fsf@nvidia.com \
--to=petrm@nvidia.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=geliang@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=liuhangbin@gmail.com \
--cc=matttbe@kernel.org \
--cc=mptcp@lists.linux.dev \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shuah@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).