]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
selftests: net: lib: kill PIDs before del netns
authorMatthieu Baerts (NGI0) <matttbe@kernel.org>
Tue, 13 Aug 2024 13:39:34 +0000 (15:39 +0200)
committerPaolo Abeni <pabeni@redhat.com>
Thu, 15 Aug 2024 10:57:09 +0000 (12:57 +0200)
When deleting netns, it is possible to still have some tasks running,
e.g. background tasks like tcpdump running in the background, not
stopped because the test has been interrupted.

Before deleting the netns, it is then safer to kill all attached PIDs,
if any. That should reduce some noises after the end of some tests, and
help with the debugging of some issues. That's why this modification is
seen as a "fix".

Fixes: 25ae948b4478 ("selftests/net: add lib.sh")
Acked-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Acked-by: Florian Westphal <fw@strlen.de>
Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>
Link: https://patch.msgid.link/20240813-upstream-net-20240813-selftests-net-lib-kill-v1-1-27b689b248b8@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
tools/testing/selftests/net/lib.sh

index d0219032f77300083c0ee27462223d6ccd10e2d7..8ee4489238ca4b19bcf6608a71256ba89472148f 100644 (file)
@@ -146,6 +146,7 @@ cleanup_ns()
 
        for ns in "$@"; do
                [ -z "${ns}" ] && continue
+               ip netns pids "${ns}" 2> /dev/null | xargs -r kill || true
                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"