Add new config to enable per-port counter discovery for syncd by justin-wong-ce · Pull Request #28506 · sonic-net/sonic-buildimage

justin-wong-ce · 2026-07-20T19:32:40Z

Adding a new HWSKU config enable_per_port_counter_discovery to be placed in sonic-buildimage/device/... to toggle the per-port counter discovery feature when checking for counters to poll during syncd's initialization.

This config will be stored into CONFIG_DB and be used to decide what arguments to use to invoke syncd with via syncd_init_common.sh.

An example is added in this change for device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-C512S2.

This is part 2 of 2 fix in addressing #28460. There are two fix methods under consideration, this PR outlines the method of deciding code path via the HWSKU config and needs to be used together with sonic-net/sonic-sairedis#2002.

This change also requires the changes in sonic-net/sonic-sairedis#2000, sonic-net/sonic-sairedis#2001, and sonic-net/sonic-sairedis#2002 to work.

Why I did it

In #1774 , a new counter support discovery method is introduced for being able to read counter support for platforms where different ports can have different capabilities.
The method worked well for some platforms, not so much for some others.

This change applies the new syncd arg enablePerPortCounterDiscovery (introduced in sonic-net/sonic-sairedis#2000) when enable_per_port_counter_discovery is populated in the HWSKU's config. This will be read from sonic-buildimage/device... and then set into DEVICE_METADATA in CONFIG_DB.

Work item tracking

Microsoft ADO (number only):

How I did it

Added logic to image to read the new config file from the HWSKU config folder.
Added logic to populate the new config as part of variables to pass to syncd for initialization.
Added enable_per_port_counter_discovery as a valid CONFIG_DB entry in the device_metadata yang file.
Added example config for device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-C512S2

How to verify it

(Please see the test result section below)

Which release branch to backport (provide reason below if selected)

Tracking issue/work item for backport/cherry-pick request (GitHub issue or Microsoft ADO):
Failure type:

Tested branch

Test result

syncd unit tests pass on master and on 202605.
On physical hardware, an image is built with the changes cherry-picked to 202605 and tests are ran in 6 scenarios:
1):

ASIC check: use arg on broadcom
HWSKU config: not defined
Result: per-port counter discovery code path used

2):

ASIC check: use arg on broadcom
HWSKU config: enable_per_port_counter_discovery set to true
Result: per-port counter discovery code path used

3):

ASIC check: use arg on broadcom
HWSKU config: enable_per_port_counter_discovery set to false
Result: legacy code path used

4):

ASIC check: use arg on mellanox
HWSKU config: not defined
Result: legacy code path used

5):

ASIC check: use arg on mellanox
HWSKU config: enable_per_port_counter_discovery set to true
Result: per-port counter discovery code path used

6):

ASIC check: use arg on mellanox
HWSKU config: enable_per_port_counter_discovery set to false
Result: legacy code path used

In all 6 scenarios, syncd enters the expected code path.

Additionally, a subset of counters-focused sonic-mgmt tests are ran. There is no test result difference compared to tests done without this change.
Tests were ran on Arista-7260CX3-D108C8.

Description for the changelog

Add enable_per_port_counter_discovery config definitions and propogation logic.

Link to config_db schema for YANG module changes

https://github.com/sonic-net/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md#device-metadata

A picture of a cute animal (not mandatory but encouraged)

mssonicbld · 2026-07-20T19:32:48Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2026-07-20T19:32:49Z

Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run.

azure-pipelines · 2026-07-20T19:33:04Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-07-21T06:41:16Z

This PR has backport request for branch(es): 202605.
Added label(s) for branch(es) 202605.

_{---Powered by SONiC BuildBot}

mssonicbld · 2026-07-21T06:41:20Z

The Tested branch section has been ticked and Test result is provided for branch(es): 202605. Added label(s): Tested for 202605 Branch.

_{---Powered by SONiC BuildBot}

justin-wong-ce · 2026-07-21T16:59:38Z

/azpw retry

mssonicbld · 2026-07-21T16:59:41Z

Retrying failed(or canceled) jobs...

mssonicbld · 2026-07-21T16:59:44Z

Retrying failed(or canceled) stages in build 1170168:

✅Stage Test:

Job impacted-area-kvmtest-t1-lag-vpp by Elastictest: retried.

dgsudharsan

Can you please add UT for lang model changes?

justin-wong-ce · 2026-07-21T23:43:37Z

Can you please add UT for lang model changes?

Ack, will be working on it

mssonicbld · 2026-07-22T19:03:28Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2026-07-22T19:03:43Z

Azure Pipelines: Successfully started running 1 pipeline(s).

justin-wong-ce · 2026-07-22T19:04:30Z

Can you please add UT for lang model changes?

Added

mssonicbld · 2026-07-23T00:32:36Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2026-07-23T00:32:48Z

Azure Pipelines: Successfully started running 1 pipeline(s).

mssonicbld · 2026-07-23T18:01:22Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2026-07-23T18:01:37Z

Azure Pipelines: Successfully started running 1 pipeline(s).

justin-wong-ce · 2026-07-23T18:20:37Z

Need to add logic such that SYNCD_VARS will be able to reflect true, false, and undefined state, rather than the current true, false (where it defaults to false).

We need this logic to be able to know when to use the ASIC type based check from sonic-net/sonic-sairedis#2001 and when to use the HWSKU config.

mssonicbld · 2026-07-23T21:59:46Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2026-07-23T21:59:57Z

Azure Pipelines: Successfully started running 1 pipeline(s).

azure-pipelines · 2026-07-24T20:33:58Z

Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run.

justin-wong-ce · 2026-07-24T20:34:44Z

/azpw retry

mssonicbld · 2026-07-24T20:34:47Z

Retrying failed(or canceled) jobs...

mssonicbld · 2026-07-24T20:34:50Z

Retrying failed(or canceled) stages in build 1173234:

✅Stage Test:

Job impacted-area-kvmtest-multi-asic-t1 by Elastictest: retried.
Job impacted-area-kvmtest-t2 by Elastictest: retried.
Job impacted-area-kvmtest-t1-lag-vpp by Elastictest: retried.
Job impacted-area-kvmtest-t0-sonic by Elastictest: retried.
Job impacted-area-kvmtest-t0-2vlans by Elastictest: retried.
Job impacted-area-kvmtest-t1-lag by Elastictest: retried.
Job impacted-area-kvmtest-dpu by Elastictest: retried.
Job impacted-area-kvmtest-dualtor by Elastictest: retried.
Job impacted-area-kvmtest-t0 by Elastictest: retried.

justin-wong-ce · 2026-07-30T23:29:33Z

/azpw retry

mssonicbld · 2026-07-30T23:29:35Z

Retrying failed(or canceled) jobs...

mssonicbld · 2026-07-30T23:29:38Z

Retrying failed(or canceled) stages in build 1173234:

✅Stage Test:

Job impacted-area-kvmtest-dualtor by Elastictest: retried.
Job impacted-area-kvmtest-t2 by Elastictest: retried.
Job impacted-area-kvmtest-t1-lag-vpp by Elastictest: retried.
Job impacted-area-kvmtest-dpu by Elastictest: retried.
Job impacted-area-kvmtest-t0-sonic by Elastictest: retried.
Job impacted-area-kvmtest-multi-asic-t1 by Elastictest: retried.
Job impacted-area-kvmtest-t0 by Elastictest: retried.
Job impacted-area-kvmtest-t0-2vlans by Elastictest: retried.
Job impacted-area-kvmtest-t1-lag by Elastictest: retried.

justin-wong-ce · 2026-08-04T17:36:38Z

Will address failing CI when sonic-net/sonic-sairedis#2001 is merged

justin-wong-ce · 2026-08-05T20:10:07Z

/azpw retry

mssonicbld · 2026-08-05T20:10:10Z

Retrying failed(or canceled) jobs...

mssonicbld · 2026-08-05T20:10:13Z

Retrying failed(or canceled) stages in build 1173234:

✅Stage Test:

Job impacted-area-kvmtest-multi-asic-t1 by Elastictest: retried.
Job impacted-area-kvmtest-t1-lag-vpp by Elastictest: retried.
Job impacted-area-kvmtest-t2 by Elastictest: retried.
Job impacted-area-kvmtest-dualtor by Elastictest: retried.
Job impacted-area-kvmtest-t0-sonic by Elastictest: retried.
Job impacted-area-kvmtest-t0 by Elastictest: retried.
Job impacted-area-kvmtest-dpu by Elastictest: retried.
Job impacted-area-kvmtest-t0-2vlans by Elastictest: retried.
Job impacted-area-kvmtest-t1-lag by Elastictest: retried.

Adding a new HWSKU config to toggle per-port counter discovery when checking for counter to polls in syncd initialization. This config will be stored into CONFIG_DB and and used to decide what arguments to use to invoke syncd via syncd_init_common.sh Signed-off-by: Justin Wong <jvwong@arista.com>

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

Add the new entry enable_per_port_counter_discovery to be part of yang's device_metadata unit test. Signed-off-by: Justin Wong <jvwong@arista.com>

Cast the new enable_per_port_counter_discovery config file to all Arista HWSKUs as they all need the per-port counter discovery logic for counters to fully work. Signed-off-by: Justin Wong <jvwong@arista.com>

This reverts commit 9430c38. Broadcom ASICs no longer need a config file to use the per-port discovery code path. Retaining config in Arista-7060X6-64PE-B-C512S2 as an example for what the config should look like. Signed-off-by: Justin Wong <jvwong@arista.com>

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

mssonicbld · 2026-08-05T20:21:30Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2026-08-05T20:21:46Z

Azure Pipelines: Successfully started running 1 pipeline(s).

justin-wong-ce · 2026-08-06T21:26:22Z

/azpw retry

mssonicbld · 2026-08-06T21:26:24Z

Retrying failed(or canceled) jobs...

mssonicbld · 2026-08-06T21:27:13Z

Retrying failed(or canceled) stages in build 1185058:

✅Stage Test:

Job impacted-area-kvmtest-multi-asic-t1 by Elastictest: retried.
Job impacted-area-kvmtest-t2 by Elastictest: retried.
Job impacted-area-kvmtest-t1-lag-vpp by Elastictest: retried.
Job impacted-area-kvmtest-t0-sonic by Elastictest: retried.
Job impacted-area-kvmtest-t0-2vlans by Elastictest: retried.
Job impacted-area-kvmtest-t1-lag by Elastictest: retried.
Job impacted-area-kvmtest-dpu by Elastictest: retried.
Job impacted-area-kvmtest-dualtor by Elastictest: retried.
Job impacted-area-kvmtest-t0 by Elastictest: retried.

dgsudharsan · 2026-08-08T01:13:45Z

    {%if DEVICE_METADATA.localhost.supporting_bulk_counter_groups is defined and DEVICE_METADATA.localhost.supporting_bulk_counter_groups != '' -%}
    "supporting_bulk_counter_groups": "{{ DEVICE_METADATA.localhost.supporting_bulk_counter_groups|join(',') }}",
    {% endif -%}
+    "enable_per_port_counter_discovery": {% if DEVICE_METADATA.localhost.enable_per_port_counter_discovery|string|lower == "true" %}"true"{% else %}"false"{% endif %},


Missing if statement

This was referenced Jul 20, 2026

Toggle enablePerPortCounterDiscovery based on HWSKU config sonic-net/sonic-sairedis#2002

Merged

sonic-sairedis #1774 (Smart Counter Poll) does O(ports) per-port getStats at counter init, starving orchagent and crashing it on high port-count switches #28460

Closed

mssonicbld added the Request for 202605 Branch label Jul 21, 2026

mssonicbld added the Tested for 202605 branch Tested for 202605 branch label Jul 21, 2026

dgsudharsan requested changes Jul 21, 2026

View reviewed changes

justin-wong-ce requested a review from dgsudharsan July 22, 2026 19:04

justin-wong-ce marked this pull request as ready for review July 24, 2026 20:33

justin-wong-ce requested review from lguohan, praveen-li, qiluo-msft and venkatmahalingam as code owners July 24, 2026 20:33

justin-wong-ce added 6 commits August 5, 2026 20:20

add doc change for yang configdb schema

02eb7d2

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

Add new entry to be part of yang unit tests

cb357dc

Add the new entry enable_per_port_counter_discovery to be part of yang's device_metadata unit test. Signed-off-by: Justin Wong <jvwong@arista.com>

Cast config file to all arista HWSKUs

5555ed0

Cast the new enable_per_port_counter_discovery config file to all Arista HWSKUs as they all need the per-port counter discovery logic for counters to fully work. Signed-off-by: Justin Wong <jvwong@arista.com>

Add ability to store 'undefined' state as ''

604c3d0

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

justin-wong-ce force-pushed the genFix-confdb branch from b167199 to 604c3d0 Compare August 5, 2026 20:21

dgsudharsan approved these changes Aug 7, 2026

View reviewed changes

dgsudharsan requested changes Aug 8, 2026

View reviewed changes

Uh oh!

Conversation

justin-wong-ce commented Jul 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Why I did it

Work item tracking

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Tested branch

Test result

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

Uh oh!

mssonicbld commented Jul 20, 2026

Uh oh!

azure-pipelines Bot commented Jul 20, 2026

Uh oh!

azure-pipelines Bot commented Jul 20, 2026

Uh oh!

mssonicbld commented Jul 21, 2026

Uh oh!

mssonicbld commented Jul 21, 2026

Uh oh!

justin-wong-ce commented Jul 21, 2026

Uh oh!

mssonicbld commented Jul 21, 2026

Uh oh!

mssonicbld commented Jul 21, 2026

Uh oh!

dgsudharsan left a comment

Choose a reason for hiding this comment

Uh oh!

justin-wong-ce commented Jul 21, 2026

Uh oh!

mssonicbld commented Jul 22, 2026

Uh oh!

azure-pipelines Bot commented Jul 22, 2026

Uh oh!

justin-wong-ce commented Jul 22, 2026

Uh oh!

mssonicbld commented Jul 23, 2026

Uh oh!

azure-pipelines Bot commented Jul 23, 2026

Uh oh!

mssonicbld commented Jul 23, 2026

Uh oh!

azure-pipelines Bot commented Jul 23, 2026

Uh oh!

justin-wong-ce commented Jul 23, 2026

Uh oh!

mssonicbld commented Jul 23, 2026

Uh oh!

azure-pipelines Bot commented Jul 23, 2026

Uh oh!

azure-pipelines Bot commented Jul 24, 2026

Uh oh!

justin-wong-ce commented Jul 24, 2026

Uh oh!

mssonicbld commented Jul 24, 2026

Uh oh!

mssonicbld commented Jul 24, 2026

Uh oh!

justin-wong-ce commented Jul 30, 2026

Uh oh!

mssonicbld commented Jul 30, 2026

Uh oh!

mssonicbld commented Jul 30, 2026

Uh oh!

justin-wong-ce commented Aug 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

justin-wong-ce commented Aug 5, 2026

Uh oh!

mssonicbld commented Aug 5, 2026

Uh oh!

mssonicbld commented Aug 5, 2026

Uh oh!

mssonicbld commented Aug 5, 2026

justin-wong-ce commented Jul 20, 2026 •

edited

Loading

justin-wong-ce commented Aug 4, 2026 •

edited

Loading