Re: [PATCH net-next v3 4/5] selftest: seg6: explicit cleanup for SRv6 End PSP test

From: Andrea Mayer

Date: Sun Nov 15 2026 - 23:34:49 EST


On Thu, 12 Nov 2026 17:27:59 +0800
Hangbin Liu <hangbin.liu@xxxxxxxxx> wrote:

> The End PSP tests install policy and localsid state but rely on the
> global namespace teardown to remove it. That leaves flavor-specific
> state behind once more tests share this script.
>
> Use defer and defer_scopes_cleanup to remove the PSP specified
> configurations. i.e.
>
> * cafe::1, cafe::1:e9, cafe::2, cafe::2:e9 route and proxy on rt1, rt2
> * fcbb:0::x0e9 End next-csid,psp policies on rt 1,2,3,4
> * fcff:x::0ef1 End psp polices on rt 1,2,4

Hi Hangbin,

A few nits on the message:
- The code uses defer_scope_pop, not defer_scopes_cleanup.
- The NEXT-C-SID End SIDs are fcbb:0:x0e9::/48, not fcbb:0::x0e9.
- "polices" is a typo.
- The subject prefix is "selftest: seg6:", while the other selftest
patches of the series use "selftests: seg6:".

>
> 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 0ed5bfe99029..374b43661c28 100755
> --- a/tools/testing/selftests/net/srv6_end_flavors_test.sh
> +++ b/tools/testing/selftests/net/srv6_end_flavors_test.sh
> @@ -759,6 +759,8 @@ setup_rt_endpoint()
> add "${sid}" table "${LOCALSID_TABLE_ID}" \
> encap seg6local action ${behavior_cfg} \
> dev "${DUMMY_DEVNAME}"
> + defer ip -netns "${nsname}" -6 route \
> + del "${sid}" table "${LOCALSID_TABLE_ID}"
> }
>
> # Add an SRv6 Endpoint behavior to each router of a Policy element <nodeid:op>.
> @@ -801,10 +803,16 @@ setup_rt_host_proxy()
> ip -netns "$(get_rtname "${rt}")" -6 neigh add \
> proxy "${IPv6_HS_NETWORK}::${hs}" \
> dev "${RT2HS_DEVNAME}"
> + defer ip -netns "$(get_rtname "${rt}")" -6 neigh del \
> + 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}"
> + defer ip -netns "$(get_rtname "${rt}")" -6 neigh del \
> + proxy "${IPv6_HS_NETWORK}::${hs}:${func}" \
> + dev "${RT2HS_DEVNAME}"
> }
>
> # This helper function builds and installs the SID List (i.e. SRv6 Policy)
> @@ -882,6 +890,8 @@ __setup_rt_policy()
> add "${IPv6_HS_NETWORK}::${dst}" \
> encap seg6 mode inline segs "${policy}" \
> dev "${DUMMY_DEVNAME}"
> + defer ip -netns "${in_nsname}" -6 route \
> + del "${IPv6_HS_NETWORK}::${dst}"
> }
>
> # see __setup_rt_policy

If you agree to keep the proxy entry in __setup_rt_policy(), as
proposed on patch 3, its defer can go next to the defer of the route.
Something like:

ip -netns "${in_nsname}" -6 route \
add "${IPv6_HS_NETWORK}::${dst}" \
encap seg6 mode inline segs "${policy}" \
dev "${DUMMY_DEVNAME}"
defer ip -netns "${in_nsname}" -6 route \
del "${IPv6_HS_NETWORK}::${dst}"

ip -netns "${in_nsname}" -6 neigh \
add proxy "${IPv6_HS_NETWORK}::${dst}" \
dev "${RT2HS_DEVNAME}"
defer ip -netns "${in_nsname}" -6 neigh \
del proxy "${IPv6_HS_NETWORK}::${dst}" \
dev "${RT2HS_DEVNAME}"

> @@ -1460,11 +1470,13 @@ set +e
> router_tests
> host2gateway_tests
>
> +defer_scope_push
> set -e
> setup_end_flv_psp
> set +e
> host_srv6_end_flv_psp_tests
> host_srv6_end_flv_next_csid_psp_tests
> host_srv6_end_flv_consumed_srh_tests
> +defer_scope_pop
>
> print_log_test_results

setup_hs_lo_addr() has no defer. The loopback addresses cafe::1:e9
and cafe::2:e9, and the routes that setup_hs_lo_addr() adds on rt-1
and rt-2, stay after defer_scope_pop. Only the End PSP scenario uses
them. Could setup_hs_lo_addr() defer their removal too, like the
Policies? Something like:

ip -netns "${hsname}" addr add "${addr}/128" dev lo nodad
defer ip -netns "${hsname}" addr del "${addr}/128" dev lo

ip -netns "${rtname}" -6 route \
add "${addr}" \
via "${IPv6_HS_NETWORK}::${hs}" dev "${RT2HS_DEVNAME}"
defer ip -netns "${rtname}" -6 route \
del "${addr}"

Thanks,
Andrea