[fpmsyncd]: Add support for SRv6 #3123

cscarpitta · 2024-04-24T17:30:26Z

What I did

Extended fpmsyncd to process Netlink TLVs containing SRv6 information (SRv6 local SIDs and routes).

Why I did it

fpmsyncd did not process Netlink TLVs containing SRv6 information (SRv6 local SIDs and routes).

How I verified it

This PR implements new set of test cases for SRv6 test_srv6.py
The sonic-mgmt tests for SRv6 are added in this PR: sonic-net/sonic-mgmt#15510

cscarpitta · 2024-05-30T10:40:52Z

/azpw run Azure.sonic-swss

mssonicbld · 2024-05-30T10:40:55Z

/AzurePipelines run Azure.sonic-swss

azure-pipelines · 2024-05-30T10:41:04Z

Azure Pipelines successfully started running 1 pipeline(s).

eddieruan-alibaba · 2024-10-03T18:47:16Z

@cscarpitta can you rebase it to fix the compile issue? sonic-net/sonic-buildimage#18715 is merged.

eddieruan-alibaba · 2024-10-03T18:48:06Z

This change has been cherry-picked into phoenix wing and used in daily run.

http://phoenixwing.com.cn/build

kperumalbfn · 2024-05-02T16:57:06Z

fpmsyncd/routesync.cpp

+#define NH_ENCAP_SRV6_ROUTE         101
+
+#define RTM_NEWSRV6LOCALSID		1000
+#define RTM_DELSRV6LOCALSID		1001


These constants are defined in fpmlink.h, do we need it here? Pls remove if not needed.

Indeed these constants are not needed here. I removed them.

kperumalbfn · 2024-05-02T16:59:25Z

fpmsyncd/routesync.cpp

@@ -81,6 +145,8 @@ RouteSync::RouteSync(RedisPipeline *pipeline) :
    m_vnet_routeTable(pipeline, APP_VNET_RT_TABLE_NAME, true),
    m_vnet_tunnelTable(pipeline, APP_VNET_RT_TUNNEL_TABLE_NAME, true),
    m_warmStartHelper(pipeline, &m_routeTable, APP_ROUTE_TABLE_NAME, "bgp", "bgp"),
+    m_srv6LocalSidTable(pipeline, APP_SRV6_MY_SID_TABLE_NAME, true),


minor: could we change the table name to mysidTable. I think we changed most of the reference of localSid to MySid.

Thanks for the comment. I changed localSid -> mySid everywhere in the code.

kperumalbfn · 2024-05-03T00:10:32Z

fpmsyncd/routesync.cpp

+
+        if (vpn_sid.empty())
+        {
+            return false;


Error logs for debugging?

Added an error message:
SWSS_LOG_ERROR("Received an invalid SRv6 route: vpn_sid is empty");

Thanks.

AlanYoush · 2024-10-14T01:17:44Z

@cscarpitta
Hi cscarpitta
I find that there is another PR: #2515 and it is also uesd to support SRv6. What is the difference between them both?
And I want to use srv6 feature in SONiC-202311, so I should merge SRv6 PR code into SONiC-202311, and which PR Code should I merge ?
Thanks.

ahsalam

This changes are needed for programming SRv6 from FRR.

kperumalbfn · 2024-11-07T19:42:01Z

tests/test_srv6.py

+        dvs.runcmd("vtysh -c \"configure terminal\" -c \"segment-routing\" -c \"srv6\" -c \"locators\" -c \"locator loc1\" -c \"prefix fc00:0:2::/48 block-len 32 node-len 16 func-bits 16\" -c \"behavior usid\"")
+
+        # create srv6 mysid udt4 behavior
+        dvs.runcmd("ip -6 route add fc00:0:2:ff05::/128 encap seg6local action End.DT4 vrftable {} dev sr0".format(self.vrf_table_id))


@cscarpitta To support TUNNEL DSCP/TTL mode MY_SID object has tunnel_id. Currently, there is no orchagent support for this. But how do we add this in FRR/Fpmsyncd?

Hi @kperumalbfn To support the DSCP/TTL, we can extend FRR to provide these parameters to fpmsyncd and extend orchagent to process them

kperumalbfn · 2024-11-11T19:38:59Z

fpmsyncd/routesync.cpp

+	SRV6_LOCALSID_ACTION_END				= 1,
+	SRV6_LOCALSID_ACTION_END_X				= 2,
+	SRV6_LOCALSID_ACTION_END_T				= 3,
+	SRV6_LOCALSID_ACTION_END_DX2			= 4,


Current SAI doesn't support L2 XConnect, does FRR support this?

No, currently FRR does not support L2 XConnect.

kperumalbfn · 2024-11-11T19:41:36Z

fpmsyncd/routesync.cpp

+        if (!parseSrv6MySidFormat(tb[SRV6_LOCALSID_FORMAT], block_len,
+                                node_len, func_len, arg_len))
+        {
+            SWSS_LOG_ERROR("Invalid Srv6 MySid format");


could you add details about node/block/function in the error log message

Added. Thanks for the comment.

kperumalbfn · 2024-11-11T19:42:45Z

fpmsyncd/routesync.cpp

+               strlen((char *)RTA_DATA(tb[SRV6_LOCALSID_VRFNAME])));
+    }
+
+    action = mySidAction2Str(action_buf);


unknown action, return false?

Done. Thanks for the comment.

eddieruan-alibaba · 2024-11-13T00:45:03Z

@cscarpitta can you rebase your branch ? "This branch is out-of-date with the base branch"

cscarpitta · 2024-11-13T07:52:13Z

@cscarpitta can you rebase your branch ? "This branch is out-of-date with the base branch"

Done.

cscarpitta · 2024-11-13T10:14:35Z

/azpw run

mssonicbld · 2024-11-13T10:14:38Z

/AzurePipelines run

azure-pipelines · 2024-11-13T10:14:49Z

Azure Pipelines successfully started running 1 pipeline(s).

cscarpitta · 2024-11-13T15:24:20Z

/azpw run

mssonicbld · 2024-11-13T15:24:23Z

/AzurePipelines run

azure-pipelines · 2024-11-13T15:24:35Z

Azure Pipelines successfully started running 1 pipeline(s).

kperumalbfn

@cscarpitta please include sonic-mgmt test PR(sonic-net/sonic-mgmt#15510) in the description.

kperumalbfn · 2024-11-13T17:13:38Z

Changes LGTM

cscarpitta · 2024-11-13T17:26:25Z

@cscarpitta please include sonic-mgmt test PR(sonic-net/sonic-mgmt#15510) in the description.

@kperumalbfn Thanks for the review. I updated the PR description.

* Extend fpmsyncd to process SRv6 routes and local SIDs received from FRR * Add test cases to verify SRv6 functionality Signed-off-by: Carmine Scarpitta <[email protected]>

Signed-off-by: Carmine Scarpitta <[email protected]>

* [fpmsyncd]: Add support for SRv6 What I did Extended fpmsyncd to process Netlink TLVs containing SRv6 information (SRv6 local SIDs and routes). Extend fpmsyncd to process SRv6 routes and local SIDs received from FRR Add test cases to verify SRv6 functionality Why I did it fpmsyncd did not process Netlink TLVs containing SRv6 information (SRv6 local SIDs and routes).

cscarpitta requested a review from prsunny as a code owner April 24, 2024 17:30

cscarpitta mentioned this pull request Apr 24, 2024

Add HLD for FRR-SONiC Communication Channel Enhancements sonic-net/SONiC#1620

Merged

cscarpitta closed this Apr 25, 2024

cscarpitta deleted the dplane_fpm_sonic branch April 25, 2024 16:46

cscarpitta restored the dplane_fpm_sonic branch April 25, 2024 17:07

cscarpitta reopened this Apr 25, 2024

cscarpitta force-pushed the dplane_fpm_sonic branch from 962e839 to 13cfd44 Compare April 25, 2024 17:09

prsunny requested a review from kperumalbfn April 29, 2024 17:35

cscarpitta force-pushed the dplane_fpm_sonic branch from 13cfd44 to 525d2e2 Compare May 16, 2024 22:51

cscarpitta force-pushed the dplane_fpm_sonic branch from 525d2e2 to 98225dc Compare May 28, 2024 19:50

cscarpitta force-pushed the dplane_fpm_sonic branch 3 times, most recently from faf75e9 to 171fbfb Compare September 21, 2024 11:57

eddieruan-alibaba approved these changes Oct 3, 2024

View reviewed changes

kperumalbfn reviewed Oct 3, 2024

View reviewed changes

cscarpitta force-pushed the dplane_fpm_sonic branch 3 times, most recently from a1671dc to b0c2f60 Compare October 6, 2024 13:05

cscarpitta force-pushed the dplane_fpm_sonic branch from b0c2f60 to 7954e2e Compare October 23, 2024 07:08

ahsalam approved these changes Oct 23, 2024

View reviewed changes

cscarpitta mentioned this pull request Oct 23, 2024

[fpmsyncd] Add support for SRv6 #2515

Closed

cscarpitta force-pushed the dplane_fpm_sonic branch 3 times, most recently from ed29566 to 9df0769 Compare October 24, 2024 06:42

cscarpitta force-pushed the dplane_fpm_sonic branch from 07405df to 6f04b16 Compare November 7, 2024 15:01

kperumalbfn reviewed Nov 7, 2024

View reviewed changes

cscarpitta force-pushed the dplane_fpm_sonic branch from 6f04b16 to 2192b36 Compare November 9, 2024 08:34

kperumalbfn reviewed Nov 11, 2024

View reviewed changes

cscarpitta force-pushed the dplane_fpm_sonic branch 2 times, most recently from d624557 to d9f662c Compare November 12, 2024 08:44

cscarpitta force-pushed the dplane_fpm_sonic branch from d9f662c to 9928298 Compare November 13, 2024 07:51

kperumalbfn reviewed Nov 13, 2024

View reviewed changes

kperumalbfn approved these changes Nov 13, 2024

View reviewed changes

cscarpitta added 3 commits November 15, 2024 17:26

[fpmsyncd]: Add support for SRv6

2f3d9de

* Extend fpmsyncd to process SRv6 routes and local SIDs received from FRR * Add test cases to verify SRv6 functionality Signed-off-by: Carmine Scarpitta <[email protected]>

[fpmsyncd]: Add test cases to verify SRv6 functionality

39de6a6

Signed-off-by: Carmine Scarpitta <[email protected]>

[srv6orch]: Fix refcount check

853df15

Signed-off-by: Carmine Scarpitta <[email protected]>

cscarpitta force-pushed the dplane_fpm_sonic branch from 9928298 to 853df15 Compare November 15, 2024 16:26

prsunny merged commit 2e2d4e5 into sonic-net:master Nov 15, 2024
17 checks passed

shuaishang mentioned this pull request Dec 2, 2024

[SRv6] swss vs test case TestSrv6VpnFpmsyncd failed #3407

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[fpmsyncd]: Add support for SRv6 #3123

[fpmsyncd]: Add support for SRv6 #3123

cscarpitta commented Apr 24, 2024 •

edited

Loading

cscarpitta commented May 30, 2024

mssonicbld commented May 30, 2024

azure-pipelines bot commented May 30, 2024

eddieruan-alibaba commented Oct 3, 2024

eddieruan-alibaba commented Oct 3, 2024

kperumalbfn May 2, 2024

cscarpitta Oct 23, 2024

kperumalbfn May 2, 2024

cscarpitta Oct 23, 2024

kperumalbfn May 3, 2024

cscarpitta Oct 23, 2024

AlanYoush commented Oct 14, 2024

ahsalam left a comment

kperumalbfn Nov 7, 2024

cscarpitta Nov 7, 2024

kperumalbfn Nov 11, 2024

cscarpitta Nov 12, 2024

kperumalbfn Nov 11, 2024

cscarpitta Nov 12, 2024

kperumalbfn Nov 11, 2024

cscarpitta Nov 12, 2024

eddieruan-alibaba commented Nov 13, 2024

cscarpitta commented Nov 13, 2024

cscarpitta commented Nov 13, 2024

mssonicbld commented Nov 13, 2024

azure-pipelines bot commented Nov 13, 2024

cscarpitta commented Nov 13, 2024

mssonicbld commented Nov 13, 2024

azure-pipelines bot commented Nov 13, 2024

kperumalbfn left a comment

kperumalbfn commented Nov 13, 2024

cscarpitta commented Nov 13, 2024

[fpmsyncd]: Add support for SRv6 #3123

[fpmsyncd]: Add support for SRv6 #3123

Conversation

cscarpitta commented Apr 24, 2024 • edited Loading

cscarpitta commented May 30, 2024

mssonicbld commented May 30, 2024

azure-pipelines bot commented May 30, 2024

eddieruan-alibaba commented Oct 3, 2024

eddieruan-alibaba commented Oct 3, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AlanYoush commented Oct 14, 2024

ahsalam left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eddieruan-alibaba commented Nov 13, 2024

cscarpitta commented Nov 13, 2024

cscarpitta commented Nov 13, 2024

mssonicbld commented Nov 13, 2024

azure-pipelines bot commented Nov 13, 2024

cscarpitta commented Nov 13, 2024

mssonicbld commented Nov 13, 2024

azure-pipelines bot commented Nov 13, 2024

kperumalbfn left a comment

Choose a reason for hiding this comment

kperumalbfn commented Nov 13, 2024

cscarpitta commented Nov 13, 2024

cscarpitta commented Apr 24, 2024 •

edited

Loading