Skip to content

auto cherry-pick 19 into 202111#22

Closed
liushilongbuaa wants to merge 1 commit into202111from
19-202111
Closed

auto cherry-pick 19 into 202111#22
liushilongbuaa wants to merge 1 commit into202111from
19-202111

Conversation

@liushilongbuaa
Copy link
Copy Markdown
Owner

No description provided.

liushilongbuaa pushed a commit that referenced this pull request Nov 11, 2022
ce72b0d Longxiang Lyu Thu Feb 24 06:05:12 2022 Put handler member functions as virtual in base (#30)
ef59e4f Jing Zhang Fri Feb 25 11:38:28 2022 Incrementing tolerance on mux state inconsistency (#27)
2d12892 Longxiang Lyu Wed Feb 16 03:32:06 2022 Rename LinkManagerStateMachine to ActiveStandbyStateMachine (#26)
f38634c Jing Zhang Thu Feb 17 17:23:56 2022 Update log level for mux probing and mux state chance (#23)
a8434dd Jing Zhang Thu Feb 17 17:21:01 2022 Handle xcvrd crashing scenarios (#22)
2ebdb2b Longxiang Lyu Mon Feb 14 13:26:07 2022 [make] Enable make extra includes (#24)
liushilongbuaa pushed a commit that referenced this pull request Dec 19, 2022
Added below commits:
9b30690 jcaiMR Fri Dec 16 fix handleSwssNotification crash in dhcp6relay (#28)
047afb7 jcaiMR Wed Dec 14 14:08:58 2022 +0800 Fix multiple vlan issue (#27)
ff6bec3 Vivek Thu Dec 8 09:44:15 2022 -0800 Made the Error log informative (#22)
2fbe729 jcaiMR Wed Nov 30 14:41:53 2022 +0800 disable cfg dynamic change (#25)
13d0805 Liu Shilong Wed Nov 30 10:54:11 2022 +0800 Use github code scanning instead of LGTM (#26)
1e846f6 kellyyeh Wed Nov 23 14:36:02 2022 -0800 Fix packet range check for relay-reply packets (#21)
4d19e13 kellyyeh Thu Nov 17 10:04:53 2022 -0800 Add unittest infrastructure (#5)
7f4fdab jcaiMR Fri Nov 11 14:47:51 2022 +0800 fix packet range check issue (#20)
257ecdf kellyyeh Thu Nov 3 11:34:11 2022 -0700 Add client packet UDP header length check (#19)
liushilongbuaa pushed a commit that referenced this pull request Feb 9, 2023


advance dhcp relay for 202211

4bf1868 - (HEAD, origin/master, origin/HEAD, master) fix relay-reply dhcpv6 packet counter issue (add support for a7050 qx32 platform #29) (2 weeks ago) [jcaiMR]
9b30690 - fix handleSwssNotification crash in dhcp6relay (Add libnl-nf-3-200 to docker-team #28) (4 weeks ago) [jcaiMR]
047afb7 - Fix multiple vlan issue (Failure trying to run: chroot /sonic-buildimage/fsroot mount -t proc proc /proc #27) (4 weeks ago) [jcaiMR]
ff6bec3 - Made the Error log informative (add python-tenjin as build dependency for p4-switch #22) (5 weeks ago) [Vivek]
2fbe729 - disable cfg dynamic change (p4: fix build dependency for python-p4c-bm #25) (6 weeks ago) [jcaiMR]
13d0805 - Use github code scanning instead of LGTM (Removed sx-libnl from Mellanox containers dependencies. #26) (6 weeks ago) [Liu Shilong]
1e846f6 - Fix packet range check for relay-reply packets (update sonic-swss and p4-switch submodule to fix docker sonic p4 bug #21) (7 weeks ago) [kellyyeh]
4d19e13 - Add unittest infrastructure (Cavium customization for docker containers #5) (8 weeks ago) [kellyyeh]
7f4fdab - fix packet range check issue (Makefile: add build dependency for python-p4c-bm #20) (9 weeks ago) [jcaiMR]
257ecdf - Add client packet UDP header length check (change port_config.ini directory for s6000 #19) (2 months ago) [kellyyeh]
liushilongbuaa pushed a commit that referenced this pull request Feb 9, 2023
Why I did it
Advance sonic-dhcp-relay submodule head on 202012 branch

How I did it
Added the following commits:
a4b15d8 jcaiMR Thu Dec 29 14:18:28 2022 +0800 fix relay-reply dhcpv6 packet counter issue (#29)
677543f jcaiMR Sat Dec 17 00:24:32 2022 +0800 fix handleSwssNotification crash in dhcp6relay (#28)
ed86546 jcaiMR Wed Dec 14 14:08:58 2022 +0800 Fix multiple vlan issue (#27)
5ec1f5b Vivek Thu Dec 8 09:44:15 2022 -0800 Made the Error log informative (#22)
063d41b jcaiMR Wed Nov 30 14:41:53 2022 +0800 disable cfg dynamic change (#25)
d4a51f6 kellyyeh Tue Jan 31 18:09:08 2023 -0800 Add unittest infrastructure (#5) (#31)

How to verify it
Ran full dhcpv6 test suite on lab device
liushilongbuaa pushed a commit that referenced this pull request Oct 31, 2023
Update the sonic-pins submodule. This brings in the following commit:

56a7762 Use json.hpp from nlohmann-json-dev instead of from swss-common (#22)

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
liushilongbuaa pushed a commit that referenced this pull request Jul 3, 2024
…sonic-net#19155)

#### Why I did it
src/dhcpmon
```
* 099e148 - (HEAD -> 202311, origin/202311) Merge pull request #22 from yaqiangz/202311_cherry_pick (2 hours ago) [Ying Xie]
* efff8a9 - Fix revert (#21) (2 hours ago) [kellyyeh]
* 617066f - Revert DHCP Counter (#20) (2 hours ago) [kellyyeh]
```
#### How I did it
#### How to verify it
#### Description for the changelog
liushilongbuaa pushed a commit that referenced this pull request Feb 18, 2025
* Update to Linux kernel 5.10.218

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

* [202311] [5.10.218] Integrate HW-MGMT 7.0030.4104 Changes (#22)

* Integrate HW-MGMT 7.0030.4103 Changes

 ## Patch List
* 0098-2-Revert-mlxsw-i2c-Fix-chunk-size-setting.patch :
* 0241-DS-mlxsw-core_linecards-Disable-firmware-bundling-ma.patch :
* 0244-mlxsw-Use-u16-for-local_port-field-instead-of-u8.patch : torvalds/linux@c934757d9000
* 0245-mlxsw-minimal-Change-type-for-local-port.patch :
* 0246-mlxsw-i2c-Fix-chunk-size-setting-in-output-mailbox-b.patch :
* 0257-mlxsw-core_hwmon-Align-modules-label-name-assignment.patch :
* 0259-mlxsw-i2c-Limit-single-transaction-buffer-size.patch :
* 0260-mlxsw-reg-Limit-MTBR-register-records-buffer-by-one-.patch :
* 0269-dt-bindings-trivial-devices-Add-infineon-xdpe1a2g7.patch :
* 0270-leds-mlxreg-Add-support-for-new-flavour-of-capabilit.patch :
* 0271-leds-mlxreg-Remove-code-for-amber-LED-colour.patch :
* 0272-platform_data-mlxreg-Add-capability-bit-and-mask-fie.patch :
* 0273-hwmon-mlxreg-fan-Add-support-for-new-flavour-of-capa.patch :
* 0274-hwmon-mlxreg-fan-Extend-number-of-supporetd-fans.patch :
* 0281-platform-mellanox-Introduce-support-for-switches-equ.patch :
* 0282-mellanox-Relocate-mlx-platform-driver.patch :
* 0290-platform-mellanox-mlxreg-hotplug-Add-support-for-new.patch :
* 0291-platform-mellanox-mlx-platform-Change-register-name.patch :
* 0292-platform-mellanox-mlx-platform-Add-support-for-new-X.patch :
* 0294-mlxsw-i2c-Downstream-Add-retry-mechanism-for-failed-.patch :
* 0295-mlxsw-i2c-DBG-Add-debug-output-for-failed-transactio.patch :
* 0296-platform-mellanox-indicate-deferred-I2C-bus-creation.patch :
* 0298-platform-mellanox-mlx-platform-Fix-FAN-tacho-reading.patch :

* Integrate HW-MGMT 7.0030.4104 Changes

* [sflow]: Enable linux capabilities on sflow container for kernel 5.10.218 compatibility

In 5.10.218, Kernel mandates the process to have SYS_ADMIN/NET_ADMIN capability to join events/packets multicast group respectively
PSAMPLE used packets and DROPMON uses events

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
Co-authored-by: Vivek <vivekreddykarri98@gmail.com>
mssonicbld pushed a commit that referenced this pull request Jun 9, 2025
Why I did it
This updates the kernel to 6.1.123 to bring in bug and security fixes. This also includes a submodule update for sonic-linux-kernel and platform/broadcom/saibcm-modules-dnx.

sonic-linux-kernel:

aec83ae Update to Linux 6.1.123 (sonic-net#454)
platform/broadom/saibcm-modules-dnx:

13a2b7a Update to Linux 6.1.123 (#22)
This also includes a hw-mgmt update for Mellanox platforms.

Work item tracking
Microsoft ADO (number only): 32198326

How to verify it
Verified that KVM and a physical device boots up, and verified that warm reboot of physical device works.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
Co-authored-by: Vivek <vivekreddykarri98@gmail.com>
liushilongbuaa pushed a commit that referenced this pull request Jul 7, 2025
…t back to back Paladin ports up with Arista-7060X6-16PE-384C-O128S2 (sonic-net#22719)

<!--
 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

Currently when we loaded HWSKU `Arista-7060X6-16PE-384C-O128S2` on two moby devices and connect their Paladin ports back to back, we can't get link up. It may help if we can get these links up and run the tests.

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

#### How I did it

Created a new `FANOUT` HWSKU containing special lanemap and polarity configs so that we can load `Arista-7060X6-16PE-384C-O128S2` on one Moby and `Arista-7060X6-16PE-384C-O128S2-FANOUT` and get Paladin ports up when connecting them back to back with the following setup:
```
Moby1 Moby2
HWSKU: Arista-7060X6-16PE-384C-O128S2 HWSKU: Arista-7060X6-16PE-384C-O128S2-FANOUT
#17 <-> #18
#19 <-> #20
#21 <-> #22
#23 <-> #24

#18 <-> #17
#20 <-> #19
#22 <-> #21
#24 <-> #23
```

#### How to verify it
Verified that all the Paladin ports can link up with the above setup.

<!--
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
- [x] msft-202412

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

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->
- [x] msft-202412

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
Created `Arista-7060X6-16PE-384C-O128S2-FANOUT` based on `Arista-7060X6-16PE-384C-O128S2` and only update lanemap and polarity settings in bcm config.

<!--
 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)
liushilongbuaa pushed a commit that referenced this pull request Jul 7, 2025
* Update the kernel to 6.1.123 (sonic-net#21711)

Why I did it
This updates the kernel to 6.1.123 to bring in bug and security fixes. This also includes a submodule update for sonic-linux-kernel and platform/broadcom/saibcm-modules-dnx.

sonic-linux-kernel:

aec83ae Update to Linux 6.1.123 (sonic-net#454)
platform/broadom/saibcm-modules-dnx:

13a2b7a Update to Linux 6.1.123 (#22)
This also includes a hw-mgmt update for Mellanox platforms.

Work item tracking
Microsoft ADO (number only): 32198326

How to verify it
Verified that KVM and a physical device boots up, and verified that warm reboot of physical device works.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
Co-authored-by: Vivek <vivekreddykarri98@gmail.com>

* Fix submodule hash to point to 202505 branch

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

---------

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
Co-authored-by: Vivek <vivekreddykarri98@gmail.com>
liushilongbuaa pushed a commit that referenced this pull request Jul 8, 2025
…tically (sonic-net#19550)

#### Why I did it
src/sonic-dash-api
```
* 1fd0b7d - (HEAD -> 202405, origin/202405) [202405 build] Update pool sonicbld to sonic-ububtu-1c since it's deprecated (#22) (11 days ago) [Jianquan Ye]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant