selftests: net: lib: avoid error removing empty netns name
BugLink: https://bugs.launchpad.net/bugs/2073788
commit 79322174bcc780b99795cb89d237b26006a8b94b upstream.
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: 25ae948b44 ("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>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>
Link: https://lore.kernel.org/r/20240605-upstream-net-20240605-selftests-net-lib-fixes-v1-2-b3afadd368c9@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Portia Stephens <portia.stephens@canonical.com>
Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
This commit is contained in:
committed by
Roxana Nicolescu
parent
a995501a21
commit
862197067e
@@ -10,7 +10,7 @@ BUSYWAIT_TIMEOUT=$((WAIT_TIMEOUT * 1000)) # ms
|
||||
# Kselftest framework requirement - SKIP code is 4.
|
||||
ksft_skip=4
|
||||
# namespace list created by setup_ns
|
||||
NS_LIST=""
|
||||
NS_LIST=()
|
||||
|
||||
##############################################################################
|
||||
# Helpers
|
||||
@@ -133,6 +133,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"
|
||||
@@ -146,7 +147,7 @@ cleanup_ns()
|
||||
|
||||
cleanup_all_ns()
|
||||
{
|
||||
cleanup_ns $NS_LIST
|
||||
cleanup_ns "${NS_LIST[@]}"
|
||||
}
|
||||
|
||||
# setup netns with given names as prefix. e.g
|
||||
@@ -155,7 +156,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
|
||||
@@ -171,13 +172,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()
|
||||
|
||||
Reference in New Issue
Block a user