NACK/'Cmnt: [SRU][J][PATCH 1/6] selftests/net: add lib.sh
Ivan Hu
ivan.hu at canonical.com
Fri Oct 2 13:37:36 UTC 2026
seems 2114e83381d3 is also needed.
On Fri, Oct 2, 2026 at 4:40 AM Ian Whitfield via kernel-team <
kernel-team at lists.ubuntu.com> wrote:
> From: Hangbin Liu <liuhangbin at gmail.com>
>
> BugLink: https://bugs.launchpad.net/bugs/2055473
>
> Add a lib.sh for net selftests. This file can be used to define commonly
> used variables and functions. Some commonly used functions can be moved
> from forwarding/lib.sh to this lib file. e.g. busywait().
>
> Add function setup_ns() for user to create unique namespaces with given
> prefix name.
>
> Reviewed-by: Petr Machata <petrm at nvidia.com>
> Signed-off-by: Hangbin Liu <liuhangbin at gmail.com>
> Signed-off-by: Paolo Abeni <pabeni at redhat.com>
> (backported from commit 25ae948b447881bf689d459cd5bd4629d9c04b20)
> [ijwhitfield: Merged changes with those added by our backport of
> d83a580675927 ("selftests: net: use slowwait to stabilize
> vrf_route_leaking test")
> which had added some of the changes from:
> 25ae948b44788 ("selftests/net: add lib.sh") (this commit)
> a4022a332f437 ("selftests: net: Unify code of busywait() and slowwait()")
> ea63ac1429256 ("selftests/net: use tc rule to filter the na packet")]
> Signed-off-by: Ian Whitfield <ian.whitfield at canonical.com>
> ---
> tools/testing/selftests/net/Makefile | 2 +-
> tools/testing/selftests/net/forwarding/lib.sh | 27 +--------
> tools/testing/selftests/net/lib.sh | 59 +++++++++++++++++++
> 3 files changed, 61 insertions(+), 27 deletions(-)
>
> diff --git a/tools/testing/selftests/net/Makefile
> b/tools/testing/selftests/net/Makefile
> index 93aad7188796a..a849f69d719b6 100644
> --- a/tools/testing/selftests/net/Makefile
> +++ b/tools/testing/selftests/net/Makefile
> @@ -33,7 +33,7 @@ TEST_PROGS += srv6_end_dt4_l3vpn_test.sh
> TEST_PROGS += srv6_end_dt6_l3vpn_test.sh
> TEST_PROGS += vrf_strict_mode_test.sh
> TEST_PROGS_EXTENDED := in_netns.sh setup_loopback.sh setup_veth.sh
> -TEST_PROGS_EXTENDED += toeplitz_client.sh toeplitz.sh
> +TEST_PROGS_EXTENDED += toeplitz_client.sh toeplitz.sh lib.sh
> TEST_GEN_FILES = socket nettest
> TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy
> reuseport_addr_any
> TEST_GEN_FILES += tcp_mmap tcp_inq psock_snd txring_overwrite
> diff --git a/tools/testing/selftests/net/forwarding/lib.sh
> b/tools/testing/selftests/net/forwarding/lib.sh
> index c570d8f65a0ce..e3d3a104bdc4e 100644
> --- a/tools/testing/selftests/net/forwarding/lib.sh
> +++ b/tools/testing/selftests/net/forwarding/lib.sh
> @@ -4,9 +4,6 @@
>
> ##############################################################################
> # Defines
>
> -# Kselftest framework requirement - SKIP code is 4.
> -ksft_skip=4
> -
> # Can be overridden by the configuration file.
> PING=${PING:=ping}
> PING6=${PING6:=ping6}
> @@ -33,6 +30,7 @@ if [[ -f $relative_path/forwarding.config ]]; then
> source "$relative_path/forwarding.config"
> fi
>
> +source ../lib.sh
>
> ##############################################################################
> # Sanity checks
>
> @@ -303,29 +301,6 @@ log_info()
> echo "INFO: $msg"
> }
>
> -busywait()
> -{
> - local timeout=$1; shift
> -
> - local start_time="$(date -u +%s%3N)"
> - while true
> - do
> - local out
> - out=$("$@")
> - local ret=$?
> - if ((!ret)); then
> - echo -n "$out"
> - return 0
> - fi
> -
> - local current_time="$(date -u +%s%3N)"
> - if ((current_time - start_time > timeout)); then
> - echo -n "$out"
> - return 1
> - fi
> - done
> -}
> -
> not()
> {
> "$@"
> diff --git a/tools/testing/selftests/net/lib.sh
> b/tools/testing/selftests/net/lib.sh
> index 5e31809ff7b3c..4167125df55f5 100644
> --- a/tools/testing/selftests/net/lib.sh
> +++ b/tools/testing/selftests/net/lib.sh
> @@ -1,6 +1,14 @@
> #!/bin/bash
> # SPDX-License-Identifier: GPL-2.0
>
>
> +##############################################################################
> +# Defines
> +
> +# Kselftest framework requirement - SKIP code is 4.
> +ksft_skip=4
> +
>
> +##############################################################################
> +# Helpers
> loopy_wait()
> {
> local sleep_cmd=$1; shift
> @@ -40,3 +48,54 @@ slowwait()
> loopy_wait "sleep 0.1" "$((timeout_sec * 1000))" "$@"
> }
>
> +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
> + ip netns delete "${ns}" &> /dev/null
> + if ! busywait 2 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
> +}
> +
> +# setup netns with given names as prefix. e.g
> +# setup_ns local remote
> +setup_ns()
> +{
> + local ns=""
> + local ns_name=""
> + 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
> + ns="${ns_name,,}-$(mktemp -u XXXXXX)"
> + eval readonly ${ns_name}="$ns"
> + else
> + eval 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_list $ns"
> + done
> +}
> --
> 2.43.0
>
>
> --
> kernel-team mailing list
> kernel-team at lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20261002/65495629/attachment.html>
More information about the kernel-team
mailing list