[SRv6] add MySID counters support by Yakiv-Huryk · Pull Request #3601 · sonic-net/sonic-swss

Yakiv-Huryk · 2025-04-09T15:28:25Z

What I did
Extended srv6orch to support SRv6 MySID counters (utilizing flex counter infrastructure)

Why I did it
To support SRv6 MySID counters

How I verified it
New test in test_flex_counters.py

Details if related

mssonicbld · 2025-04-09T15:28:34Z

/azp run

azure-pipelines · 2025-04-09T15:28:44Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-04-09T15:45:29Z

/azp run

azure-pipelines · 2025-04-09T15:45:39Z

Azure Pipelines successfully started running 1 pipeline(s).

Yakiv-Huryk · 2025-04-09T15:46:28Z

Depends on: sonic-net/sonic-swss-common#1005

BYGX-wcr · 2025-04-09T22:08:31Z

orchagent/srv6orch.cpp

+    return IpAddress(ip_addr);
+}
+
+string Srv6Orch::getMySidCounterKey(const sai_my_sid_entry_t& sai_entry) const


The MY_SID entry in SAI already has block_len/node_len/func_len, why do we need to collect them from locator_cfg?

That's correct. This is the getMySidEntryLocatorCfg():

sonic-swss/orchagent/srv6orch.cpp

Lines 92 to 100 in 492a85a

MySidLocatorCfg Srv6Orch::getMySidEntryLocatorCfg(const sai_my_sid_entry_t& sai_entry) const

{

return {

sai_entry.locator_block_len,

sai_entry.locator_node_len,

sai_entry.function_len,

sai_entry.args_len,

};

}

BYGX-wcr

LGTM

mssonicbld · 2025-04-11T22:12:44Z

/azp run

azure-pipelines · 2025-04-11T22:12:53Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-04-29T17:43:57Z

/azp run

azure-pipelines · 2025-04-29T17:44:07Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-04-30T14:28:34Z

/azp run

azure-pipelines · 2025-04-30T14:28:44Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-05-06T02:18:53Z

/azp run

azure-pipelines · 2025-05-06T02:19:03Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-05-06T10:15:27Z

/azp run

azure-pipelines · 2025-05-06T10:15:38Z

Azure Pipelines successfully started running 1 pipeline(s).

Copilot

Pull Request Overview

This pull request extends the SRv6 orchestration functionality to support MySID counters using the flex counter infrastructure. Key changes include new test functions for MySID counters in tests/test_flex_counters.py, added methods and members in Srv6Orch to manage MySID counters in orchagent/srv6orch.{h,cpp}, and updates to flex counter mappings in orchagent/flexcounterorch.cpp and related flex counter manager files.

Reviewed Changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
tests/test_flex_counters.py	Added pre/post test functions for SRv6 MySID counters
orchagent/srv6orch.h	Introduced new method prototypes and a counter member for MySID entries
orchagent/srv6orch.cpp	Implemented MySID counter functions, timer-based updates, and counter state management
orchagent/flexcounterorch.cpp	Updated counter mapping to include SRv6 and trigger SRv6 counter state changes
orchagent/flex_counter/flex_counter_manager.h	Added SRV6 as a new counter type
orchagent/flex_counter/flex_counter_manager.cpp	Mapped the new SRV6 counter type to its corresponding counter ID list macro

Copilot · 2025-05-11T20:07:51Z

orchagent/srv6orch.cpp

+    initializeCounters();
+}
+
+Srv6Orch::~Srv6Orch()


Consider freeing m_counter_update_timer (allocated on line 138) in the destructor to prevent a potential memory leak. Alternatively, using a smart pointer for managing the timer could improve resource management.

mssonicbld · 2025-05-30T11:59:42Z

/azp run

azure-pipelines · 2025-05-30T11:59:52Z

Azure Pipelines successfully started running 1 pipeline(s).

* query SAI capability to check if SRv6 MySID counter is supported * support for SRv6 MySID counter utilizing flex counter infrastructure * extend vs test test_flex_counters.py

Signed-off-by: Yakiv Huryk <yhuryk@nvidia.com>

mssonicbld · 2025-06-05T10:16:48Z

/azp run

azure-pipelines · 2025-06-05T10:16:57Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-06-05T20:55:10Z

Cherry-pick PR to msft-202412:

mssonicbld · 2025-06-06T06:21:37Z

Cherry-pick PR to 202505: #3684

* SRv6: add MySID counters support What I did Extended srv6orch to support SRv6 MySID counters (utilizing flex counter infrastructure) Why I did it To support SRv6 MySID counters

* SRv6: add MySID counters support What I did Extended srv6orch to support SRv6 MySID counters (utilizing flex counter infrastructure) Why I did it To support SRv6 MySID counters Signed-off-by: Baorong Liu <96146196+baorliu@users.noreply.github.com>

Yakiv-Huryk requested a review from prsunny as a code owner April 9, 2025 15:28

Yakiv-Huryk changed the title ~~SRv6: add MySID counters support~~ [SRv6] add MySID counters support Apr 9, 2025

Yakiv-Huryk mentioned this pull request Apr 9, 2025

SRv6: add MySID counters sonic-net/SONiC#1959

Merged

Yakiv-Huryk force-pushed the SRv6_counters branch from 2d627a5 to 97d4101 Compare April 9, 2025 15:45

Yakiv-Huryk requested review from BYGX-wcr and stephenxs April 9, 2025 17:08

BYGX-wcr reviewed Apr 9, 2025

View reviewed changes

stephenxs approved these changes Apr 9, 2025

View reviewed changes

BYGX-wcr approved these changes Apr 10, 2025

View reviewed changes

dgsudharsan added the Request for msft-202412 Branch label Apr 14, 2025

echuawu mentioned this pull request Apr 29, 2025

SRv6 dataplane test for counter and crm and 128 my sids sonic-net/sonic-mgmt#18173

Closed

11 tasks

Yakiv-Huryk force-pushed the SRv6_counters branch from 21204e2 to d88f23b Compare April 29, 2025 17:43

Yakiv-Huryk force-pushed the SRv6_counters branch from d88f23b to 573de80 Compare April 30, 2025 14:28

zhangyanzhao requested a review from Copilot May 11, 2025 20:07

Copilot AI reviewed May 11, 2025

View reviewed changes

Yakiv-Huryk force-pushed the SRv6_counters branch from 748b2f8 to 94656ae Compare May 30, 2025 11:58

mssonicbld added the Cherry Pick Conflict_msft-202412 label May 30, 2025

Yakiv-Huryk force-pushed the SRv6_counters branch from 94656ae to e5d283f Compare June 3, 2025 14:21

echuawu mentioned this pull request Jun 3, 2025

Add 128 SRv6 sids support sonic-net/sonic-mgmt#18775

Merged

11 tasks

Yakiv-Huryk force-pushed the SRv6_counters branch from e5d283f to 762a9bd Compare June 4, 2025 09:15

Yakiv-Huryk added 2 commits June 5, 2025 13:15

SRv6: add MySID counters support

302abe3

* query SAI capability to check if SRv6 MySID counter is supported * support for SRv6 MySID counter utilizing flex counter infrastructure * extend vs test test_flex_counters.py

SRv6: increase log level for the counters state update

0768615

Signed-off-by: Yakiv Huryk <yhuryk@nvidia.com>

Yakiv-Huryk force-pushed the SRv6_counters branch from 762a9bd to 0768615 Compare June 5, 2025 10:15

dgsudharsan approved these changes Jun 5, 2025

View reviewed changes

prsunny merged commit f05e8e9 into sonic-net:master Jun 5, 2025
14 of 15 checks passed

mssonicbld added the Created PR to msft-202412 Branch label Jun 5, 2025

liushilongbuaa added Approved for msft-202412 Branch and removed Approved for msft-202412 Branch labels Jun 6, 2025

yejianquan added the Approved for 202505 Branch label Jun 6, 2025

mssonicbld mentioned this pull request Jun 6, 2025

[action] [PR:3601] [SRv6] add MySID counters support #3684

Merged

mssonicbld added the Created PR to 202505 Branch label Jun 6, 2025

liushilongbuaa removed the Created PR to msft-202412 Branch label Jun 6, 2025

mssonicbld added Included in 202505 Branch and removed Created PR to 202505 Branch labels Jun 6, 2025

mssonicbld mentioned this pull request Jun 12, 2025

[action] [PR:18775] Add 128 SRv6 sids support sonic-net/sonic-mgmt#18945

Merged

11 tasks

	MySidLocatorCfg Srv6Orch::getMySidEntryLocatorCfg(const sai_my_sid_entry_t& sai_entry) const
	{
	return {
	sai_entry.locator_block_len,
	sai_entry.locator_node_len,
	sai_entry.function_len,
	sai_entry.args_len,
	};
	}

Conversation

Yakiv-Huryk commented Apr 9, 2025

Uh oh!

mssonicbld commented Apr 9, 2025

Uh oh!

azure-pipelines bot commented Apr 9, 2025

Uh oh!

mssonicbld commented Apr 9, 2025

Uh oh!

azure-pipelines bot commented Apr 9, 2025

Uh oh!

Yakiv-Huryk commented Apr 9, 2025

Uh oh!

BYGX-wcr Apr 9, 2025

Choose a reason for hiding this comment

Uh oh!

Yakiv-Huryk Apr 10, 2025

Choose a reason for hiding this comment

Uh oh!

BYGX-wcr left a comment

Choose a reason for hiding this comment

Uh oh!

mssonicbld commented Apr 11, 2025

Uh oh!

azure-pipelines bot commented Apr 11, 2025

Uh oh!

mssonicbld commented Apr 29, 2025

Uh oh!

azure-pipelines bot commented Apr 29, 2025

Uh oh!

mssonicbld commented Apr 30, 2025

Uh oh!

azure-pipelines bot commented Apr 30, 2025

Uh oh!

mssonicbld commented May 6, 2025

Uh oh!

azure-pipelines bot commented May 6, 2025

Uh oh!

mssonicbld commented May 6, 2025

Uh oh!

azure-pipelines bot commented May 6, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI May 11, 2025

Choose a reason for hiding this comment

Uh oh!

mssonicbld commented May 30, 2025

Uh oh!

azure-pipelines bot commented May 30, 2025

Uh oh!

mssonicbld commented Jun 5, 2025

Uh oh!

azure-pipelines bot commented Jun 5, 2025

Uh oh!

Uh oh!

mssonicbld commented Jun 5, 2025

Uh oh!

mssonicbld commented Jun 6, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants