[202605] Smart Counter Poll to allow counters to work properly on Broadcom platforms. by justin-wong-ce · Pull Request #1956 · sonic-net/sonic-sairedis

justin-wong-ce · 2026-06-25T18:16:28Z

Description of PR

Summary:
This is change is to address #1753 and to implement the HLD logic in sonic-net/SONiC#2190 to 202605.

Currently, the code assumes all ports support the same counter capabilities. This causes issues on most Broadcom platform switches as there are different types of ports on a switch that does not support the same set of counters.

Fix this issue by dynamically discovering what each interface is capable of during initialization of syncd.

For more details, please refer to the referenced issue and HLD.
Fixes #1753

Type of change

Approach

What is the motivation for this PR?

Counters are not working on management ports on Broadcom platforms.

Work item tracking

Microsoft ADO (number only):

How did you do it?

Implement the HLD logic from sonic-net/SONiC#2190.

How did you verify/test it?

Testing is done on both a Arista-7060X6-16PE-384C-B-O128S2 and Arista-7260CX3-D108C8 on 202511 with the tests:

sonic-mgmt/tests/dhcp_relay/test_dhcp_counter_stress.py
sonic-mgmt/tests/drop_packets/test_drop_counters.py
sonic-mgmt/tests/drop_packets/test_configurable_drop_counters.py
sonic-mgmt/tests/gnmi/test_gnmi_countersdb.py
sonic-mgmt/tests/snmp/test_snmp_queue_counters.py

A full sonic-mgmt test suite run has also been ran. There are no notable fallout compared to sonic-mgmt runs without this change. This is ran on both XGS and DNX Broadcom platforms.

Any platform specific information?

Broadcom platforms only.

Documentation

mssonicbld · 2026-06-25T18:16:36Z

/azp run

azure-pipelines · 2026-06-25T18:16:48Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-06-26T11:21:26Z

Hi, there are workflow run(s) waiting for approval, you may be first-time contributor. I will notify maintainers to help approve once PR is approved. Thanks!

_{---Powered by SONiC BuildBot}

Signed-off-by: Justin Wong <jvwong@arista.com>

mssonicbld · 2026-06-29T16:50:18Z

/azp run

azure-pipelines · 2026-06-29T16:50:30Z

Azure Pipelines successfully started running 1 pipeline(s).

justin-wong-ce · 2026-06-29T22:54:12Z

/azpw run

mssonicbld · 2026-06-29T22:54:15Z

⚠️ Notice: /azpw run only runs failed jobs now. If you want to trigger a whole pipline run, please rebase your branch or close and reopen the PR.
💡 Tip: You can also use /azpw retry to retry failed jobs directly.

Retrying failed(or canceled) jobs...

mssonicbld · 2026-06-29T22:54:17Z

Retrying failed(or canceled) stages in build 1152093:

✅Stage BuildTrixie:

Job amd64: retried.

### Description of PR  Summary: Casting workaround for N/A counters on management ports on Broadcom platforms. This impacts all hwsku-topo combos that uses management ports (including TH5). Casting from: Azure/sonic-sairedis.msft#69 Proper fix under review at: master: sonic-net#1774 202511: sonic-net#1862 202605: sonic-net#1956 Fixes sonic-net#1753 (temporary fix) ### Type of change  - [x] Bug fix - [ ] New feature - [ ] Refactor / cleanup - [ ] Documentation update - [ ] Test improvement ### Approach #### What is the motivation for this PR? To fix `N/A` counters on management ports on Broadcom platforms. ##### Work item tracking - Microsoft ADO **(number only)**: #### How did you do it? Temporarily fill in `0` values for counters that are supported in the usual interfaces but not supported in the management ports. #### How did you verify/test it? `show interface counters` no longer show `N/A` counters. #### Any platform specific information? Broadcom only. ### Documentation  Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>

### Description of PR  Summary: Casting workaround for N/A counters on management ports on Broadcom platforms. This impacts all hwsku-topo combos that uses management ports (including TH5). Casting from: Azure/sonic-sairedis.msft#69 Proper fix under review at: master: #1774 202511: #1862 202605: #1956 Fixes #1753 (temporary fix) ### Type of change  - [x] Bug fix - [ ] New feature - [ ] Refactor / cleanup - [ ] Documentation update - [ ] Test improvement ### Approach #### What is the motivation for this PR? To fix `N/A` counters on management ports on Broadcom platforms. ##### Work item tracking - Microsoft ADO **(number only)**: #### How did you do it? Temporarily fill in `0` values for counters that are supported in the usual interfaces but not supported in the management ports. #### How did you verify/test it? `show interface counters` no longer show `N/A` counters. #### Any platform specific information? Broadcom only. ### Documentation  Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>

List of changes made: - Added tracking of free indicies for reuse - Added m_failedPolls cleanup when object is removed - Improved m_failedPolls lookup logic to only use a single lookup - Added addGroup helper - Used const& refs for sets instead of copies where applicable - Removed getSortedCGRef() for to avoid performance impact from the SWSS_LOG_ENTER() requirement in functions - Better clarity by changing find() -> std::find() - Simplied erase-emplace logic by using built in [] operator logic - Normalized key check method when dealing with maps - Indentation fixes - Minor optimization when iterating through counter groups in setupBaseCounterGroup() - Added warning comments on parts of code where more care is required (consuming of const refs) - Added unit test for m_failedPolls logic Signed-off-by: Justin Wong <jvwong@arista.com>

Signed-off-by: Justin Wong <jvwong@arista.com>

mssonicbld · 2026-07-06T23:39:04Z

/azp run

azure-pipelines · 2026-07-06T23:39:10Z

Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

mssonicbld · 2026-07-06T23:42:19Z

/azp run

azure-pipelines · 2026-07-06T23:42:30Z

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: Justin Wong <jvwong@arista.com>

mssonicbld · 2026-07-07T17:21:34Z

/azp run

azure-pipelines · 2026-07-07T17:21:46Z

Azure Pipelines successfully started running 1 pipeline(s).

lolyu

why we need to manually cherry-pick this into 202605? is there any conflict?

justin-wong-ce · 2026-07-09T04:37:56Z

why we need to manually cherry-pick this into 202605? is there any conflict?

Oh I was not able to cleanly cherry-pick to origin/202605 locally, but I had a slightly desync'd fork.
Right now the cherry-pick will work. I will close this PR when it is cherry-picked to 202605.

I wil also update the test results on both PR threads when it is available.

justin-wong-ce mentioned this pull request Jun 25, 2026

Cast temp workaround for N/A counter values on Broadcom platforms from 202412 #1955

Closed

5 tasks

Cast counter enhancement from 202511

ece0295

Signed-off-by: Justin Wong <jvwong@arista.com>

justin-wong-ce force-pushed the 202605_counter_enhancement branch from 5e06b50 to ece0295 Compare June 29, 2026 16:50

justin-wong-ce changed the title ~~Cast counter enhancement from 202511~~ Cast counter enhancement from 202511 to 202605 Jun 29, 2026

justin-wong-ce mentioned this pull request Jul 1, 2026

Cast workaround for N/A counter values from 202412 #1962

Merged

5 tasks

mssonicbld mentioned this pull request Jul 2, 2026

[action] [PR:1962] Cast workaround for N/A counter values from 202412 #1967

Closed

5 tasks

mssonicbld mentioned this pull request Jul 3, 2026

[action] [PR:1962] Cast workaround for N/A counter values from 202412 #1970

Merged

5 tasks

justin-wong-ce changed the title ~~Cast counter enhancement from 202511 to 202605~~ [202605] Smart Counter Poll to allow counters to work properly on Broadcom platforms. Jul 4, 2026

justin-wong-ce added 2 commits July 6, 2026 23:37

func -> function

f3d8e69

Signed-off-by: Justin Wong <jvwong@arista.com>

Merge branch '202605' into 202605_counter_enhancement

e8801c4

justin-wong-ce mentioned this pull request Jul 7, 2026

[master] Smart Counter Poll to allow counters to work properly on Broadcom platforms. #1774

Merged

fix missing brace from conflict resolution

f348a01

Signed-off-by: Justin Wong <jvwong@arista.com>

lolyu reviewed Jul 9, 2026

View reviewed changes

Uh oh!

Conversation

justin-wong-ce commented Jun 25, 2026

Description of PR

Type of change

Approach

What is the motivation for this PR?

Work item tracking

How did you do it?

How did you verify/test it?

Any platform specific information?

Documentation

Uh oh!

mssonicbld commented Jun 25, 2026

Uh oh!

azure-pipelines Bot commented Jun 25, 2026

Uh oh!

mssonicbld commented Jun 26, 2026

Uh oh!

mssonicbld commented Jun 29, 2026

Uh oh!

azure-pipelines Bot commented Jun 29, 2026

Uh oh!

justin-wong-ce commented Jun 29, 2026

Uh oh!

mssonicbld commented Jun 29, 2026

Uh oh!

mssonicbld commented Jun 29, 2026

Uh oh!

mssonicbld commented Jul 6, 2026

Uh oh!

azure-pipelines Bot commented Jul 6, 2026

Uh oh!

mssonicbld commented Jul 6, 2026

Uh oh!

azure-pipelines Bot commented Jul 6, 2026

Uh oh!

mssonicbld commented Jul 7, 2026

Uh oh!

azure-pipelines Bot commented Jul 7, 2026

Uh oh!

lolyu left a comment

Choose a reason for hiding this comment

Uh oh!

justin-wong-ce commented Jul 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants