Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202412 to 202503#1387

Merged
mssonicbld merged 7 commits intoAzure:202503from
mssonicbld:sonicbld/202503-merge
Jul 22, 2025
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202412 to 202503#1387
mssonicbld merged 7 commits intoAzure:202503from
mssonicbld:sonicbld/202503-merge

Conversation

@mssonicbld
Copy link
Collaborator

*   e8d980538 - (origin/202412, 202412) [action] [PR:23343] TH5-512 ingress and egress lossy queue buffer size change (#1380) (2025-07-21) [Riff]
|\  
| * 3c745e7c7 - TH5-512 ingress and egress lossy queue buffer size change (2025-07-19) [Sonic Build Admin]
*   155c4f812 - [submodule][202412] Update submodule sonic-sairedis to the latest HEAD automatically (#1374) (2025-07-21) [Riff]
|\  
| * 4309cb755 - [submodule] Update submodule sonic-sairedis to the latest HEAD automatically (2025-07-21) [Sonic Automation]
* 3648500e3 - [submodule][202412] Update submodule sonic-linux-kernel to the latest HEAD automatically (#1375) (2025-07-21) [Riff]
* 183c067bb - [submodule] Update submodule sonic-linux-kernel to the latest HEAD automatically (2025-07-21) [Sonic Automation]<br>```

mssonicbld and others added 7 commits July 19, 2025 06:33
#### Why I did it

BRCM SAI 13.2.1 increases the pkt trim buffer pool to 1.7MB, leading to the reduction of available lossy queue buffer.

Without this change, there will be a syncd crash on default buffer profile pairing with SAI 13.2.1.

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

#### How I did it

Reduce default ingress and egress lossy buffer size from 165307264 with 161999982

#### How to verify it

Verified on Arista-7060X6-64PE-B-C512S2

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

- [x] 202412

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

- [x] 202412.b27

#### Description for the changelog

BRCM SAI 13.2.1 increases the pkt trim buffer pool to 1.7MB, available lossy queue buffer size to be reduced accordingly.

#### Link to config_db schema for YANG module changes

#### A picture of a cute animal (not mandatory but encouraged)
… HEAD automatically (Azure#1375)

#### Why I did it
src/sonic-linux-kernel
```
* 7f3e021 - (HEAD -> 202412, origin/HEAD, origin/202412) Integrate HW-MGMT 7.0040.4019 Changes (Azure#46) (6 hours ago) [Vivek]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…D automatically (Azure#1374)

#### Why I did it
src/sonic-sairedis
```
* e35a2de8 - (HEAD -> 202412, origin/HEAD, origin/202412) Fix missing counter info for Broadcom Management Ports on TH5 (Azure#69) (21 hours ago) [Justin Wong]
```
#### How I did it
#### How to verify it
#### Description for the changelog
…e change (Azure#1380)

#### Why I did it

BRCM SAI 13.2.1 increases the pkt trim buffer pool to 1.7MB, leading to
the reduction of available lossy queue buffer.

Without this change, there will be a syncd crash on default buffer
profile pairing with SAI 13.2.1.

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

#### How I did it

Reduce default ingress and egress lossy buffer size from 165307264 with
161999982

#### How to verify it

Verified on Arista-7060X6-64PE-B-C512S2

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

- [x] 202412

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

- [x] 202412.b27

#### Description for the changelog

BRCM SAI 13.2.1 increases the pkt trim buffer pool to 1.7MB, available
lossy queue buffer size to be reduced accordingly.

#### Link to config_db schema for YANG module changes

#### A picture of a cute animal (not mandatory but encouraged)
@mssonicbld
Copy link
Collaborator Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld mssonicbld merged commit 278ac8c into Azure:202503 Jul 22, 2025
9 of 17 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