bgpd: Add support for BGP to use SRv6 SID in an explicit way #18519

GaladrielZhao · 2025-03-27T03:04:21Z

The current implementation supports BGP using SIDs allocated in two modes, including index-mode and auto-mode.
This PR adds support for BGP to use SRv6 SIDs in an explicit way.

Add "explicit" option for configuration "sid vpn per-vrf export <(1..1048575)|auto|explicit X:X::X:X>".

By configuring sid vpn per-vrf export explicit X:X::X:X in the context of a Vrf (where X:X::X:X is the explicit SID value), BGP will request the explicit SID from Zebra and advertise it if the allocation in Zebra is successful.

mjstapp · 2025-03-27T13:14:32Z

there are a lot of code format issues - please run checkpatch and 'git-clang-format --diff' and take a look at the results, and fix the important things: alignment, extra whitespace, etc. clang will try to extend lines to 100, and that's not required, but there appear to be lines >100, and those must be fixed. clang also does some terrible things to some manual alignments, as we often do for flag definitions and enums; it's not necessary to make clang's changes, but anything you change should fit what is already present.

mjstapp · 2025-03-27T13:16:01Z

zebra/zapi_msg.c

+	struct zserv *client;
+
+	frr_each (zserv_client_list, &zrouter.client_list, client) {
+		zsend_srv6_static_sid_update_internal(client);


no, we can't blindly send zapi messages to every daemon, when only one (?) is interested.

The modifications here are implemented in line with the logic of sending notifications to various daemons after locator configuration:

void zebra_srv6_locator_add(struct srv6_locator *locator) { struct zebra_srv6 *srv6 = zebra_srv6_get_default(); struct srv6_locator *tmp; struct zserv *client; tmp = zebra_srv6_locator_lookup(locator->name); if (!tmp) listnode_add(srv6->locators, locator); /* * Notify new locator info to zclients. * * The srv6 locators and their prefixes are managed by zserv(zebra). * And an actual configuration the srv6 sid in the srv6 locator is done * by zclient(bgpd, isisd, etc). The configuration of each locator * allocation and specify it by zserv and zclient should be * asynchronous. For that, zclient should be received the event via * ZAPI when a srv6 locator is added on zebra. * Basically, in SRv6, adding/removing SRv6 locators is performed less * frequently than adding rib entries, so a broad to all zclients will * not degrade the overall performance of FRRouting. */ frr_each (zserv_client_list, &zrouter.client_list, client) { zsend_zebra_srv6_locator_add(client, locator); } }

Currently, there is no subscription-like record variable or operation in the srv6_locator and srv6_sid data structures for the daemons which use the msg, and the configuration frequency of srv6 static sids is similarly low as that of srv6 locators. From my current perspective, it might be considered a better choice to send the msg to daemons in a loop, rather than hard-coding it to send to the BGP.

Hi @cscarpitta, I'm not sure if my understanding is correct. If it's not, could you please help explain a bit?

GaladrielZhao · 2025-04-01T01:37:09Z

there are a lot of code format issues - please run checkpatch and 'git-clang-format --diff' and take a look at the results, and fix the important things: alignment, extra whitespace, etc. clang will try to extend lines to 100, and that's not required, but there appear to be lines >100, and those must be fixed. clang also does some terrible things to some manual alignments, as we often do for flag definitions and enums; it's not necessary to make clang's changes, but anything you change should fit what is already present.

@mjstapp Thanks. I have fixed all format errors in my modifications that can be changed. I did not apply the fixing patch to the codes that were already merged previously. Additionally, some of the format suggestions are viewed as errors by "checkout code" part in CI, so I did not change those either. If there are further code updates, I will promptly make adjustments based on the results from frrbot and checkout code.

github-actions · 2025-04-09T09:57:41Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Add support for bgp to use explicit SRv6 SID. Use configuration "sid vpn per-vrf export explicit X:X::X:X" in vrf context to request the explicit SID from Zebra. If SRv6 SID manager allocates the explicit SID successfully, then BGP will advertise it. Signed-off-by: Yuqing Zhao <[email protected]>

Signed-off-by: Yuqing Zhao <[email protected]>

ahsalam

LGTM. Many thanks for updating the design. The new design is good and solve the issue of the notification from Zebra to the daemons.

zice312963205

LGTM

Add BGP explicit SID configuration in bgp.rst. Signed-off-by: Yuqing Zhao <[email protected]>

GaladrielZhao · 2025-05-13T09:33:54Z

ci:rerun

cscarpitta

LGTM

…n tests (#19206) Summary: Update sid_vpn_per_vrf_export_explicit config for srv6 tests according to the latest modification in FRR. FRR adds "explicit" option for configuration "sid vpn per-vrf export <(1..1048575)|auto|explicit X:X::X:X>" to use SRv6 SIDs in an explicit way. Frrcfgd has been updated to support new config way. FRR PR: FRRouting/frr#18519 frrcfgd PR: sonic-net/sonic-buildimage#23107 Signed-off-by: 红蔻 <[email protected]>

…n tests (sonic-net#19206) Summary: Update sid_vpn_per_vrf_export_explicit config for srv6 tests according to the latest modification in FRR. FRR adds "explicit" option for configuration "sid vpn per-vrf export <(1..1048575)|auto|explicit X:X::X:X>" to use SRv6 SIDs in an explicit way. Frrcfgd has been updated to support new config way. FRR PR: FRRouting/frr#18519 frrcfgd PR: sonic-net/sonic-buildimage#23107 Signed-off-by: 红蔻 <[email protected]>

Port the following fixes from FRR mainline: - zebra: Add CLI to display SRv6 SIDs allocated (FRRouting/frr#16836) - bgpd: add usid behavior for bgp srv6 instructions (FRRouting/frr#18611) - bgpd: Implement Link-Local Next Hop capability (FRRouting/frr#17871) - Add BGP redistribution in SRv6 BGP (FRRouting/frr#18396) - bgpd: Add support for BGP to use SRv6 SID in an explicit way (FRRouting/frr#18519) - lib, staticd, isisd: add B6.ENCAPS codepoint extensions (FRRouting/frr#18597) - zebra: Provide SID value when sending SRv6 SID release notify message (FRRouting/frr#18971) - zebra: Cleanup SRv6 output of show running-config (FRRouting/frr#18970) - zebra: Free up tt when failure mode happens (FRRouting/frr@0521673) - SRv6: Add support for multiple SRv6 locators (FRRouting/frr#18806) Signed-off-by: Carmine Scarpitta <[email protected]>

…n tests (sonic-net#19206) Summary: Update sid_vpn_per_vrf_export_explicit config for srv6 tests according to the latest modification in FRR. FRR adds "explicit" option for configuration "sid vpn per-vrf export <(1..1048575)|auto|explicit X:X::X:X>" to use SRv6 SIDs in an explicit way. Frrcfgd has been updated to support new config way. FRR PR: FRRouting/frr#18519 frrcfgd PR: sonic-net/sonic-buildimage#23107 Signed-off-by: 红蔻 <[email protected]>

Port the following fixes from FRR mainline: - zebra: Add CLI to display SRv6 SIDs allocated (FRRouting/frr#16836) - bgpd: add usid behavior for bgp srv6 instructions (FRRouting/frr#18611) - bgpd: Implement Link-Local Next Hop capability (FRRouting/frr#17871) - Add BGP redistribution in SRv6 BGP (FRRouting/frr#18396) - bgpd: Add support for BGP to use SRv6 SID in an explicit way (FRRouting/frr#18519) - lib, staticd, isisd: add B6.ENCAPS codepoint extensions (FRRouting/frr#18597) - zebra: Provide SID value when sending SRv6 SID release notify message (FRRouting/frr#18971) - zebra: Cleanup SRv6 output of show running-config (FRRouting/frr#18970) - zebra: Free up tt when failure mode happens (FRRouting/frr@0521673) - SRv6: Add support for multiple SRv6 locators (FRRouting/frr#18806) - zebra: Fix SRv6 explicit SID allocation to use the provided locator (FRRouting/frr@a9044d2) Signed-off-by: Carmine Scarpitta <[email protected]>

…n tests (sonic-net#19206) Summary: Update sid_vpn_per_vrf_export_explicit config for srv6 tests according to the latest modification in FRR. FRR adds "explicit" option for configuration "sid vpn per-vrf export <(1..1048575)|auto|explicit X:X::X:X>" to use SRv6 SIDs in an explicit way. Frrcfgd has been updated to support new config way. FRR PR: FRRouting/frr#18519 frrcfgd PR: sonic-net/sonic-buildimage#23107 Signed-off-by: 红蔻 <[email protected]>

…n tests (sonic-net#19206) Summary: Update sid_vpn_per_vrf_export_explicit config for srv6 tests according to the latest modification in FRR. FRR adds "explicit" option for configuration "sid vpn per-vrf export <(1..1048575)|auto|explicit X:X::X:X>" to use SRv6 SIDs in an explicit way. Frrcfgd has been updated to support new config way. FRR PR: FRRouting/frr#18519 frrcfgd PR: sonic-net/sonic-buildimage#23107 Signed-off-by: 红蔻 <[email protected]> Signed-off-by: Guy Shemesh <[email protected]>

…n tests (sonic-net#19206) Summary: Update sid_vpn_per_vrf_export_explicit config for srv6 tests according to the latest modification in FRR. FRR adds "explicit" option for configuration "sid vpn per-vrf export <(1..1048575)|auto|explicit X:X::X:X>" to use SRv6 SIDs in an explicit way. Frrcfgd has been updated to support new config way. FRR PR: FRRouting/frr#18519 frrcfgd PR: sonic-net/sonic-buildimage#23107 Signed-off-by: 红蔻 <[email protected]> Signed-off-by: Aharon Malkin <[email protected]>

…n tests (sonic-net#19206) Summary: Update sid_vpn_per_vrf_export_explicit config for srv6 tests according to the latest modification in FRR. FRR adds "explicit" option for configuration "sid vpn per-vrf export <(1..1048575)|auto|explicit X:X::X:X>" to use SRv6 SIDs in an explicit way. Frrcfgd has been updated to support new config way. FRR PR: FRRouting/frr#18519 frrcfgd PR: sonic-net/sonic-buildimage#23107 Signed-off-by: 红蔻 <[email protected]> Signed-off-by: Guy Shemesh <[email protected]>

…n tests (sonic-net#19206) Summary: Update sid_vpn_per_vrf_export_explicit config for srv6 tests according to the latest modification in FRR. FRR adds "explicit" option for configuration "sid vpn per-vrf export <(1..1048575)|auto|explicit X:X::X:X>" to use SRv6 SIDs in an explicit way. Frrcfgd has been updated to support new config way. FRR PR: FRRouting/frr#18519 frrcfgd PR: sonic-net/sonic-buildimage#23107 Signed-off-by: 红蔻 <[email protected]>

frrbot bot added bgp bugfix libfrr tests Topotests, make check, etc zebra labels Mar 27, 2025

github-actions bot added size/XXL master labels Mar 27, 2025

GaladrielZhao force-pushed the bgp_srv6_sid_explicit branch 2 times, most recently from 3b589de to 8e9ed78 Compare March 27, 2025 06:57

mjstapp reviewed Mar 27, 2025

View reviewed changes

GaladrielZhao force-pushed the bgp_srv6_sid_explicit branch 7 times, most recently from 8ede9e4 to 7abcdd8 Compare March 31, 2025 09:46

riw777 self-requested a review April 1, 2025 15:36

GaladrielZhao force-pushed the bgp_srv6_sid_explicit branch 2 times, most recently from 1a915ef to 5362b3a Compare April 2, 2025 14:01

github-actions bot added the conflicts label Apr 9, 2025

GaladrielZhao force-pushed the bgp_srv6_sid_explicit branch from 5362b3a to 18a05ba Compare April 23, 2025 06:18

github-actions bot removed the conflicts label Apr 23, 2025

GaladrielZhao force-pushed the bgp_srv6_sid_explicit branch 4 times, most recently from 68df460 to 8701761 Compare May 13, 2025 04:32

GaladrielZhao force-pushed the bgp_srv6_sid_explicit branch from 8701761 to 123a83d Compare May 13, 2025 05:46

frrbot bot added the documentation label May 13, 2025

GaladrielZhao added 2 commits May 13, 2025 06:44

tests: Add topotest for BGP explicit SRv6 SID

0bfb292

Signed-off-by: Yuqing Zhao <[email protected]>

GaladrielZhao force-pushed the bgp_srv6_sid_explicit branch from 937b6e9 to bd013ed Compare May 13, 2025 06:57

GaladrielZhao changed the title ~~bgpd: Add support for bgp to use SRv6 SID in an explicit way~~ bgpd: Add support for BGP to use SRv6 SID in an explicit way May 13, 2025

ahsalam approved these changes May 13, 2025

View reviewed changes

zice312963205 approved these changes May 13, 2025

View reviewed changes

doc: Add support for BGP explicit SRv6 SID CLI

a9c8e72

Add BGP explicit SID configuration in bgp.rst. Signed-off-by: Yuqing Zhao <[email protected]>

GaladrielZhao force-pushed the bgp_srv6_sid_explicit branch from bd013ed to a9c8e72 Compare May 13, 2025 08:07

cscarpitta approved these changes May 13, 2025

View reviewed changes

cscarpitta merged commit 7774f47 into FRRouting:master May 13, 2025
13 checks passed

This was referenced Jun 26, 2025

feat(frrcfgd): update load of bgp sid vpn per-vrf export explicit config sonic-net/sonic-buildimage#23107

Merged

test(srv6): Update sid_vpn_per_vrf_export_explicit config for srv6 vp… sonic-net/sonic-mgmt#19206

Merged

cscarpitta mentioned this pull request Oct 21, 2025

[FRR]: Port fixes from FRR mainline sonic-net/sonic-buildimage#24308

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

bgpd: Add support for BGP to use SRv6 SID in an explicit way #18519

bgpd: Add support for BGP to use SRv6 SID in an explicit way #18519

Uh oh!

GaladrielZhao commented Mar 27, 2025 •

edited

Loading

Uh oh!

mjstapp commented Mar 27, 2025

Uh oh!

mjstapp Mar 27, 2025

Uh oh!

GaladrielZhao Apr 1, 2025

Uh oh!

GaladrielZhao commented Apr 1, 2025

Uh oh!

github-actions bot commented Apr 9, 2025

Uh oh!

ahsalam left a comment

Uh oh!

zice312963205 left a comment

Uh oh!

GaladrielZhao commented May 13, 2025

Uh oh!

cscarpitta left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

bgpd: Add support for BGP to use SRv6 SID in an explicit way #18519

bgpd: Add support for BGP to use SRv6 SID in an explicit way #18519

Uh oh!

Conversation

GaladrielZhao commented Mar 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mjstapp commented Mar 27, 2025

Uh oh!

mjstapp Mar 27, 2025

Choose a reason for hiding this comment

Uh oh!

GaladrielZhao Apr 1, 2025

Choose a reason for hiding this comment

Uh oh!

GaladrielZhao commented Apr 1, 2025

Uh oh!

github-actions bot commented Apr 9, 2025

Uh oh!

ahsalam left a comment

Choose a reason for hiding this comment

Uh oh!

zice312963205 left a comment

Choose a reason for hiding this comment

Uh oh!

GaladrielZhao commented May 13, 2025

Uh oh!

cscarpitta left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

GaladrielZhao commented Mar 27, 2025 •

edited

Loading