Skip to content

Add stat_custom_receive0_management_mode to the Broadcom config file of TH5 platforms#22825

Merged
kperumalbfn merged 6 commits intosonic-net:masterfrom
kewei-arista:pr-master-th5.0
Jun 5, 2025
Merged

Add stat_custom_receive0_management_mode to the Broadcom config file of TH5 platforms#22825
kperumalbfn merged 6 commits intosonic-net:masterfrom
kewei-arista:pr-master-th5.0

Conversation

@kewei-arista
Copy link
Contributor

@kewei-arista kewei-arista commented Jun 2, 2025 •
edited
Loading

Why I did it

There's an upgrade in SAI / SDK so that we need to add stat_custom_receive0_management_mode to config files of TH5 products. Plesae see Broadcom article "SDK - API Behavior Change - Statistics counter: snmpBcmCustomReceive0 is reserved" (ID: 26564) for more details.

Without this change, we'll see orchagent crashing with following errors:

2025 May 30 17:06:21.814814 moby102 ERR syncd#syncd: [none] SAI_API_SWITCH:_brcm_sai_stats_init:19994 Custom stat RFILDR delete failed with error Invalid configuration (0xfffffff1).
2025 May 30 17:06:21.814814 moby102 CRIT syncd#syncd: [none] SAI_API_SWITCH:brcm_sai_create_switch:4202 configuring stats failed with error -1.
2025 May 30 17:06:21.814814 moby102 ERR syncd#syncd: :- sendApiResponse: api SAI_COMMON_API_CREATE failed in syncd mode: SAI_STATUS_FAILURE
Work item tracking
  • Microsoft ADO (number only):

How I did it

Update the Broadcom config files based on the suggestion provided by Broadcom

How to verify it

We verified the crash is fixed with this patch, and running sonic-mgmt with this patch.

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

  • 202205
  • 202211
  • 202305
  • 202311
  • 202405
  • 202411
  • 202505
  • msft-202412
  • msft-202503

Tested branch (Please provide the tested image version)

  • msft-202412

Description for the changelog

Link to config_db schema for YANG module changes

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

@mssonicbld
Copy link
Collaborator

mssonicbld commented Jun 2, 2025

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

azure-pipelines bot commented Jun 2, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@sdszhang sdszhang mentioned this pull request Jun 3, 2025
Merged
12 tasks
@r12f
Copy link
Contributor

r12f commented Jun 3, 2025 •
edited
Loading

Multiple test cases failed in CI:

  • qos/test_qos_dscp_mapping.py
  • pc/test_lag_member_forwarding.py

Looks like failing because of the same issues:

image

@r12f
Copy link
Contributor

r12f commented Jun 3, 2025

Fix is already merged: #18947.

@r12f
Copy link
Contributor

r12f commented Jun 3, 2025

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented Jun 3, 2025

Commenter does not have sufficient privileges for PR 22825 in repo sonic-net/sonic-buildimage

@bingwang-ms
Copy link
Contributor

bingwang-ms commented Jun 3, 2025

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

azure-pipelines bot commented Jun 3, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@kewei-arista
Copy link
Contributor Author

kewei-arista commented Jun 3, 2025 •
edited
Loading

Rebased and updated releases to backport

@sdszhang sdszhang closed this Jun 3, 2025
@sdszhang sdszhang reopened this Jun 3, 2025
@bingwang-ms
Copy link
Contributor

bingwang-ms commented Jun 5, 2025

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

azure-pipelines bot commented Jun 5, 2025

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld mssonicbld mentioned this pull request Jun 5, 2025
Merged
12 tasks
@mssonicbld
Copy link
Collaborator

mssonicbld commented Jun 5, 2025

Cherry-pick PR to msft-202503: Azure/sonic-buildimage-msft#1206

@yejianquan
Copy link
Contributor

yejianquan commented Jun 6, 2025

@kewei-arista please fix conflict and create PR to 202505 branch

@kewei-arista kewei-arista mentioned this pull request Jun 6, 2025
Merged
9 tasks
@kewei-arista
Copy link
Contributor Author

kewei-arista commented Jun 6, 2025

@kewei-arista please fix conflict and create PR to 202505 branch

@yejianquan PR to 202505 branch: #22873

@StormLiangMS
Copy link
Contributor

StormLiangMS commented Jun 10, 2025

hi @kewei-arista could you check 202412 conflict?

r12f pushed a commit to Azure/sonic-buildimage-msft that referenced this pull request Jun 11, 2025
@kewei-arista
Add stat_custom_receive0_management_mode to the Broadcom config file …
a44dbf5 
…of TH5 platforms (#1203)

<!--
Please make sure you've read and understood our contributing guidelines:
     https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

** Make sure all your commits include a signature generated with `git
commit -s` **

If this is a bug fix, make sure your description includes "fixes #xxxx",
or
     "closes #xxxx" or "resolves #xxxx"

     Please provide the following information:
-->

#### Why I did it
Cherry pick changes from
sonic-net/sonic-buildimage#22825

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it

#### How to verify it

<!--
If PR needs to be backported, then the PR must be tested against the
base branch and the earliest backport release branch and provide tested
image version on these two branches. For example, if the PR is requested
for master, 202211 and 202012, then the requester needs to provide test
results on master and 202012.
-->

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

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->

<!--
Ensure to add label/tag for the feature raised. example - PR#2174 under
sonic-utilities repo. where, Generic Config and Update feature has been
labelled as GCU.
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on
https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

#### A picture of a cute animal (not mandatory but encouraged)
@kewei-arista kewei-arista mentioned this pull request Jun 16, 2025
Merged
10 tasks
StormLiangMS pushed a commit that referenced this pull request Jul 7, 2025
@kewei-arista
Add stat_custom_receive0_management_mode to Arista-7060X6-64PE-B-O128…
f8bde8c 
… config file (#22998)

Why I did it
Recently we added stat_custom_receive0_management_mode config to TH5 Broadcom config files, and the changes upstreamed in #22825.

There's a separate PR created to add new HWSKU Arista-7060X6-64PE-B-O128
around the same time, see #22672

As a result, stat_custom_receive0_management_mode was missed in Arista-7060X6-64PE-B-O128 config file. This change adds it.

Work item tracking
Microsoft ADO (number only):
How I did it
How to verify it
Verified all interfaces are up with this change when using Arista-7060X6-64PE-B-O128
mssonicbld added a commit to mssonicbld/sonic-buildimage-msft that referenced this pull request Jul 7, 2025
@mssonicbld
Add stat_custom_receive0_management_mode to Arista-7060X6-64PE-B-O128…
03b8a12 
… config file

… config file

<!--
     Please make sure you've read and understood our contributing guidelines:
     https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

     ** Make sure all your commits include a signature generated with `git commit -s` **

     If this is a bug fix, make sure your description includes "fixes #xxxx", or
     "closes #xxxx" or "resolves #xxxx"

     Please provide the following information:
-->

#### Why I did it
Recently we added stat_custom_receive0_management_mode config to TH5 Broadcom config files, and the changes upstreamed in sonic-net/sonic-buildimage#22825.

There's a separate PR created to add new HWSKU Arista-7060X6-64PE-B-O128
around the same time, see sonic-net/sonic-buildimage#22672

As a result, stat_custom_receive0_management_mode was missed in Arista-7060X6-64PE-B-O128 config file. This change adds it.

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it

#### How to verify it
Verified all interfaces are up with this change when using Arista-7060X6-64PE-B-O128

<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->

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

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 202205
- [ ] 202211
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [x] msft-202412
- [x] msft-202503
- [x] 202505

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [x] msft-202412

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->

<!--
 Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

#### A picture of a cute animal (not mandatory but encouraged)
@mssonicbld mssonicbld mentioned this pull request Jul 7, 2025
Merged
10 tasks
mssonicbld added a commit to mssonicbld/sonic-buildimage that referenced this pull request Jul 7, 2025
@mssonicbld
Add stat_custom_receive0_management_mode to Arista-7060X6-64PE-B-O128…
0da4d38 
… config file

… config file

<!--
     Please make sure you've read and understood our contributing guidelines:
     https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

     ** Make sure all your commits include a signature generated with `git commit -s` **

     If this is a bug fix, make sure your description includes "fixes #xxxx", or
     "closes #xxxx" or "resolves #xxxx"

     Please provide the following information:
-->

#### Why I did it
Recently we added stat_custom_receive0_management_mode config to TH5 Broadcom config files, and the changes upstreamed in sonic-net#22825.

There's a separate PR created to add new HWSKU Arista-7060X6-64PE-B-O128
around the same time, see sonic-net#22672

As a result, stat_custom_receive0_management_mode was missed in Arista-7060X6-64PE-B-O128 config file. This change adds it.

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it

#### How to verify it
Verified all interfaces are up with this change when using Arista-7060X6-64PE-B-O128

<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->

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

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 202205
- [ ] 202211
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [x] msft-202412
- [x] msft-202503
- [x] 202505

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [x] msft-202412

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->

<!--
 Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

#### A picture of a cute animal (not mandatory but encouraged)
@mssonicbld mssonicbld mentioned this pull request Jul 7, 2025
Merged
10 tasks
mssonicbld added a commit that referenced this pull request Jul 9, 2025
@mssonicbld
Add stat_custom_receive0_management_mode to Arista-7060X6-64PE-B-O128…
be9dd15 
… config file (#23243)

… config file

<!--
 Please make sure you've read and understood our contributing guidelines:
 https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

 failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` **

 If this is a bug fix, make sure your description includes "fixes #xxxx", or
 "closes #xxxx" or "resolves #xxxx"

 Please provide the following information:
-->

#### Why I did it
Recently we added stat_custom_receive0_management_mode config to TH5 Broadcom config files, and the changes upstreamed in #22825.

There's a separate PR created to add new HWSKU Arista-7060X6-64PE-B-O128
around the same time, see #22672

As a result, stat_custom_receive0_management_mode was missed in Arista-7060X6-64PE-B-O128 config file. This change adds it.

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it

#### How to verify it
Verified all interfaces are up with this change when using Arista-7060X6-64PE-B-O128

<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->

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

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 202205
- [ ] 202211
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [x] msft-202412
- [x] msft-202503
- [x] 202505

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [x] msft-202412

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->

<!--
 Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

#### A picture of a cute animal (not mandatory but encouraged)
dakotac-arista pushed a commit to dakotac-arista/sonic-buildimage that referenced this pull request Jul 9, 2025
@kewei-arista @dakotac-arista
Add stat_custom_receive0_management_mode to the Broadcom config file …
6112fc1 
…of TH5 platforms (sonic-net#22825)

Add stat_custom_receive0_management_mode to the Broadcom config file of TH5 platforms
r12f pushed a commit to Azure/sonic-buildimage-msft that referenced this pull request Jul 9, 2025
@mssonicbld
[action] [PR:22998] Add stat_custom_receive0_management_mode to Arist…
ed50914 
…a-7060X6-64PE-B-O128 config file (#1321)

… config file

<!--
Please make sure you've read and understood our contributing guidelines:
     https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

** Make sure all your commits include a signature generated with `git
commit -s` **

If this is a bug fix, make sure your description includes "fixes #xxxx",
or
     "closes #xxxx" or "resolves #xxxx"

     Please provide the following information:
-->

#### Why I did it
Recently we added stat_custom_receive0_management_mode config to TH5
Broadcom config files, and the changes upstreamed in
sonic-net/sonic-buildimage#22825.

There's a separate PR created to add new HWSKU Arista-7060X6-64PE-B-O128
around the same time, see
sonic-net/sonic-buildimage#22672

As a result, stat_custom_receive0_management_mode was missed in
Arista-7060X6-64PE-B-O128 config file. This change adds it.

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it

#### How to verify it
Verified all interfaces are up with this change when using
Arista-7060X6-64PE-B-O128

<!--
If PR needs to be backported, then the PR must be tested against the
base branch and the earliest backport release branch and provide tested
image version on these two branches. For example, if the PR is requested
for master, 202211 and 202012, then the requester needs to provide test
results on master and 202012.
-->

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

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 202205
- [ ] 202211
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [x] msft-202412
- [x] msft-202503
- [x] 202505

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [x] msft-202412

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->

<!--
Ensure to add label/tag for the feature raised. example - PR#2174 under
sonic-utilities repo. where, Generic Config and Update feature has been
labelled as GCU.
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on
https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

#### A picture of a cute animal (not mandatory but encouraged)
yejianquan pushed a commit that referenced this pull request Jul 11, 2025
@dakotac-arista @kewei-arista
@dayouliu1 @bingwang-ms
[Arista][DT2] Cherry pick HWSKU commits to 202505 (#23264)
7cfabf4 
* [Arista] Add HWSKU Arista-7060X6-64PE-B-P64 (#22734)

* Add qspf TH5-512 HWSKU Arista-7060X6-64PE-B-P64

* [Arista] Add HWSKU Arista-7060X6-64PE-B-P32O64 (#22732)

[Arista] Add HWSKU Arista-7060X6-64PE-B-P32O64

* Add stat_custom_receive0_management_mode to the Broadcom config file of TH5 platforms (#22825)

Add stat_custom_receive0_management_mode to the Broadcom config file of TH5 platforms

* [Arista][DT2] Add QoS to Arista-7060X6-64PE-B-P32O64 (#22836)

Why I did it
Add QoS settings from CSP to TH5-512 HWSKU Arista-7060X6-64PE-B-P32O64

How to verify it
Sanitized a fully wired DUT and confirmed all links came up.

* [Arista][DT2] Add QoS to Arista-7060X6-64PE-B-P64 (#22837)

Why I did it
Add QoS settings from CSP to TH5-512 HWSKU Arista-7060X6-64PE-B-P64

How to verify it
Sanitized a fully wired DUT and confirmed all links came up.

* Enable srv6 on TH5 (#23018)

Why I did it
Enable srv6 on TH5

* Set ENABLE to 0 for TH5 platform (#23125)

Why I did it
Fixed aristanetworks/sonic-qual.msft#645

How I did it
Update bcm config to set ENABLE to 0.

How to verify it
The change is verified by modifying the bcm config and checking if all ports can be up.

---------

Co-authored-by: kewei-arista <[email protected]>
Co-authored-by: Dayou Liu <[email protected]>
Co-authored-by: bingwang-ms <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@r12f r12f r12f approved these changes

@kperumalbfn kperumalbfn kperumalbfn approved these changes

Assignees

No one assigned

Labels

Approved for msft-202412 Branch Approved for msft-202503 Branch Approved for 202505 Branch Created PR to msft-202503 Branch Included in msft-202412 Branch Included in msft-202503 Branch Included in 202505 Branch Request for msft-202412 Branch Request for msft-202503 Branch Request for 202505 Branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@kewei-arista @mssonicbld @r12f @bingwang-ms @sdszhang @yejianquan @StormLiangMS @kperumalbfn @yxieca