Repository navigation
[Broadcom] Upgrade Broadcom xgs SAI version to 15.2.1.0.0.0.26.3 - #29761
aaronber0614 wants to merge 3 commits into
Conversation
Include upstream SAI 15.2.1 release 23.0 while retaining the Microsoft product patches. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 551d207b-8ce1-40fb-b69f-291f72e021d3 Signed-off-by: Aaron Bernardino <aaronber@microsoft.com>
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
|
This PR has backport request label(s) for branch(es): 202605, but is missing required test information. Please make sure you tick the tested branch(es) in the Tested branch section and provide test evidence (e.g., 202605: <test result>) in the Test result section as well in your PR description. ---Powered by SONiC BuildBot
|
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
Sync through upstream 15.2.1.0.0.0.26.0, including the ALPM trie-split crash protection, SerDes Main TAP validation fix, and mirrored-packet egress drop-counter correction. Keep the SAI_15.2.1_GA branch and the existing family-aligned cache dependency fix. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 13abff6a-6f56-4bc8-b9e5-d33e23aec40c Signed-off-by: Aaron Bernardino <aaronber@microsoft.com>
ae1b287 to
c4e2571
Compare
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
There was a problem hiding this comment.
Copilot review overview
🔵 Needs a closer look
Final approval depends on external artifact provenance and the prerequisite cache-metadata PR being merged and rebased.
Review effort: Balanced
Findings: None
What changed in this PR
Updates the Broadcom XGS SAI package consumed by SONiC to release 15.2.1.0.0.0.26.3.
Changes:
- Advances
LIBSAIBCM_XGS_VERSIONfrom.22.3to.26.3. - Retains the existing
SAI_15.2.1_GAbranch and package URL structure.
| File | Description |
|---|---|
platform/broadcom/sai-xgs.mk |
Updates the XGS SAI package version. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Branch-native 202605 pin update from 15.2.1.0.0.0.17.3 to 15.2.1.0.0.0.26.3, consolidating upstream SAI 15.2.1 releases .19.0 through .26.0 plus the .22.3/.26.3 product restamps, while keeping the SAI_15.2.1_GA branch. This is the branch-native counterpart of master publication PR #29761 (the automatic 202605 cherry-pick cannot apply over the .17.3 pin). Pure platform/broadcom/sai-xgs.mk change; the libsaibcm package is byte-identical to the qualified master and 202605-staging builds. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 13abff6a-6f56-4bc8-b9e5-d33e23aec40c Signed-off-by: Aaron Bernardino <aaronber@microsoft.com>
|
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
|
|
/azp run |
|
Azure Pipelines: Successfully started running 1 pipeline(s). 2 pipeline(s) were filtered out due to trigger conditions. |
|
This PR is blocked by false CI failure, which can be unblocked once #29930 merges |
|
/azpw retry |
|
Retrying failed(or canceled) jobs... |
|
Retrying failed(or canceled) stages in build 1238294: ✅Stage CacheKeyLint:
|
|
/azp run |
|
Azure Pipelines: Successfully started running 1 pipeline(s). 2 pipeline(s) were filtered out due to trigger conditions. |
Why I did it
Upgrade the Broadcom XGS SAI package from
15.2.1.0.0.0.22.3to15.2.1.0.0.0.26.3. This synchronizes the product branch through upstreamSAI
15.2.1.0.0.0.26.0while preserving the Microsoft AN/LT behavior,serdes ILT 30-second timeout, DNX link-training dispatch support, MACsec
payload, XGS build support, and internal changelog history.
Included release history (the product restamps between the current
masterpin
15.2.1.0.0.0.22.3and this release):15.2.1.0.0.0.23.3: sync through upstream15.2.1.0.0.0.23.0—SONIC-128554 TH5/TH6 FEC corrected-bit capability reporting.
15.2.1.0.0.0.26.3: sync through upstream15.2.1.0.0.0.26.0—SDKLT-56852 protects
bcmptm_rm_alpm_trie_splitfrom a segmentationfault (upstream
.24.0), SONIC-128397 corrects Main TAP validationduring SerDes object creation when higher values are configured
(upstream
.25.0), and SONIC-121729 corrects the egress queue dropcounter for dropped mirrored packets (upstream
.26.0).Work item tracking
How I did it
Update
LIBSAIBCM_XGS_VERSIONinplatform/broadcom/sai-xgs.mkfrom15.2.1.0.0.0.22.3to15.2.1.0.0.0.26.3. The SAI branch remainsSAI_15.2.1_GA.This PR intentionally contains only the
platform/broadcom/sai-xgs.mkversionbump. The Broadcom SAI build-cache dependency split (
sai-xgs.dep/sai-dnx.dep, withsai.depas an include aggregator) that thedpkg cache-key completenessPR gate requires is unrelated build infrastructure andis tracked separately in PR #29930. #29930 must merge to master first; this
branch is then rebased on top, after which the cache-completeness check passes.
The split is build-cache metadata only and does not change the libsaibcm
package.
How to verify it
Definition 702 builds
1234914,1234916, and1234979succeeded fromofficial
SAI_15.2.1_GAcommitec0a361de4b98fa1fdebc309246972b68c2f0459. The XGS artifact comes fromcanonical automatic build
1234914, DNX evidence comes from build1234916,and DNX-internal evidence comes from build
1234979. Every artifact resolvesto the same official source and exact SDK gitlink
cd0c34201f5d764b1a2d4fe5b98e4aad5f8fdd6b.Each required candidate family package (XGS, DNX, and DNX-internal) passed
the absolute hard-undefined Broadcom symbol gate. These are cross-family
package-safety checks, not DNX hardware qualification. The release-provenance
verifier also confirmed upstream containment, the official SAI and SDK heads,
and all configured AN/LT and ILT source markers.
Publisher build
1234944published the XGS packages from build1234914.The public runtime and development packages are byte-for-byte identical to
the authenticated ADO artifacts, and their Debian version is exactly
15.2.1.0.0.0.26.3.Which release branch to backport (provide reason below if selected)
The same SAI fixes are required on 202605.
Tracking issue/work item for backport/cherry-pick request (GitHub issue or Microsoft ADO): 39872413
Failure type: SAI version upgrade and bug fixes
Tested branch
SONiC.202605-29915.1236395-5f61e4af3Broadcom XGS hardware qualification was run on the master image
SONiC.master-29761.1235027-0881a831d(sonic-buildimage build1235027) onArista 7260CX3 switches. Both topologies ran the full 12-script qualification
and passed with zero dataplane failures and zero errors:
testbed-bjw2-can-t0-7260-8), plan6abef745943f09e8e38a8d5d:1195 tests, 253 passed / 942 conditionally skipped / 0 failures / 0 errors.
testbed-bjw2-can-t1-7260-12), plan6abea3bc622441ac54e01442:1195 tests, 430 passed / 765 conditionally skipped / 0 failures / 0 errors.
All 12 modules (crm, vlan, fdb, fib, vxlan_decap, decap, acl, pfcwd,
nhop_group, everflow_testbed, everflow_per_interface, reboot) passed or
benign-skipped on each topology; the skips are topology-gated collection
skips. The previous
15.2.1.0.0.0.23.3hardware results are superseded bythis
26.3qualification. Build1235027was produced from the pre-rebasehead that still carried the
.depsplit; because that split is build-cachemetadata only, the qualified
libsaibcm15.2.1.0.0.0.26.3package isbyte-identical on the pure-bump head. The delivery guard is re-anchored on the
final post-#29930-rebase build before flip.
Update — 202605 backport qualification (PR #29915, sonic-buildimage build
1236395, tested imageSONiC.202605-29915.1236395-5f61e4af3): the full12-script T1 qualification completed green on
testbed-bjw-can-t1-7260-8(plan
6abf8b2250083a6b432da605) — 1214 tests, 447 passed / 767 conditionallyskipped / 0 failures / 0 errors; all 12 modules passed or benign-skipped. On
T0, the same-release baseline smoke (fib, everflow) was clean on
testbed-bjw2-can-t0-7050-2. This confirms the identical15.2.1.0.0.0.26.3XGS package on 202605 matches the green master26.3T0/T1 results above.
Test result
Broadcom XGS
15.2.1.0.0.0.26.3is qualified on master: source provenance,authenticated artifact inventory, cross-family package-safety symbol gates,
public XGS package publication, and XGS T0/T1 hardware qualification on
7260CX3 are all complete and green; the 202605 backport image (build
1236395)also passed the full 12-script T1 qualification green. The build-cache dependency split required
by CI is tracked in PR #29930, which must merge first.
202605: XGS full 12-script T1 qualification green on 7260CX3 (plan
6abf8b2250083a6b432da605, tested imageSONiC.202605-29915.1236395-5f61e4af3) - 1214 tests, 447 passed / 767 conditionally skipped / 0 failures / 0 errors. T0 same-release baseline smoke clean ontestbed-bjw2-can-t0-7050-2.Description for the changelog
[broadcom] Upgrade XGS SAI to 15.2.1.0.0.0.26.3 with the upstream FEC capability reporting, ALPM crash, SerDes TAP validation, and mirrored-packet counter fixes
Link to config_db schema for YANG module changes
N/A - no YANG or config_db schema changes.
A picture of a cute animal (not mandatory but encouraged)
N/A.
Signed-off-by: Aaron Bernardino aaronber@microsoft.com