[code sync] Merge code from sonic-net/sonic-buildimage:202505 to 202506#1612
Merged
mssonicbld merged 29 commits intoAzure:202506from Sep 13, 2025
Merged
[code sync] Merge code from sonic-net/sonic-buildimage:202505 to 202506#1612mssonicbld merged 29 commits intoAzure:202506from
mssonicbld merged 29 commits intoAzure:202506from
Conversation
Collaborator
mssonicbld
commented
Sep 12, 2025
mssonicbld
commented
…lly (#23815) #### Why I did it src/sonic-gnmi ``` * 9e9223d - (HEAD -> 202505, origin/202505) Downgrade Go to 1.19 for SONiC Bookworm FIPS compliance (Azure#497) (5 days ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
Why I did it Fix for faulthandler and fan speed failure. signed-off-by: [email protected]
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_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 Use normal image instead of slim image for small disk device. Docker size would be larger than previous branch. And need to remain at most 800M size for k8s deploy. ##### Work item tracking - Microsoft ADO **(number only)**: - 34433933 #### How I did it Update docker ramfs size from 2500M to 3500M #### How to verify it PR test <!-- 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 - [ ] 202505 #### 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)
…tomatically (#23856) #### Why I did it src/sonic-linux-kernel ``` * 4dda3d6 - (HEAD -> 202505, origin/202505) Add upstream fix for bridge link show failure (Azure#510) (50 minutes ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
… (#23835) #### Why I did it src/dhcpmon ``` * 1da5c92 - (HEAD -> 202505, origin/202505) Fix fail to clear counter in some low performance devices (Azure#50) (4 days ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
…tically (#23830) #### Why I did it src/sonic-sairedis ``` * f32256ec - (HEAD -> 202505, origin/202505) Ignore SAI_TUNNEL_ATTR_ENCAP_TTL_MODE not implemented error during 202411->202505 warm-upgrade (Azure#1651) (5 days ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
<!-- 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 Fix incorrect checking introduced by sonic-net/sonic-buildimage#22337 When invoking prefix_list script in supported roles, the checking function should return rather than exit 0. Exiting 0 would directly terminate the script ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it When invoking prefix_list script in supported roles, the checking function should return rather than exit 0 #### How to verify it Run the script <!-- 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 - [ ] 202505 #### 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)
<!-- 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 This PR is to update [pg_profile_lookup.ini](https://github.com/sonic-net/sonic-buildimage/compare/master...bingwang-ms:add_buffer_pro_100000_500m?expand=1#diff-bb7f3b2bac0a04eee5a3fa4057b6a4793a5aebb3b558be1c57aa2ca6b3bd67c2) to support 100GB link speed and 500m cable length. ##### Work item tracking - Microsoft ADO **34591589**: #### How I did it Update `pg_profile_lookup.ini` to support 100Gb link speed. The buffer configuration is reused from 400Gb link speed. #### How to verify it The change is verified by deploying it on a physical device. <!-- 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] 202505 #### 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. --> Update `pg_profile_lookup.ini` to support 100Gb link speed. #### 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 --> No db schema change #### A picture of a cute animal (not mandatory but encouraged)
…D automatically (#23857) #### Why I did it src/sonic-platform-daemons ``` * 9a2931d - (HEAD -> 202505, origin/202505) Check low power mode before vdm handling (Azure#670) (2 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
…3845) <!-- 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 SAI move Broadcom SDK from 6.5.31 to 6.5.32, it will make switch chip initialization fail on the below Ufispace platforms: S9321-64E S9321-64EO Due to sdk change, 1. 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) 2. We also need to change "flowtracker_flexctr_alloc_enable" from 1 to 2, according to "Tomahawk-5 Hardware based FlowTracker Configuration" (ID:26311) pool manager method will make SDK init fail on 6.5.32. Change it to user allocated method. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Update SDK configuration on both platfoms #### How to verify it Reload config and then check "show interface status" to see if all interfaces is OK after system is ready. Log: S9321-64EO, [TH5_update_yaml_config_test.log](https://github.com/user-attachments/files/21540150/TH5_update_yaml_config_test.log) S9321-64E, TBU <!-- 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 - [ ] 202505 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [X] master #### 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)
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_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 Upgrade xgs SAI version to 13.2.1.2 to include the following fixes: - CS00012420291: Unexpected syncd ERR logs for SAI_API_SWITCH:sai_query_switch_attribute_enum_values_capability - CS00012414366: IN_IF_DISCARDS to exclude PFC/PAUSE - CS00012419713: Skip E2E Port TCG CIR for DNX2 devices ##### Work item tracking - Microsoft ADO **(number only)**: 34648177 #### How I did it Update xgs SAI version in sai.mk. #### How to verify it Load image on SONiC DUT, all containers are running. <!-- 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 --> - [x] 202412 - [x] 202505 Signed-off-by: zitingguo-ms <[email protected]>
Why I did it Add a new leaf, midplane_ipv4, to the DPU_LIST under sonic-smart-switch.yang. This aligns the YANG schema with SmartSwitch NGS/NDM modeling where each DPU advertises an IPv4 address on the midplane for internal control/management connectivity. signed-off-by: [email protected]
…tect.sh script (#23885) <!-- 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 asic_detect.sh script was added in this PR - sonic-net/sonic-buildimage#23458. It uses lspci command, which can be used only if pciutils package is installed. Syncd docker started to use asic_detect.sh script by this PR - sonic-net/sonic-sairedis#1633 So, syncd of Mellanox and nvidia-bluefield must have pciutils installed. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Added pciutils installation in syncd Dockerfile #### How to verify it Make sure pciutils package is installed in Mellanox switch syncd docker <!-- 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 - [ ] 202505 #### 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)
<!-- 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 To support location_type attribute in DEVICE_METADATA. Sample config: ``` "DEVICE_METADATA": { "localhost": { "bgp_asn": "65100", "buffer_model": "traditional", "cloudtype": "Public", "default_bgp_status": "down", "default_pfcwd_status": "enable", "deployment_id": "1", "docker_routing_config_mode": "separated", "hostname": "bjw2-can-7050c-3", "hwsku": "Arista-7050CX3-32C-S128", "location_type": "Edge", "mac": "68:bf:6c:ad:99:30", "platform": "x86_64-arista_7050cx3_32c", "region": "None", "synchronous_mode": "enable", "timezone": "UTC", "type": "MgmtLeafRouter", "yang_config_validation": "disable" } } ``` ##### Work item tracking - Microsoft ADO **(number only)**: 34655035 #### How I did it Update Yang model. #### How to verify it Verified by unit test. <!-- 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] 202505 #### 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)
…y (#23888) #### Why I did it src/linkmgrd ``` * afa62a6 - (HEAD -> 202505, origin/202505) Fix mux port `uninitialized` (Azure#311) (3 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
…lly (#23880) #### Why I did it src/sonic-swss ``` * c0d4be07 - (HEAD -> 202505, origin/202505) Merge pull request #3843 from rajkumar1-arista/temp-disable-bulk-req-for-port-cntrs (5 minutes ago) [Jianquan Ye] |\ | failure_prs.log skip_prs.log 354a6313 - minor comment corrections (8 days ago) [rajkumar1] | failure_prs.log skip_prs.log 6720e69f - minor comment corrections (11 days ago) [rajkumar1] | failure_prs.log skip_prs.log a18ffeec - Disable bulk requests for PORT counters (12 days ago) [rajkumar1] * f5c6e021 - [Mux] Clear bulkers when rolling back mux switchover (#3855) (4 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
…CX3-32C-C28S16 (#23895) <!-- 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 This is the issue tracked in https://github.com/aristanetworks/sonic-qual.msft/issues/701 ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it This PR fixes this issue by fixing the configuration of `Arista-7050CX3-32S-C28S16` and `Arista-7050CX3-32C-C28S16`, based on the configuration of other HWSKUs for the same platforms. #### How to verify it Verified the `routeCheck` is OK with this change, e.g. ``` Monit 5.20.0 uptime: 3h 59m Program 'routeCheck' status Status ok monitoring status Waiting monitoring mode active on reboot start last exit value 0 last output - data collected Thu, 28 Aug 2025 16:28:50 ``` <!-- 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] 202505 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [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: --> <!-- 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)
…utomatically (#23899) #### Why I did it src/sonic-host-services ``` * bf1eb69 - (HEAD -> 202505, origin/202505) [202505] Backport: [reboot-cause] Use UTC to ensure consistent sorting (Azure#303) (4 minutes ago) [Jianyue Wu] ``` #### How I did it #### How to verify it #### Description for the changelog
…D automatically (#23896) #### Why I did it src/sonic-platform-daemons ``` * 77c70bd - (HEAD -> 202505, origin/202505) xcvrd: gate config publish on syncd.restore_count = 1 (instead of system warm-reboot flag) to prevent post-warm-reboot port flaps (Azure#671) (18 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
…atically (#23905) #### Why I did it src/sonic-utilities ``` * 1761a749 - (HEAD -> 202505, origin/202505) [spm] Rename entry tag variable to docker_image_reference (#4050) (2 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
…D automatically (#23915) #### Why I did it src/sonic-platform-daemons ``` * c5e545e - (HEAD -> 202505, origin/202505) [202505] [xcvrd] Improve logging in case of unable to find appropriate match for optic SI settings (Azure#672) (Azure#673) (38 minutes ago) [mihirpat1] ``` #### How I did it #### How to verify it #### Description for the changelog
…D automatically (#23921) #### Why I did it src/sonic-platform-daemons ``` * 1db213b - (HEAD -> 202505, origin/202505) Revert "xcvrd: gate config publish on syncd.restore_count = 1 (instead of sys…" (Azure#675) (4 minutes ago) [Jianquan Ye] ``` #### How I did it #### How to verify it #### Description for the changelog
<!-- 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 Upgrade xgs SAI version to 13.2.1.3 to include the following fix: - [CS00012421016/CS00012421247]: bypass returning error log and error code for accessing trim disabled queue. Sonic currently doesnot have means to avoid accessing invalid trim queues and customer wants to return zero as value of counter. Added the bypass logic under a feat logic. ##### Work item tracking - Microsoft ADO **(number only)**: 34764822 #### How I did it Update sai.mk file. #### How to verify it Signed-off-by: zitingguo-ms <[email protected]>
…D automatically (#23929) #### Why I did it src/sonic-platform-daemons ``` * f661d74 - (HEAD -> 202505, origin/202505) pulling into 202505 (Azure#677) (35 minutes ago) [Gregory Boudreau] ``` #### How I did it #### How to verify it #### Description for the changelog
…ght and dark modes (#23935) <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_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 The `show platform pcieinfo -c` command fails for Mellanox smartswitch platforms on all DPU power off. This is because the PCIE devices relevant to the DPUs are removed on power off / reboot. During this time there is a state db entry added to indicate that the DPU is being powered off. So we are querying this information to indicate whether the DPU relevant PCIE devices are present or not, if the PCIE devices are not present, and they are relevant for the DPU, we remove the entry from the pcie devices being checked ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Changed pcie.py platform specific implementation to remove the entries relevant to PCIE when it detects the `PCIE_DETACH_INFO` fields in state db. If these keys are detected with the right dpu_state. We do not append these entries to the returned configuration info #### How to verify it Unit test results: ``` tests/test_pcie.py::TestPcie::test_get_pcie_check PASSED [ 20%] tests/test_pcie.py::TestPcie::test_get_pcie_check_bluefield_detaching PASSED [ 40%] tests/test_pcie.py::TestPcie::test_get_pcie_check_bluefield_not_detaching PASSED [ 60%] tests/test_pcie.py::TestPcie::test_get_pcie_check_bluefield_db_error PASSED [ 80%] tests/test_pcie.py::TestPcie::test_create_device_id_to_bus_map PASSED [100%] ``` Before fix the failure is detected on DPU Power Off: ``` root@sonic:/usr# show platform pcieinfo -c | grep Failed PCI Device: Ethernet controller: Mellanox Technologies MT43244 BlueField-3 integrated ConnectX-7 network controller (rev 01) [Failed] PCI Device: DMA controller: Mellanox Technologies MT43244 BlueField-3 SoC Management Interface (rev 01) [Failed] PCI Device: Ethernet controller: Mellanox Technologies MT43244 BlueField-3 integrated ConnectX-7 network controller (rev 01) [Failed] PCI Device: DMA controller: Mellanox Technologies MT43244 BlueField-3 SoC Management Interface (rev 01) [Failed] PCI Device: Ethernet controller: Mellanox Technologies MT43244 BlueField-3 integrated ConnectX-7 network controller (rev 01) [Failed] PCI Device: DMA controller: Mellanox Technologies MT43244 BlueField-3 SoC Management Interface (rev 01) [Failed] PCI Device: Ethernet controller: Mellanox Technologies MT43244 BlueField-3 integrated ConnectX-7 network controller (rev 01) [Failed] PCI Device: DMA controller: Mellanox Technologies MT43244 BlueField-3 SoC Management Interface (rev 01) [Failed] ``` After fix ``` root@sonic:/usr# show platform pcieinfo -c | grep Failed root@sonic:/usr# ``` <!-- 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] 202505 #### 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)
…ia_settings.json` (#23942) Workaround for sonic-net/sonic-buildimage#21902 SWSS startup causes APPL_DB to be flushed. This results in `PORT_TABLE:Ethernet#` losing it's media_settings tunings populated by XCVRD. Without this change (tuning lost): ``` sonic-db-cli -n asic0 APPL_DB hgetall "PORT_TABLE:Ethernet96" {'alias': 'Ethernet13/1', 'asic_port_name': 'Eth96', 'core_id': '0', 'core_port_id': '13', 'index': '13', 'lanes': '40,41,42,43', 'num_voq': '8', 'role': 'Ext', 'speed': '100000', 'admin_status': 'up', 'description': 'ARISTA13T3:Ethernet1', 'fec': 'none', 'mtu': '9100', 'pfc_asym': 'off', 'tpid': '0x8100', 'oper_stat us': 'up', 'flap_count': '1', 'main': '0x4e,0x4e,0x53,0x4b', 'post1': '0xffffffea,0xffffffea,0xffffffea,0xffffffec', 'post2': '0x0,0x0,0x0,0x0', 'post3': '0x0,0x0,0x0,0x0', 'pre1': '0xfffffffb,0xfffffffb,0xfffffffb,0xfffffffb', 'pre2': '0x0,0x0,0x0,0x0', 'last_up_time': 'Thu Apr 03 16:32:03 2025'} systemctl restart [email protected] sonic-db-cli -n asic0 APPL_DB hgetall "PORT_TABLE:Ethernet96" {'alias': 'Ethernet13/1', 'asic_port_name': 'Eth96', 'core_id': '0', 'core_port_id': '13', 'index': '13', 'lanes': '40,41,42,43', 'num_voq': '8', 'role': 'Ext', 'speed': '100000', 'admin_status': 'up', 'description': 'ARISTA13T3:Ethernet1', 'fec': 'none', 'mtu': '9100', 'pfc_asym': 'off', 'tpid': '0x8100', 'oper_stat us': 'up', 'flap_count': '1', 'last_up_time': 'Thu Apr 03 17:41:08 2025'} ``` With this change (tuning preserved): ``` sonic-db-cli -n asic0 APPL_DB hgetall "PORT_TABLE:Ethernet96" {'alias': 'Ethernet13/1', 'asic_port_name': 'Eth96', 'core_id': '0', 'core_port_id': '13', 'index': '13', 'lanes': '40,41,42,43', 'num_voq': '8', 'role': 'Ext', 'speed': '100000', 'admin_status': 'up', 'description': 'ARISTA13T3:Ethernet1', 'fec': 'none', 'mtu': '9100', 'pfc_asym': 'off', 'tpid': '0x8100', 'oper_stat us': 'up', 'flap_count': '1', 'main': '0x4e,0x4e,0x53,0x4b', 'post1': '0xffffffea,0xffffffea,0xffffffea,0xffffffec', 'post2': '0x0,0x0,0x0,0x0', 'post3': '0x0,0x0,0x0,0x0', 'pre1': '0xfffffffb,0xfffffffb,0xfffffffb,0xfffffffb', 'pre2': '0x0,0x0,0x0,0x0', 'last_up_time': 'Thu Apr 03 16:32:03 2025'} systemctl restart [email protected] sonic-db-cli -n asic0 APPL_DB hgetall "PORT_TABLE:Ethernet96" {'alias': 'Ethernet13/1', 'asic_port_name': 'Eth96', 'core_id': '0', 'core_port_id': '13', 'index': '13', 'lanes': '40,41,42,43', 'num_voq': '8', 'role': 'Ext', 'speed': '100000', 'admin_status': 'up', 'description': 'ARISTA13T3:Ethernet1', 'fec': 'none', 'mtu': '9100', 'pfc_asym': 'off', 'tpid': '0x8100', 'oper_stat us': 'up', 'flap_count': '1', 'main': '0x4e,0x4e,0x53,0x4b', 'post1': '0xffffffea,0xffffffea,0xffffffea,0xffffffec', 'post2': '0x0,0x0,0x0,0x0', 'post3': '0x0,0x0,0x0,0x0', 'pre1': '0xfffffffb,0xfffffffb,0xfffffffb,0xfffffffb', 'pre2': '0x0,0x0,0x0,0x0', 'last_up_time': 'Fri Apr 04 17:12:59 2025'} ``` I also see the message in syslog that xcvrd is restarted right after the dbs are flushed: ``` NOTICE root: Chassis db clean up for swss0. Number of SYSTEM_LAG_TABLE entries deleted: 2 NOTICE root: Restarting pmon service... NOTICE pmon#xcvrd[5016]: Stop daemon main loop INFO pmon#supervisord 2025-07-11 20:27:09,608 INFO waiting for xcvrd to stop NOTICE pmon#xcvrd[5016]: CMIS: Stopped NOTICE pmon#DomInfoUpdateTask[5016]: Stop event generated during DOM monitoring loop NOTICE pmon#DomInfoUpdateTask[5016]: Stop DOM monitoring loop NOTICE pmon#python3: :- ~RedisPipeline: RedisPipeline dtor is called from another thread, possibly due to exit(), Database: STATE_DB NOTICE pmon#python3: message repeated 7 times: [ :- ~RedisPipeline: RedisPipeline dtor is called from another thread, possibly due to exit(), Database: STATE_DB] NOTICE pmon#python3: :- ~RedisPipeline: RedisPipeline dtor is called from another thread, possibly due to exit(), Database: APPL_DB NOTICE pmon#python3: :- ~RedisPipeline: RedisPipeline dtor is called from another thread, possibly due to exit(), Database: APPL_DB NOTICE pmon#python3: :- ~RedisPipeline: RedisPipeline dtor is called from another thread, possibly due to exit(), Database: CONFIG_DB NOTICE pmon#python3: :- ~RedisPipeline: RedisPipeline dtor is called from another thread, possibly due to exit(), Database: CONFIG_DB NOTICE pmon#python3: :- ~RedisPipeline: RedisPipeline dtor is called from another thread, possibly due to exit(), Database: STATE_DB NOTICE pmon#python3: message repeated 65 times: [ :- ~RedisPipeline: RedisPipeline dtor is called from another thread, possibly due to exit(), Database: STATE_DB] NOTICE pmon#python3: :- ~RedisPipeline: RedisPipeline dtor is called from another thread, possibly due to exit(), Database: CONFIG_DB NOTICE pmon#python3: :- ~RedisPipeline: RedisPipeline dtor is called from another thread, possibly due to exit(), Database: STATE_DB INFO pmon#supervisord 2025-07-11 20:27:11,572 INFO stopped: xcvrd (exit status 0) INFO pmon#supervisord 2025-07-11 20:27:11,575 INFO spawned: 'xcvrd' with pid 5069 NOTICE pmon#xcvrd[5069]: Starting up... NOTICE pmon#xcvrd[5069]: XCVRD INIT: Start daemon init... NOTICE pmon#xcvrd[5069]: XCVRD INIT: Wait for port config is done INFO pmon#supervisord 2025-07-11 20:27:21,590 INFO success: xcvrd entered RUNNING state, process has stayed up for > than 10 seconds (startsecs) INFO swss.sh[747370]: xcvrd: stopped INFO swss.sh[747370]: xcvrd: started ``` #### 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 - [ ] 202305 - [x] msft-202503
#### Why I did it New prober_type harware is being added to linkmgrd. This is config knob yang addition for the specific field in mUX_CABLE ##### 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 - [ ] 202305 #### 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)
…D automatically (#23959) #### Why I did it src/sonic-platform-daemons ``` * c0b9ec6 - (HEAD -> 202505, origin/202505) Handle restore_count and system_enable ”NoneType“ value scenario. (Azure#680) (6 hours ago) [ryanzhu706] ``` #### How I did it #### How to verify it #### Description for the changelog
Collaborator
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
prabhataravind
approved these changes
Sep 12, 2025
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
02f77b1 to
9b8a22d
Compare
Collaborator
Author
|
/azp run |
|
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. |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
bingwang-ms
pushed a commit
that referenced
this pull request
Jan 16, 2026
…tically (#23031) #### Why I did it src/sonic-sairedis ``` * 7db7cefd - (HEAD -> master, origin/master, origin/HEAD) [ci] Increase timeout when building swss (#1612) (18 hours ago) [Liu Shilong] * 03bdb351 - [TAM]: Add default SAI_TAM_ATTR_TELEMETRY_OBJECTS_LIST of TAM for saivs create operation (#1614) (3 days ago) [Ze Gan] ``` #### How I did it #### How to verify it #### Description for the changelog
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.