Skip to content

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

Merged
mssonicbld merged 7 commits intoAzure:202512from
mssonicbld:sonicbld/202512-merge
Mar 14, 2026
Merged

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

Conversation

@mssonicbld
Copy link
Collaborator

* 0d710c404 - (head/202511) [Nokia-7220 IXR][Nokia-7250 IXR]Add support for NOKIA 7220 IXR-H6-64 and 7250 IXR-X4 platforms (#25917) (2026-03-14) [mssonicbld]
* 185424a78 - [submodule] Update submodule sonic-platform-daemons to the latest HEAD automatically (#26162) (2026-03-14) [mssonicbld]
* 5cbb3ec92 - [docker-otel] limit privileged flag for otel container (#26159) (2026-03-13) [mssonicbld]
* c62b81464 - Update Pensando platform to 1.95.0-SS-19.1-release (#26156) (2026-03-13) [prabhataravind]
* 930c299c1 - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#25997) (2026-03-14) [mssonicbld]
* 906f40413 - [lldp] Increase lldp netlink buffer limits to fix neighbors missing on swss restart (#26158) (2026-03-13) [mssonicbld]<br>```

mssonicbld and others added 7 commits March 13, 2026 19:37
…n swss restart (#26158)

Fixes "No buffer space available" issue in lldp during swss restart that casues neighbors to disappear in lldp.

#### Why I did it

When enough neighbors exit for a switch (>211), LLDP will stop reporting the last few neighbors after swss restarts. This happens even though the tcp packets from those neighbors are still arriving over the ports. This is because the netlink buffer is filled up when the restart occurs and the netlink delete messages are not received by lldp, this leads to the service not including the new neighbors over those ports, which will persist until lldp is restarted:

root@sonic:/home/admin# docker exec -it lldp lldpcli show interfaces | grep -A 5 Ethernet520
Interface: Ethernet520
Administrative status: RX and TX
Chassis:
ChassisID: mac
SysName: sonic
SysDescr: SONiC Software Version: SONiC.202412_RC
Interface: Ethernet520
Administrative status: RX and TX
Chassis:
ChassisID: mac
SysName: sonic
SysDescr: SONiC Software Version: SONiC.202412_RC

root@sonic:/home/admin# show lldp table | grep "Ethernet520"
root@sonic:/home/admin#

LLDP buffer errors:

syslog.1:2025 Dec 4 14:39:20.084820 sonic WARNING lldp#lldpd[30]: unable to receive netlink answer: No buffer space available
syslog.1:2025 Dec 4 14:39:20.0850sonic INFO lldp#supervisord: lldpd 2025-12-04T14:39:20 [WARN/netlink] unable to receive netlink answer: No buffer space available

#### How I did it
By increasing both the minimum and maximum netlink receive buffer in LLDP I was able to fix this issue

#### How to verify it

Run:

show lldp table
systemctl restart swss

Check without the change to see if the lldp buffer cannot handle all of the neighbors, then install a version of Sonic with the change to check that the larger buffer fixes this issue.

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

- [x] 202412
- [x] 202505

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
Increase lldp netlink buffer limits to fix neighbors missing on swss restart

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

![3A7F956F-45C8-45FF-9CFE-FD168414887C_1_105_c](https://github.com/user-attachments/assets/edc90a39-0b08-436e-a5e0-a1aa1489a90b)

Signed-off-by: Sonic Build Admin <[email protected]>
…atically (#25997)

#### Why I did it
src/sonic-utilities
```
* c44c5b58 - (HEAD -> 202511, origin/202511) [202511] fix scapy delayed import when we have large routes (#4347) (9 hours ago) [Hemanth Kumar Tirupati]
* 9f657f10 - [Arista] Add TH5 HWSKU to list for pfcwd support (#4351) (15 hours ago) [mssonicbld]
* cca526c5 - Fix route_check.py redis client high memory usage (#4349) (30 hours ago) [mssonicbld]
* 11283db0 - [Mellanox] Add restricted sysfs to fw control list (#4281) (2 days ago) [mssonicbld]
* 2b163fd7 - [202511] Fix issue: pmon services's restart count is not cleared during config reload (#4314) (#4336) (3 days ago) [Stephen Sun]
* 9bdae28f - Add CLI support for "show interfaces <intf> <phy-signal/phy-serdes>"commands (#4342) (3 days ago) [prajjwal-arista]
* a4a3fb6a - Cherry-pick PR sonic-net/sonic-utilities#4152 (wredcounters, counterpoll) (#4328) (3 days ago) [saksarav-nokia]
* b784464f - Add interface FEC stats to generate_dump output (#4309) (3 days ago) [Fraser Gordon]
* b15b6cdc - Fix delayed scapy import in lag_keepalive script when we have a lot of routes (#4339) (3 days ago) [mssonicbld]
* 04adbbe3 - Limit PFC WD Detection time to maximum value of 1000ms (#4340) (3 days ago) [mssonicbld]
* a31dc268 - Fetch capability of mirror before configuring it (#4204) (3 days ago) [mssonicbld]
* 4cd422a5 - Add filesystem sync after plugin installation (#4338) (3 days ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
* Update Pensando platform to 1.95.0-SS-19.1-release
* Includes changes to support capability query check for appliance entry
<!--
     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
HLD implementation: Container Hardening (sonic-net/SONiC#1364)

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

#### How I did it

#### How to verify it
Run otel sonic-mgmt tests
```
admin@vlab-01:~$ docker inspect otel | grep Privi
            "Privileged": false,
```
Check container's settings: Privileged is false and container only has default Linux caps, does not have extended caps.
<!--
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)
202412
<!--
- 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)
…D automatically (#26162)

#### Why I did it
src/sonic-platform-daemons
```
* 6ebadae - (HEAD -> 202511, origin/202511) chassisd: always use MODULE_ADMIN_DOWN when DPU operational state is offline (Azure#773) (6 hours ago) [Gagan Punathil Ellath]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…and 7250 IXR-X4 platforms (#25917)

<!--
 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
Add support for NOKIA 7220 IXR-H6-64 and NOKIA 7250-IXR-X4 platforms:

> **NOKIA 7220-IXR-H6-64**:
> Platform: x86_64-nokia_ixr7220_h6_64-r0
> HwSKU: Nokia-IXR7220-H6-64
> ASIC: Broadcom
> Port Config: 64x1600G + 2x25G

> **NOKIA 7250-IXR-X4**:
> Platform: x86_64-nokia_ixr7250_x4-r0
> HwSKU: Nokia-IXR7250-X4
> ASIC: Broadcom
> Port Config: 32x800G

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

#### How I did it

1. Added module for each platform under ../device/nokia directory.
2. Modified the platform/broadcom/one-image.mk to include each PLATFORM_MODULE
3. Modified the platform/broadcom/ platform-modules-nokia.mk to include each platform
4. Add platform related directory ixr7220h6-64, ixr7250x4 in platform/Broadcom/sonic-platform-modules-nokia
5. Modified related build scripts in platform/Broadcom/sonic-platform-modules-nokia/debian

#### How to verify it

1. Make sure the sonic-buildimage is successful
2. Run this image on x86_64-nokia_ixr7220_h6_64-r0 and x86_64-nokia_ixr7250_x4-r0 to verify all dockers are up and test basic commands like:

- show version
- show platform summary
- show platform syseeprom
- show platform fan
- show platform psustatus
- show platform firmware status
- show platform temperature
- sudo show system-health detail
- show interface status

3. Run OC test, for T1/T0 topology and have 100% pass on platform.

<!--
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)
@mssonicbld
Copy link
Collaborator Author

/azp run

@azure-pipelines
Copy link

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 898e38e into Azure:202512 Mar 14, 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.

2 participants