Re: [PATCH net-next v3 5/5] selftests: seg6: add PSP flavor testing for SRv6 End.X
From: Andrea Mayer
Date: Tue Nov 17 2026 - 21:51:01 EST
On Tue, 17 Nov 2026 16:48:12 +0800
Hangbin Liu <hangbin.liu@xxxxxxxxx> wrote:
> Hi Andrea,
> On Tue, Nov 17, 2026 at 03:50:21AM +0100, Andrea Mayer wrote:
> > On Thu, 12 Nov 2026 17:28:00 +0800
> > Hangbin Liu <hangbin.liu@xxxxxxxxx> wrote:
> >
> > > Add an End.X flavor scenario to srv6_end_flavors_test.sh that applies
> > > the same PSP policies as the End scenario, alone and combined with
> > > NEXT-C-SID, with every node bound through its adjacency (e.g. 4>2 for
> > > rt-4 towards rt-2, 2>h towards the host), and exercise it with the
> > > existing host connectivity tests.
> > >
> > > Teach the policy and endpoint helpers about <nodeid:op:act> elements:
> > > __get_srv6_rtcfg_act() extracts the action, the __get_*_func()
> > > helpers pick the Function for the action, __get_act_cfg() derives the
> > > End.X next hop, and build_csid()/get_rt_sid() keep the adjacency so
> > > it is encoded into the C-SIDs (e.g. fcbb:0:34a9:: is End.X on rt-3
> > > towards rt-4).
> > >
> > > There is no need to re-check the ip command capability as it already
> > > supports setting PSP flavor with End.X.
> >
> > Hi Hangbin,
> > thanks for adding the End.X scenario.
> >
> > I see these main areas to work on:
> > - How an element is read. The "router>adjacency" form is read in
> > different places, each with its own sed or cut. IMO, the selftest
> > would be easier to extend to other behaviors and flavor combinations
> > if the nodes were read in one place, with small helpers. What
> > depends on the behavior could also be chosen in one place.
> > - A check of the elements, so that a mistake in a Policy does not go
> > unnoticed.
> > - A check of the kernel support for End.X PSP.
> > - The End.X tests with a consumed SRH.
> > - One End.X SID per adjacency also without NEXT-C-SID, where today
> > the SIDs of a router do not depend on the adjacency.
> >
> > The comments below are ideas on how to address each of them, plus
> > some smaller points. There may also be other parts of the selftest
> > to adapt.
>
> Thanks for your kind review.
>
> > > Signed-off-by: Hangbin Liu <liuhangbin@xxxxxxxxxx>
> > > ---
> > > I didn't add `host_srv6_end_flv_consumed_srh_tests()` for End.X because
> > > the extra policy insertion does not work with the End.X policy. The packet
> > > resolves the destination via the next hop directly, rather than doing a
> > > re-lookup in table 90.
> >
> > The ingress router can insert the extra SRH instead, on the first SID
> > of the Policy. As in the End tests, an End SID of the base setup can
> > then consume it. This way, we can add these tests for End.X too. What
> > do you think?
>
> For the End.X Policy (i.a) testing, we have SID List=fcff:3::a,fcff:4::af1,fcff:2::af1,cafe::2.
> And we configured the next hop policy for the SID on each rt. e.g
>
> On rt3: fcff:3::000a table 90 encap seg6local action End.X nh6 fcf0:0:3:4::4
> On rt4: fcff:4::0af1 table 90 encap seg6local action End.X nh6 fcf0:0:2:4::2 flavors psp
> on rt2: fcff:2::0af1 table 90 encap seg6local action End.X nh6 cafe::2 flavors psp
>
> When the packet arrive on rt4, it's dst is set to fcff:2::af1. And the new
> insert policy (fcff:2::0af1 table 90 encap seg6 mode inline segs fcff:3::000e dev dum0)
> doesn't works as the End.X policy will goto next hop fcf0:0:2:4::2 directly
> instead of looking at fcff:2::af1 on table 90.
>
> Would you add more info about the ingress route?
Hi Hangbin,
With one SID per adjacency (see the SID format below), the SID List of
(i.a) is fcff:3::400a,fcff:4::2af1,fcff:2::0af1,cafe::2. The ingress router
is rt-1. After rt-1 applies the Policy, the DA is the first SID,
fcff:3::400a, and rt-1 looks it up in table 90. The route that inserts the
extra SRH can go on rt-1, as the End tests already do for (i.b) on rt-2:
fcff:3::400a table 90 encap seg6 mode inline segs fcff:4::000e dev dum0
rt-4 consumes the extra SRH with its End SID, and sets the DA back to
fcff:3::400a. Then the packet follows the End.X Policy. The other End.X
Policies work the same way, with the route on their ingress router, for
their first SID. Would this work for you?
>
> >
> > > [snip]
> > > diff --git a/tools/testing/selftests/net/srv6_end_flavors_test.sh b/tools/testing/selftests/net/srv6_end_flavors_test.sh
> > > index 374b43661c28..5b1b13586df0 100755
> > > --- a/tools/testing/selftests/net/srv6_end_flavors_test.sh
> > > +++ b/tools/testing/selftests/net/srv6_end_flavors_test.sh
> > > [snip]
> > > __get_srv6_rtcfg_id()
> > > {
> > > local element="$1"
> > >
> > > + echo "${element}" | sed 's/:.*//; s/>[1234h]//g'
> > > +}
> > > [snip]
> > > +__get_srv6_rtcfg_all_id()
> > > +{
> > > + local element="$1"
> > > +
> > > echo "${element}" | cut -d':' -f1
> > > }
> > >
> >
> > The same node is read again in build_csid(), get_rt_sid() and
> > setup_rt_endpoints(), each time in its own way. Two small helpers,
> > one returning the router of a node and one its adjacency, could
> > replace these sed and cut. __get_srv6_rtcfg_id() above would then not
> > need the sed, and __get_srv6_rtcfg_all_id() would probably not be
> > needed at all. Without NEXT-C-SID, __setup_rt_policy() could then get
> > each SID of the Policy from get_rt_sid(), as setup_rt_endpoints()
> > does.
>
> For a single End.X node, e.g. "4>2", we can return the router (4) and adjacent
> router (2). But how to get multi nodes. e.g. "4>2,2>3", with theses 2 small
> helpers?
A list of nodes comes with NEXT-C-SID, where the element constructs one
C-SID container. build_csid_container() and setup_rt_endpoints() already
loop over these nodes, one at a time. The helpers would be used in these
loops, on each node. For example, in build_csid_container():
"4>2,2>3" -> 4>2: router 4, adjacency 2 -> 42a9
2>3: router 2, adjacency 3 -> 23a9
-> fcbb:0:42a9:23a9::
>
> >
> > > [snip]
> > > +__get_noflv_func()
> > > +{
> > > + local act="$1"
> > > +
> > > + case "${act}" in
> > > + "End")
> > > + echo "${END_FUNC}" ;;
> > > + "End.X")
> > > + echo "${ENDX_FUNC}" ;;
> > > + esac
> > > +}
> > > +
> > > +__get_psp_func()
> > > +{
> > > + local act="$1"
> > > +
> > > + case "${act}" in
> > > + "End")
> > > + echo "${END_PSP_FUNC}" ;;
> > > + "End.X")
> > > + echo "${ENDX_PSP_FUNC}" ;;
> > > + esac
> > > +}
> > > +
> > > +__get_csid_psp_func()
> > > +{
> > > + local act="$1"
> > > +
> > > + case "${act}" in
> > > + "End")
> > > + echo "${END_CSID_PSP_FUNC}" ;;
> > > + "End.X")
> > > + echo "${ENDX_CSID_PSP_FUNC}" ;;
> > > + esac
> > > +}
> >
> > The three __get_*_func() helpers differ only in the constants. As a
> > possible simplification, they could be one function with, for example,
> > a case on the behavior and the operation ("End noflv", "End psp", ...,
> > "End.X next-csid,psp"). Then the Functions are chosen in one place,
> > also for a new behavior.
>
> Thanks, I will merge them together.
>
> >
> > > [snip]
> > > @@ -713,10 +814,10 @@ op_has_next_csid()
> > > # $1 - router
> > > # $2 - operation <op> of the element (e.g. "next-csid,psp")
> > > # $3 - Function (e.g. "0ef1", or "e9" with NEXT-C-SID)
> > > -# e.g. input: "4" "psp" "0ef1"
> > > -# output: "fcff:4::0ef1"
> > > -# input: "4" "next-csid,psp" "e9"
> > > -# output: "fcbb:0:40e9::/48"
> > > +# e.g. input: "4" "psp" "0ef1", output: "fcff:4::0ef1"
> > > +# input: "4>2" "psp" "0af1", output: "fcff:4::0af1"
> > > +# input: "4" "next-csid,psp" "e9", output: "fcbb:0:40e9::/48"
> > > +# input: "4>2" "next-csid,psp" "a9", output: "fcbb:0:42a9::/48"
> > > get_rt_sid()
> > > {
> > > local rt="$1"
> > > @@ -730,6 +831,7 @@ get_rt_sid()
> > > return
> > > fi
> > >
> > > + rt=$(echo "${rt}" | sed 's/>.*//')
> > > echo "${LOCATOR_SERVICE}:${rt}::${func}"
> > > }
> >
> > Without NEXT-C-SID, get_rt_sid() drops the adjacency, as the Sashiko
> > review also notes: "4>2:psp:End.X" and "4>3:psp:End.X" would both get
> > fcff:4::0af1. I think each adjacency should have its own SID. The
> > SID could carry the adjacency, as the C-SID already does. Then
> > __setup_rt_policy() needs the new SID. Calling get_rt_sid() there,
> > as suggested above, would do that.
>
> Hmm, do you want to set the adjacency like xaf1 or xxa1?
> e.g. ffcf:4::2af1 for 4>2:psp:End.X, ffcf:4::3af1 for 4>3:psp:End.X
> or
> ffcf:4::42a1 for 4>2:psp:End.X, ffcf:4::43a1 for 4>3:psp:End.X?
>
> The second one may also need to adjust the End address. e.g.
> fcff:x::ef1 -> fcff:x::e1
The first one you propose, fcff:4::2af1, seems reasonable. The adjacency
takes the place of the leading 0 of the Function (0af1 -> 2af1). Towards
the host the 0 stays, as in the C-SID, and the End SIDs do not change.
> [snip]
Thanks,
Andrea