Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202511 to 202512#2169

Merged
mssonicbld merged 5 commits intoAzure:202512from
mssonicbld:sonicbld/202512-merge
Apr 12, 2026
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202511 to 202512#2169
mssonicbld merged 5 commits intoAzure:202512from
mssonicbld:sonicbld/202512-merge

Conversation

@mssonicbld
Copy link
Copy Markdown
Collaborator

* 5248f44dc - (head/202511) [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#26719) (2026-04-11) [mssonicbld]
* c98415724 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#26691) (2026-04-11) [mssonicbld]
* f0f582a2f - [yang][ssw] add dpu_vnet and dpu_vnet to global config table, allow underscore in dpu name, change main_dpu_ids to string (#26710) (2026-04-11) [mssonicbld]
* 55327d4ba - [SmartSwitch] [Mellanox] Ignore PCI sensors when DPU is power off (#26711) (2026-04-11) [mssonicbld]<br>```

mssonicbld and others added 5 commits April 11, 2026 12:13
…6711)

<!--
 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

When DPU's are powered off and sensord restarts, we see the following error log.

`
2026 Mar 17 18:24:42.400471 sonic ERR pmon#sensord: Error getting sensor data: mlx5/#0: Kernel interface error
`
##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it

This PCI Adapter sensor is not relevant after the DPU is powered off. Thus, add it to ignore list when it is powered off.

#### 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.
-->

When all DPU's are powered on:

```
mlx5-pci-0800
Adapter: PCI adapter
asic:
 temp1_input: 60.000
 temp1_crit: 91.000
 temp1_highest: 60.000

--
mlx5-pci-0100
Adapter: PCI adapter
asic:
 temp1_input: 68.000
 temp1_crit: 91.000
 temp1_highest: 68.000

--
mlx5-pci-0200
Adapter: PCI adapter
asic:
 temp1_input: 64.000
 temp1_crit: 91.000
 temp1_highest: 65.000

--
mlx5-pci-0700
Adapter: PCI adapter
asic:
 temp1_input: 71.000
 temp1_crit: 91.000
 temp1_highest: 73.000
```

Turn off the DPU's and no error log is seen

```
root@sonic:/home/admin# config chassis modules shutdown DPU3
Shutting down chassis module DPU3
```

#### 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
-->

- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505
- [ ] 202511

#### 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
-->

Signed-off-by: Sonic Build Admin <[email protected]>

#### A picture of a cute animal (not mandatory but encouraged)
…nderscore in dpu name, change main_dpu_ids to string (#26710)

<!--
 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:
-->

[yang][ssw] add dpu_vnet and dpu_vnet to global config table, allow underscore in dpu name, change main_dpu_ids to string

sign-off: Jing Zhang [email protected]

#### Why I did it

Otherwise yang validate would fail.

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

#### How I did it
Update the smartswitch yang models.

#### How to verify it
UTs.

<!--
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
-->

- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505
- [x] 202511

#### 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
-->

Signed-off-by: Sonic Build Admin <[email protected]>

#### A picture of a cute animal (not mandatory but encouraged)
…lly (#26691)

#### Why I did it
src/sonic-swss
```
* f907511d - (HEAD -> 202511, origin/202511) Gracefully handle case when speed is not supported in setGearboxPortAttr (#4462) (30 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…atically (#26719)

#### Why I did it
src/sonic-utilities
```
* 902205a7 - (HEAD -> 202511, origin/202511) Show vnet route cli update on 202511 (#4448) (2 hours ago) [David Zhang]
* 080ebf66 - Sfputil: don't abort eeprom-hexdump on single page read failure (#4447) (4 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
@mssonicbld
Copy link
Copy Markdown
Collaborator Author

/azp run

@azure-pipelines
Copy link
Copy Markdown

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 mssonicbld merged commit 2c4057d into Azure:202512 Apr 12, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant