Re: [PATCH net-next v3 3/5] selftests: seg6: move SRv6 End PSP setup into its own helper
From: Andrea Mayer
Date: Sun Nov 15 2026 - 23:28:02 EST
On Thu, 12 Nov 2026 17:27:58 +0800
Hangbin Liu <hangbin.liu@xxxxxxxxx> wrote:
> setup() installs both the base topology and the End PSP policies. That
> couples general test setup with one specific flavor scenario and makes
> it hard to add further flavor cases cleanly.
>
> Extract the End PSP policy setup into setup_end_flv_psp() so flavor
> tests can set up and later tear down independently (the matching
> cleanup arrives in a following patch).
>
> Run the block under set -e so a setup failure is treated as an error
> instead of falling through into the connectivity checks. When deciding
> to report the run as skipped, keep any failure already recorded by a
> test, so a real failure is not converted into a skip.
Hi Hangbin,
thanks for the v3.
>
> Signed-off-by: Hangbin Liu <liuhangbin@xxxxxxxxxx>
> [snip]
> diff --git a/tools/testing/selftests/net/srv6_end_flavors_test.sh b/tools/testing/selftests/net/srv6_end_flavors_test.sh
> index 157baa8ecb0b..0ed5bfe99029 100755
> --- a/tools/testing/selftests/net/srv6_end_flavors_test.sh
> +++ b/tools/testing/selftests/net/srv6_end_flavors_test.sh
> @@ -488,8 +488,9 @@ cleanup()
>
> # check whether the setup phase was completed successfully or not. In
> # case of an error during the setup phase of the testing environment,
> - # the selftest is considered as "skipped".
> - if [ "${SETUP_ERR}" -ne 0 ]; then
> + # the selftest is considered as "skipped", unless a test has already
> + # recorded a failure.
> + if [ "${SETUP_ERR}" -ne 0 ] && [ "$ret" -ne "$ksft_fail" ]; then
> echo "SKIP: Setting up the testing environment failed"
> exit "${ksft_skip}"
> fi
When a test has already failed and the setup then fails, the script
exits with 1 and does not say that the setup failed. For example, with
hs-2 -> gw failing and then an error in setup_end_flv_psp(), the last
TEST lines in the log are:
TEST: IPv6 Hosts connectivity: hs-1 -> gw [ OK ]
TEST: IPv6 Hosts connectivity: hs-2 -> gw [FAIL]
The End PSP tests did not run. Before this patch, the setup ran before
any test, and cleanup() printed "Setting up the testing environment
failed" on every setup error. Could cleanup() print it also in this
case, keeping the exit code 1? Something like:
if [ "${SETUP_ERR}" -ne 0 ]; then
if [ "${ret}" -ne "${ksft_fail}" ]; then
echo "SKIP: Setting up the testing environment failed"
exit "${ksft_skip}"
fi
echo "FAIL: Setting up the testing environment failed"
fi
exit "${ret}"
> @@ -785,6 +786,27 @@ setup_rt_endpoints()
> done
> }
>
> +# setup proxy on route entries for hosts
> +# args:
> +# $1 - ingress router that enforces the SRv6 Policy
> +# $2 - destination host whose addresses are proxied
> +# $3 - suffix of the address on the loopback of the destination host
> +# (i.e. cafe::<host>:<suffix>)
> +setup_rt_host_proxy()
> +{
> + local rt=$1
> + local hs=$2
> + local func=$3
> +
> + ip -netns "$(get_rtname "${rt}")" -6 neigh add \
> + proxy "${IPv6_HS_NETWORK}::${hs}" \
> + dev "${RT2HS_DEVNAME}"
> +
> + ip -netns "$(get_rtname "${rt}")" -6 neigh add \
> + proxy "${IPv6_HS_NETWORK}::${hs}:${func}" \
> + dev "${RT2HS_DEVNAME}"
> +}
> +
> # This helper function builds and installs the SID List (i.e. SRv6 Policy)
> # to be applied on incoming packets at the ingress node. Moreover, it
> # configures the SRv6 nodes specified in the SID List to process the traffic
> @@ -860,10 +882,6 @@ __setup_rt_policy()
> add "${IPv6_HS_NETWORK}::${dst}" \
> encap seg6 mode inline segs "${policy}" \
> dev "${DUMMY_DEVNAME}"
> -
> - ip -netns "${in_nsname}" -6 neigh \
> - add proxy "${IPv6_HS_NETWORK}::${dst}" \
> - dev "${RT2HS_DEVNAME}"
> }
>
> # see __setup_rt_policy
> @@ -962,17 +980,29 @@ setup()
> setup_hs 1 1
> setup_hs 2 2
>
> - # set up the loopback addresses of the hosts used by the Policies (i.c)
> - # and (i.d).
> - setup_hs_lo_addr 1 1 "${END_CSID_PSP_FUNC}"
> - setup_hs_lo_addr 2 2 "${END_CSID_PSP_FUNC}"
> -
> # set up default SRv6 Endpoints (i.e. SRv6 End behavior)
> setup_rt_local_sids 1 "2 3 4"
> setup_rt_local_sids 2 "1 3 4"
> setup_rt_local_sids 3 "1 2 4"
> setup_rt_local_sids 4 "1 2 3"
>
> + # testing environment was set up successfully
> + SETUP_ERR=0
> +}
> +
> +setup_end_flv_psp()
> +{
> + SETUP_ERR=1
> +
> + # set up the loopback addresses of the hosts used by the Policies (i.c)
> + # and (i.d).
> + setup_hs_lo_addr 1 1 "${END_CSID_PSP_FUNC}"
> + setup_hs_lo_addr 2 2 "${END_CSID_PSP_FUNC}"
> +
> + # setup proxy on route entries for hosts
> + setup_rt_host_proxy 1 2 "${END_CSID_PSP_FUNC}"
> + setup_rt_host_proxy 2 1 "${END_CSID_PSP_FUNC}"
> +
> # set up SRv6 policies
> # create a connection between hosts hs-1 and hs-2.
> # The path between hs-1 and hs-2 traverses SRv6 aware routers.
Before this patch, __setup_rt_policy() added the proxy entry together
with the route of each Policy. With this patch, each scenario calls
setup_rt_host_proxy() instead.
In this v3, 4/5 deletes the proxies when the scenario ends, like the
routes of the Policies. So I think the proxy entry can stay in
__setup_rt_policy(), and in 4/5 its defer can go next to the defer of
the route. What do you think?
> [snip]
Thanks,
Andrea