[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#160
Closed
mssonicbld wants to merge 25 commits intoAzure:202305from
Closed
[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#160mssonicbld wants to merge 25 commits intoAzure:202305from
mssonicbld wants to merge 25 commits intoAzure:202305from
Conversation
Collaborator
mssonicbld
commented
Nov 24, 2023
mssonicbld
commented
…tomatically (#17208) #### Why I did it src/sonic-linux-kernel ``` * f086121 - (HEAD -> 202305, origin/202305) Intgerate HW-MGMT 7.0030.2008 Changes (Azure#361) (12 hours ago) [Vivek] * 7551dd9 - arm64: Enable CONFIG_KEXEC_FILE (Azure#360) (13 hours ago) [Pavan Naregundi] ``` #### How I did it #### How to verify it #### Description for the changelog
…bors over iBGP Session (#16705) What I did: Enable Sending BGP Community over internal neighbors over iBGP Session Microsoft ADO: 25268695 Why I did: Without this change BGP community send by e-BGP Peers are not carry-forward to other e-BGP peers. str2-xxxx-lc1-2# show bgp ipv6 20c0:a801::/64 BGP routing table entry for 20c0:a801::/64, version 52141 Paths: (1 available, best Azure#1, table default) Not advertised to any peer 65000 65500 2603:10e2:400::6 from 2603:10e2:400::6 (3.3.3.6) Origin IGP, localpref 100, valid, internal, best (First path received) Last update: Tue Sep 26 16:08:26 2023 str2-xxxx-lc1-2# show ip bgp 192.168.35.128/25 BGP routing table entry for 192.168.35.128/25, version 52688 Paths: (1 available, best Azure#1, table default) Not advertised to any peer 65000 65502 3.3.3.6 from 3.3.3.6 (3.3.3.6) Origin IGP, localpref 100, valid, internal, best (First path received) Last update: Tue Sep 26 15:45:51 2023 After the change str2-xxxx-lc2-2(config)# router bgp 65100 str2-xxxx-lc2-2(config-router)# address-family ipv4 str2-xxxx-lc2-2(config-router-af)# neighbor INTERNAL_PEER_V4 send-community str2-xxxx-lc2-2(config-router-af)# exit str2-xxxx-lc2-2(config-router)# address-family ipv6 str2-xxxx-lc2-2(config-router-af)# neighbor INTERNAL_PEER_V6 send-community str2-xxxx-lc1-2# show bgp ipv6 20c0:a801::/64 BGP routing table entry for 20c0:a801::/64, version 52400 Paths: (1 available, best Azure#1, table default) Not advertised to any peer 65000 65500 2603:10e2:400::6 from 2603:10e2:400::6 (3.3.3.6) Origin IGP, localpref 100, valid, internal, best (First path received) **Community: 1111:1111** Last update: Tue Sep 26 16:10:19 2023 str2-xxxx-lc1-2# show ip bgp 192.168.35.128/25 BGP routing table entry for 192.168.35.128/25, version 52947 Paths: (1 available, best Azure#1, table default) Not advertised to any peer 65000 65502 3.3.3.6 from 3.3.3.6 (3.3.3.6) Origin IGP, localpref 100, valid, internal, best (First path received) **Community: 1111:1111** Last update: Tue Sep 26 16:10:09 2023 Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
…to reduce the CPU usage (#16790) (#17224)
…rs. (#16466) (#17222)
…supervisor. (#16505) (#17223)
…atically (#17226)
…atically (#17233)
…tomatically (#17231) #### Why I did it src/sonic-linux-kernel ``` * 6ff3cc2 - (HEAD -> 202305, origin/202305) arm64: Kconfig inclusions to fix PCI hang and MTD detection (Azure#362) (2 days ago) [Pavan Naregundi] ``` #### How I did it #### How to verify it #### Description for the changelog
…utomatically (#17229) #### Why I did it src/sonic-host-services ``` * 689395a - (HEAD -> 202305, origin/202305) Updated the iptable rule to use parent/base name of midplane interface of chassis. (Azure#75) (2 days ago) [abdosi] * 45212a8 - [DualToR][caclmgrd] Fix IPtables rules for multiple vlan interfaces for DualToR config (Azure#82) (2 days ago) [vdahiya12] ``` #### How I did it #### How to verify it #### Description for the changelog
…atically (#17250) #### Why I did it src/sonic-utilities ``` * 2b6b6580 - (HEAD -> 202305, origin/202305) Added support to display only nonzero queue counter. (#2978) (#3046) (15 hours ago) [abdosi] ``` #### How I did it #### How to verify it #### Description for the changelog
* [chassis/multi-asic] Make sure iBGP session established as directly connected (#16777) What I did: Make Sure for internal iBGP we are one-hop away (directly connected) by using Generic TTL security mechanism. Why I did: Without this change it's possible on packet chassis i-BGP can be established even if there no direct connection. Below is the example - Let's say we have 3 LC's LC1/LC2/LC3 each having i-BGP session session with each other over Loopback4096 - Each LC's have static route towards other LC's Loopback4096 to establish i-BGP session - LC1 learn default route 0.0.0.0/0 from it's e-BGP peers and send it over to LC2 and LC3 over i-BGP - Now for some reason on LC2 static route towards LC3 is removed/not-present/some-issue we expect i-BGP session should go down between LC2 and LC3 - However i-BGP between LC2 and LC3 does not go down because of feature ip nht-resolve-via-default where LC2 will use default route to reach Loopback4096 of LC3. As it's using default route BGP packets from LC2 towards LC3 will first route to LC1 and then go to LC3 from there. Above scenario can result in packet mis-forwarding on data plane How I fixed it:- To make sure BGP packets between i-BGP peers are not going with extra routing hop enable using GTSM feature neighbor PEER ttl-security hops NUMBER This command enforces Generalized TTL Security Mechanism (GTSM), as specified in RFC 5082. With this command, only neighbors that are the specified number of hops away will be allowed to become neighbors. This command is mutually exclusive with ebgp-multihop. We set hop count as 1 which makes FRR to reject BGP connection if we receive BGP packets if it's TTL < 255. Also setting this attribute make sure i-BGP frames are originated with IP TTL of 255. How I verify: Manual Verification of above scenario. See blow BGP packets receive with IP TTL 254 (additional routing hop) we are seeing FIN TCP flags as BGP is rejecting the connection Signed-off-by: Abhishek Dosi <abdosi@microsoft.com> * Update peer-group.conf.j2 * Update result_all.conf * Update result_base.conf --------- Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
This reverts commit f2a495f.
Change DHCP rate limit in SONiC copp configuration to 100 PPS as this is necessary to ensure that DHCP flood does not cause LACP/BGP flaps in all scenarios This is an extension to the change in image_config: copp: Enable rate limiting for bgp, lacp, dhcp, lldp, macsec and udld #14859 and sonic-mgmt change in [tests/copp]: Update copp mgmt tests to support new rate-limits sonic-mgmt#8199 Why I did it 300 PPS is not sufficient to prevent LACP/BGP flaps in all cases. 100 PPS seems to provide better resiliency against DHCP traffic flood to CPU. Microsoft ADO 25776614: Send DHCP broadcast packets to DUT and verify that they are trapped to CPU at 100 PPS. Signed-off-by: Prabhat Aravind <paravind@microsoft.com>
…7184) * [FRR]Fixing zebra to handle non notification of better admin won * Updating the patch with latest changes from FRR
* [pmon] update gRPC version to 1.57.0 (#16257) Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> * fix conflict Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com> --------- Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>
… without reboot (#17092) (#17286)
Why I did it Need to share docker image for telemetry and gnmi, and only use telemetry container for 202305 branch Work item tracking Microsoft ADO (number only): How I did it Add a new docker image, base-gnmi, build sonic-gnmi and sonic-telemetry on this docker image. Enable telemetry container. How to verify it Run end to end test for telemetry and gnmi.
…282) ### Why I did it The json.hpp header file from that package is used in the sonic-swss-common build. An old version of that header file (from 2016) has been checked into the sonic-swss-common repo. However, since then, there have been changes to that header file, and starting with GCC 12 in Bookworm, generates some errors about variables being possibly uninitialized before use. ##### Work item tracking - Microsoft ADO **(number only)**: 25027439 #### How I did it To fix this, install the nlohmann-json3-dev package, and allow using the header file from the Debian package instead of a static checked-in version. The version in Debian Bullseye is much newer than this version. #### How to verify it With this change alone, sonic-swss-common will still be using the json.hpp file in its own codebase. The change to actually use the system header file instead of the local header file will happen in a separate PR in the necessary repoes. Co-authored-by: Saikrishna Arcot <sarcot@microsoft.com>
Why I did it Release Notes for Cisco 8111-32EH-O and 8102-64H Fix for "Failed to get port by bridge port ID" error (MIGSMSFT-354) Added CLI to enable trap events (MIGSMSFT-166) Support to add critical message upon replace device SAI notification Added support for input voltage/current/power info for PSUs Added support for sff_mgr for deterministic bringup of SFF compliant modules IOFPGA fix to support optics port in low power mode on 8101-32FH-O Enable CMIS Manager for 8111-32EH-O Added dump option to “show plat npu mac-state” CLI to dump MAC state info Added media-based NPU serdes attributes for Credo 800G AEC Y-cables from media_settings.json Auto FPD support for power CPLD on 8101 and 8111 platforms Caveats: Validation on 8101-32FH-O still pending. Will update release notes once completed. Below 8800 platform specific fixes included but 8800 support not claimed in this code drop Interop fix for BFD and Fair VOQ Fix to update voq cgm profile during port speed change event Create ECN profiles based on port speeds dynamically Work item tracking Microsoft ADO (number only): How I did it How to verify it
mssonicbld
requested review from
StormLiangMS,
lguohan,
qiluo-msft and
xumia
as code owners
mssonicbld
added a commit
that referenced
this pull request
Mar 26, 2025
…atically (#949) #### Why I did it src/sonic-utilities ``` * a9fb9ca5 - (HEAD -> 202412, origin/202412) Merge pull request #160 from mssonicbld/sonicbld/202412-merge (21 hours ago) [mssonicbld] * 235bd658 - Merge branch '202411' of https://github.com/sonic-net/sonic-utilities into 202412 (23 hours ago) [Sonic Automation] * 3cfd9a68 - Fixed the issues with sonic-clear queuecounter for egress queue and voq (#3816) (33 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
theasianpianist
added a commit
that referenced
this pull request
Feb 17, 2026
<!--
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
```
* d279a66 - (HEAD -> 202506, origin/202506) [202506 gnmi cherry pick/dpu upstream (#159) (14 hours ago) [Prince Sunny]
* a0e898d - just to rerun pipeline (3 days ago) [Dawei Huang]
* 3bf204b - [action] [PR:563] [ssw][ha] use ProducerStateTable for DASH_HA_ tables. (#160) (8 days ago) [mssonicbld]
* 7428f00 - Add independent DPU upgrade support via gNOI streaming operations (#532) (10 days ago) [Dawei Huang]
* 1556ccc - gNOI Debug Service Implementation (#524) (10 days ago) [Dawei Huang]
* cf09c56 - Implement gNOI File.TransferToRemote with HTTP and MD5 support (#521) (10 days ago) [Dawei Huang]
* a6eb6cf - Fix pure.mk CI and add early validation to Azure pipeline (#529) (10 days ago) [Dawei Huang]
* 5f27f62 - Implements complete firmware file listing through gNMI interface with… (#523) (10 days ago) [Dawei Huang]
* e2e34d7 - Add support for gNOI File Services (#406) (2 weeks ago) [Dawei Huang]
* c2bb88e - [action] [PR:516] Add operational handler with disk space query (#151) (2 weeks ago) [mssonicbld]
```
##### 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
#### 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)
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
8 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.