Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build p4-based sonic docker #14

Merged
merged 2 commits into from
Sep 28, 2016
Merged

build p4-based sonic docker #14

merged 2 commits into from
Sep 28, 2016

Conversation

lguohan
Copy link
Collaborator

@lguohan lguohan commented Sep 27, 2016

No description provided.

@lguohan lguohan force-pushed the p4 branch 3 times, most recently from b9755c5 to 6b67c9c Compare September 27, 2016 19:38
@@ -13,3 +13,15 @@
[submodule "sonic-swss"]
path = src/sonic-swss
url = https://github.com/Azure/sonic-swss
[submodule "src/p4-switch/switch"]
path = src/p4-switch/switch
url = https://github.com/lguohan/switch
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is possible to point to Azure organization repo? Pointing to personal repo is weird.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right now, no.

@@ -77,6 +77,19 @@ $(addprefix dockers/docker-syncd/deps/,syncd_1.0.0_amd64.deb libsairedis_1.0.0_a
dockers/docker-syncd/deps/%.deb: src/%.deb
mkdir -p `dirname $@` && cp $< $(dir $@)

## Rules: docker-sonic (p4)
dockers/docker-sonic-p4/deps/swss_1.0.0_amd64.deb: src/p4/swss_1.0.0_amd64.deb
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggest to merge 3 similar rules

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merged

@stcheng
Copy link
Contributor

stcheng commented Sep 28, 2016

Resolve the conflicting files.

@lguohan lguohan merged commit 7c0ff3e into sonic-net:master Sep 28, 2016
Kalimuthu-Velappan pushed a commit to Kalimuthu-Velappan/sonic-buildimage that referenced this pull request Sep 12, 2019
* [teamshow]: Add teamshow script to display the LAG status

Signed-off-by: Sihui Han <sihan@microsoft.com>
samaity added a commit to samaity/sonic-buildimage that referenced this pull request Dec 11, 2019
…et#14)

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>
samaity added a commit to samaity/sonic-buildimage that referenced this pull request Jan 14, 2020
…et#14)

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>
lguohan pushed a commit that referenced this pull request Apr 30, 2020
* src/sonic-utilities 7ce5b62...3471926 (4):
  > Make `config` command support abbreviation. (#893)
  > [fwutil]: Fix firmware update command. (#895)
  > [doc]: ZTP configuration and show commands (#866)
  > Allow show ztp to display non-sensitive information visible to
  > non-root user (#872)

* src/sonic-ztp 374c9e8...c959371 (2):
  > Fix ztp profile unit test (#14)
  > Create a shadow ZTP data json file accessible to non-root user (#13)
dmytroxshevchuk referenced this pull request in dmytroxshevchuk/sonic-buildimage Aug 31, 2020
xumia referenced this pull request in xumia/sonic-buildimage-1 Feb 16, 2021
SuvarnaMeenakshi pushed a commit to SuvarnaMeenakshi/sonic-buildimage that referenced this pull request Jun 16, 2021
bratashX pushed a commit to bratashX/sonic-buildimage that referenced this pull request Dec 13, 2021
VadymYashchenko referenced this pull request in VadymYashchenko/sonic_buildimage Dec 20, 2021
theasianpianist pushed a commit to theasianpianist/sonic-buildimage that referenced this pull request Feb 5, 2022
* Flush fdb entries when port/LAG is operational down (sonic-net#14)

Co-authored-by: zhenggen-xu <zxu@linkedin.com>
yxieca pushed a commit that referenced this pull request Feb 5, 2022
[sonic-linkmgrd][202012] submodule update

ef1f5eb Jing Zhang Feb 3 09:37:25 2022 [linkmgrd] linkmgrd subscribes MUX_CABLE_INFO table to handle peer OIR events (#17)
bcd74b4 Jing Zhang Feb 1 09:52:00 2022 Collect ICMP packet loss information (#14)

sign-off: Jing Zhang zhangjing@microsoft.com
yxieca pushed a commit that referenced this pull request Feb 5, 2022
[sonic-linkmgrd][master] submodule update

ef1f5eb Jing Zhang Feb 3 09:37:25 2022 [linkmgrd] linkmgrd subscribes MUX_CABLE_INFO table to handle peer OIR events (#17)
bcd74b4 Jing Zhang Feb 1 09:52:00 2022 Collect ICMP packet loss information (#14)

sign-off: Jing Zhang zhangjing@microsoft.com
sg893052 pushed a commit to sg893052/sonic-buildimage that referenced this pull request Apr 25, 2022
lolyu pushed a commit to lolyu/sonic-buildimage that referenced this pull request Sep 28, 2022
Remove the test_get_platform_info tests whichis not present in sonic-buildimage/202205
@kellyyeh kellyyeh mentioned this pull request Oct 14, 2022
7 tasks
qiluo-msft pushed a commit that referenced this pull request Oct 24, 2022
#### Why I did it
Update sonic-host-services submodule to include below commits:
```
bc8698d Merge pull request #21 from abdosi/feature
557a110 Fix the issue where if dest port is not specified in ACL rule than for multi-asic where we create NAT rule to forward traffic from Namespace to host fail with exception.
6e45acc (master) Merge pull request #14 from abdosi/feature
4d6cad7 Merge remote-tracking branch 'upstream/master' into feature
bceb13e Install libyang to azure pipeline (#20)
82299f5 Merge pull request #13 from SuvarnaMeenakshi/cacl_fabricns
15d3bf4 Merge branch 'master' into cacl_fabricns
de54082 Merge pull request #16 from ZhaohuiS/feature/caclmgrd_external_client_warning_log
b4b368d Add warning log if destination port is not defined
d4bb96d Merge branch 'master' into cacl_fabricns
35c76cb Add unit-test and fix typo.
17d44c2 Made Changes to be Python 3.7 compatible
978afb5 Aligning Code
1fbf8fb Merge remote-tracking branch 'upstream/master' into feature
7b8c7d1 Added UT for the changes
91c4c42 Merge pull request #9 from ZhaohuiS/feature/caclmgrd_external_client
7c0b56a Add 4 test cases for external_client_acl, including single port and port range for ipv4 and ipv6
b71e507 Merge remote-tracking branch 'origin/master' into HEAD
d992dc0 Merge branch 'master' into feature/caclmgrd_external_client
bd7b172 DST_PORT is configuralbe in json config file for EXTERNAL_CLIENT_ACL
f9af7ae [CLI] Move hostname, mgmt interface/vrf config to hostcfgd (#2)
70ce6a3 Merge pull request #10 from sujinmkang/cold_reset
29be8d2 Added Support to render Feature Table using Device running metadata. Also added support to render 'has_asic_scope' field of Feature Table.
3437e35 [caclmgrd][chassis]: Add ip tables rules to accept internal docker traffic from fabric asic namespaces.
8720561 Fix and add hardware reboot cause determination tests
0dcc7fe remove the empty bracket if no hardware reboot cause minor
e47d831 fix the wrong expected result comparision
ef86b53 Fix startswith Attribute error
8a630bb fix mock patch
8543ddf update the reboot cause logic and update the unit test
53ad7cd fix the mock patch function
7c8003d fix the reboot-cause regix for test
1ba611f fix typo
25379d3 Add unit test case
a56133b Add hardware reboot cause as actual reboot cause for soft reboot failed
c7d3833 Support Restapi/gnmi control plane acls
f6ea036 caclmgrd: Don't block traffic to mgmt by default
a712fc4 Update test cases
adc058b caclmgrd: Don't block traffic to mgmt by default
06ff918 Merge pull request #7 from bluecmd/patch-1
e3e23bc ci: Rename sonic-buildimage repository
e83a858 Merge pull request #4 from kamelnetworks/acl-ip2me-test
f5a2e50 [caclmgrd]: Tests for IP2ME rules generation
```
lguohan pushed a commit that referenced this pull request Sep 22, 2023
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
yxieca pushed a commit that referenced this pull request Oct 3, 2023
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
yxieca pushed a commit that referenced this pull request Oct 13, 2023
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
shanshri pushed a commit to shanshri/sonic-buildimage-sonic-net that referenced this pull request Oct 24, 2023
shanshri pushed a commit to shanshri/sonic-buildimage-sonic-net that referenced this pull request Oct 24, 2023

- remove fix_ismt_alignment_issue.patch
  linux commit id: 5cd5f0bb0d9c32876b3d86b70fb45da10d028be7

- remove 0011-support-Broadcom-54616-Phy-for-Intel-igb-driver.patch
  linux commit id: eeb0149660a21c61122d4937bd406aa4f334c1e4

- remove driver-l3mdev-cgroup.patch
- remove config-l3mdev-cgroup.patch

- remove bridge-add-per-port-broadcast-flood-flag.patch
  linux commit id: 99f906e9ad7b6e79ffeda30f45906a8448b9d6a2

- remove 0025-net-udp_l3mdev_accept-support.patch
  linux commit id: 63a6fff353d01da5a22b72670c434bf12fa0e3b8

- remove kernel-enable-psample-and-act_sample-drivers.patch

- remove mellanox-backport-introduce-psample-a-new-genetlink-channel.patch
  linux commit id: 6ae0a6286171154661b74f7f550f9441c6008424

- remove mellanox-backport-introduce-tc-sample-action.patch
  linux commit id: 5c5670fae43027778e84b9d9ff3b9d91a10a8131

- remove 0000-net-Fix-netdev-adjacency-tracking.patch
  linux commit id: 67b62f98a1de962277b60d77c0c208b76867dbae
                   0f524a80ff35af8a7664d7661d948107da142e04
                   f1170fd462c67c4ae2f20734566d94e0f8f62f69
                   1a3f060c1a47dba4e12ac21ce62b57666b9c4e95
                   790510d99f39cee7f275d001aa5024032ed9bb48
                   453d39329ad03f9f6d93ec6d0d57bf7a1e2a20c7
                   e0e79c8e74b08976d9b45e52b704b9228c6965c7
                   b3208b2024c9089106df52ae25ebf39068d6f9fc
                   1cd127fc7d3a6d6a0fc9f9cca47ca3a16ee79679
                   dd82364c3ab93a96bb1e45d22106a4b1ea4bef39
                   cf2d67408b2f9a840f27d25a0219070b5b5deec4

- remove 0000-net-ipv6-ll-anycast-mcast-routes-on-dev.patch
  linux commit id: 4832c30d5458387ff2533ff66fbde26ad8bb5a2d

- remove 0001-net-ipv6-Allow-shorthand-delete-of-all-nexthops-in-m.patch
  linux commit id: 0ae8133586ad1c9be894411aaf8b17bb58c8efe5

- remove linux-4.13-thermal-intel_pch_thermal-Fix-enable-check-on.patch
  linux commit id: 595536e0b2475a9eac23709cd461143178c12e0e

- remove linux-4.16-firmware-dmi-handle-missing-DMI-data-gracefully.patch
  linux commit id: a81114d03e4a529c4b68293249f75438b3c1783f

Signed-off-by: Guohan Lu <gulv@microsoft.com>

* [Mellanox] Port the patches to 4.19 (sonic-net#14)

0001-v4.19-6-Mellanox-platform-Backport-patches-for-new-M.patch
0002-config-mellanox-configuration.patch
0003-mlxsw-minimal-Fix-validation-for-FW-minor-version.patch
0004-mlxsw-core-Add-the-hottest-thermal-zone-detection.patch
0005-hwmon-pmbus-core-Add-support-for-vid-mode-detection-.patch
0006-platform-mellanox-mlxreg-hotplug-Use-capability-r.patch

<linux/i2c/pmbus.h> -> <linux/pmbus.h>

Remove files which are no longer used.

Co-authored-by: stephens <stephens@contoso.com>
yxieca pushed a commit that referenced this pull request Nov 7, 2023
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

[Nvidia] Enable iproute2 & fix mft build (#16)

* Enable iproute2 as the SDK is also built

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* [Nvidia] Dont use mkbmdeb method of dkms to build the package

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Added linux image to the Depends section of mft

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

[Nvidia] [Bookworm] Separate KERNEL_MFT into a new target (#16782)

* [Nvidia] Seperate KERNEL_MFT into a new target because of kernel header dependency

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Update linux-kernel submodule

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Fix paralell build problem

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

---------

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
yxieca pushed a commit that referenced this pull request Nov 22, 2023
Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

[Nvidia] Enable iproute2 & fix mft build (#16)

* Enable iproute2 as the SDK is also built

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* [Nvidia] Dont use mkbmdeb method of dkms to build the package

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Added linux image to the Depends section of mft

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

[Nvidia] [Bookworm] Separate KERNEL_MFT into a new target (#16782)

* [Nvidia] Seperate KERNEL_MFT into a new target because of kernel header dependency

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Update linux-kernel submodule

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

* Fix paralell build problem

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>

---------

Signed-off-by: Vivek Reddy <vkarri@nvidia.com>
mssonicbld added a commit that referenced this pull request Jan 10, 2024
…#17730)

#### Why I did it
src/dhcpmon
```
* fc20a97 - (HEAD -> master, origin/master, origin/HEAD) [202311][counter] Clear counter table when dhcpmon init (#14) (2 hours ago) [Yaqiang Zhu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
mssonicbld added a commit that referenced this pull request Jan 12, 2024
…#17750)

#### Why I did it
src/dhcpmon
```
* 2443073 - (HEAD -> 202311, origin/202311) [counter] Clear counter table when dhcpmon init (#14) (#16) (2 days ago) [Yaqiang Zhu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
@yaqiangz yaqiangz mentioned this pull request Jan 31, 2024
11 tasks
StormLiangMS pushed a commit that referenced this pull request Feb 1, 2024
Why I did it
Advance dhcpmon submodule head

Work item tracking
Microsoft ADO (number only): 26270786
How I did it
fc20a97 Yaqiang Zhu Wed Jan 10 09:11:25 2024 +0800 [202311][counter] Clear counter table when dhcpmon init (#14)
bace2e0 Yaqiang Zhu Fri Jan 5 11:29:21 2024 +0800 [counter] Clear counter table when dhcpmon init (#14)

How to verify it
mssonicbld added a commit that referenced this pull request Nov 15, 2024
…ly (#20812)

#### Why I did it
src/sonic-bmp
```
* 8c4311d - (HEAD -> master, origin/master, origin/HEAD) Merge pull request #14 from FengPan-Frank/deb_change (3 hours ago) [Feng-msft]
* 298c07b - Merge branch 'deb_change' of https://github.com/FengPan-Frank/sonic-bmp into deb_change (4 hours ago) [Feng Pan]
|\ 
| failure_prs.log 906765d - test debian (15 hours ago) [Feng Pan]
* 857b751 - test debian (4 hours ago) [Feng Pan]
```
#### How I did it
#### How to verify it
#### Description for the changelog
aidan-gallagher pushed a commit to aidan-gallagher/sonic-buildimage that referenced this pull request Nov 16, 2024
…ly (sonic-net#20812)

#### Why I did it
src/sonic-bmp
```
* 8c4311d - (HEAD -> master, origin/master, origin/HEAD) Merge pull request sonic-net#14 from FengPan-Frank/deb_change (3 hours ago) [Feng-msft]
* 298c07b - Merge branch 'deb_change' of https://github.com/FengPan-Frank/sonic-bmp into deb_change (4 hours ago) [Feng Pan]
|\ 
| failure_prs.log 906765d - test debian (15 hours ago) [Feng Pan]
* 857b751 - test debian (4 hours ago) [Feng Pan]
```
#### How I did it
#### How to verify it
#### Description for the changelog
lguohan pushed a commit that referenced this pull request Dec 4, 2024
To fix a statistical issue. The original fix was done in FRRouting/frr#17297. However to accommodate 8.5.4 the patch in the PR was added.

[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
Core was generated by `/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M dplane_fpm_nl -M snmp'.
Program terminated with signal SIGABRT, Aborted.
#0  0x00007fccd7351e2c in ?? () from /lib/x86_64-linux-gnu/libc.so.6
[Current thread is 1 (Thread 0x7fccd6faf7c0 (LWP 36))]
(gdb) bt
#0  0x00007fccd7351e2c in ?? () from /lib/x86_64-linux-gnu/libc.so.6
#1  0x00007fccd7302fb2 in raise () from /lib/x86_64-linux-gnu/libc.so.6
#2  0x00007fccd72ed472 in abort () from /lib/x86_64-linux-gnu/libc.so.6
#3  0x00007fccd75bb3a9 in _zlog_assert_failed (xref=xref@entry=0x7fccd7652380 <_xref.16>, extra=extra@entry=0x0) at ../lib/zlog.c:678
#4  0x00007fccd759b2fe in route_node_delete (node=<optimized out>) at ../lib/table.c:352
#5  0x00007fccd759b445 in route_unlock_node (node=0x0) at ../lib/table.h:258
#6  route_next (node=<optimized out>) at ../lib/table.c:436
#7  route_next (node=node@entry=0x56029d89e560) at ../lib/table.c:410
#8  0x000056029b6b6b7a in if_lookup_by_name_per_ns (ns=ns@entry=0x56029d873d90, ifname=ifname@entry=0x7fccc0029340 "PortChannel1020")
    at ../zebra/interface.c:312
#9  0x000056029b6b8b36 in zebra_if_dplane_ifp_handling (ctx=0x7fccc0029310) at ../zebra/interface.c:1867
#10 zebra_if_dplane_result (ctx=0x7fccc0029310) at ../zebra/interface.c:2221
#11 0x000056029b7137a9 in rib_process_dplane_results (thread=<optimized out>) at ../zebra/zebra_rib.c:4810
#12 0x00007fccd75a0e0d in thread_call (thread=thread@entry=0x7ffe8e553cc0) at ../lib/thread.c:1990
#13 0x00007fccd7559368 in frr_run (master=0x56029d65a040) at ../lib/libfrr.c:1198
#14 0x000056029b6ac317 in main (argc=9, argv=0x7ffe8e5540d8) at ../zebra/main.c:478
lguohan pushed a commit that referenced this pull request Dec 10, 2024
Adding the below fix from FRR FRRouting/frr#17297

This is to fix the following crash which is a statistical issue

[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
Core was generated by `/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M dplane_fpm_nl -M snmp'.
Program terminated with signal SIGABRT, Aborted.
#0  0x00007fccd7351e2c in ?? () from /lib/x86_64-linux-gnu/libc.so.6
[Current thread is 1 (Thread 0x7fccd6faf7c0 (LWP 36))]
(gdb) bt
#0  0x00007fccd7351e2c in ?? () from /lib/x86_64-linux-gnu/libc.so.6
#1  0x00007fccd7302fb2 in raise () from /lib/x86_64-linux-gnu/libc.so.6
#2  0x00007fccd72ed472 in abort () from /lib/x86_64-linux-gnu/libc.so.6
#3  0x00007fccd75bb3a9 in _zlog_assert_failed (xref=xref@entry=0x7fccd7652380 <_xref.16>, extra=extra@entry=0x0) at ../lib/zlog.c:678
#4  0x00007fccd759b2fe in route_node_delete (node=<optimized out>) at ../lib/table.c:352
#5  0x00007fccd759b445 in route_unlock_node (node=0x0) at ../lib/table.h:258
#6  route_next (node=<optimized out>) at ../lib/table.c:436
#7  route_next (node=node@entry=0x56029d89e560) at ../lib/table.c:410
#8  0x000056029b6b6b7a in if_lookup_by_name_per_ns (ns=ns@entry=0x56029d873d90, ifname=ifname@entry=0x7fccc0029340 "PortChannel1020")
    at ../zebra/interface.c:312
#9  0x000056029b6b8b36 in zebra_if_dplane_ifp_handling (ctx=0x7fccc0029310) at ../zebra/interface.c:1867
#10 zebra_if_dplane_result (ctx=0x7fccc0029310) at ../zebra/interface.c:2221
#11 0x000056029b7137a9 in rib_process_dplane_results (thread=<optimized out>) at ../zebra/zebra_rib.c:4810
#12 0x00007fccd75a0e0d in thread_call (thread=thread@entry=0x7ffe8e553cc0) at ../lib/thread.c:1990
#13 0x00007fccd7559368 in frr_run (master=0x56029d65a040) at ../lib/libfrr.c:1198
#14 0x000056029b6ac317 in main (argc=9, argv=0x7ffe8e5540d8) at ../zebra/main.c:478
mssonicbld added a commit to mssonicbld/sonic-buildimage that referenced this pull request Jan 13, 2025
<!--
     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

Adding the below fix from FRR FRRouting/frr#17297

This is to fix the following crash which is a statistical issue

```
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
Core was generated by `/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M dplane_fpm_nl -M snmp'.
Program terminated with signal SIGABRT, Aborted.
#0  0x00007fccd7351e2c in ?? () from /lib/x86_64-linux-gnu/libc.so.6
[Current thread is 1 (Thread 0x7fccd6faf7c0 (LWP 36))]
(gdb) bt
#0  0x00007fccd7351e2c in ?? () from /lib/x86_64-linux-gnu/libc.so.6
sonic-net#1  0x00007fccd7302fb2 in raise () from /lib/x86_64-linux-gnu/libc.so.6
sonic-net#2  0x00007fccd72ed472 in abort () from /lib/x86_64-linux-gnu/libc.so.6
sonic-net#3  0x00007fccd75bb3a9 in _zlog_assert_failed (xref=xref@entry=0x7fccd7652380 <_xref.16>, extra=extra@entry=0x0) at ../lib/zlog.c:678
sonic-net#4  0x00007fccd759b2fe in route_node_delete (node=<optimized out>) at ../lib/table.c:352
sonic-net#5  0x00007fccd759b445 in route_unlock_node (node=0x0) at ../lib/table.h:258
sonic-net#6  route_next (node=<optimized out>) at ../lib/table.c:436
sonic-net#7  route_next (node=node@entry=0x56029d89e560) at ../lib/table.c:410
sonic-net#8  0x000056029b6b6b7a in if_lookup_by_name_per_ns (ns=ns@entry=0x56029d873d90, ifname=ifname@entry=0x7fccc0029340 "PortChannel1020")
    at ../zebra/interface.c:312
sonic-net#9  0x000056029b6b8b36 in zebra_if_dplane_ifp_handling (ctx=0x7fccc0029310) at ../zebra/interface.c:1867
sonic-net#10 zebra_if_dplane_result (ctx=0x7fccc0029310) at ../zebra/interface.c:2221
sonic-net#11 0x000056029b7137a9 in rib_process_dplane_results (thread=<optimized out>) at ../zebra/zebra_rib.c:4810
sonic-net#12 0x00007fccd75a0e0d in thread_call (thread=thread@entry=0x7ffe8e553cc0) at ../lib/thread.c:1990
sonic-net#13 0x00007fccd7559368 in frr_run (master=0x56029d65a040) at ../lib/libfrr.c:1198
sonic-net#14 0x000056029b6ac317 in main (argc=9, argv=0x7ffe8e5540d8) at ../zebra/main.c:478
```

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

#### How I did it
Added patch.

#### How to verify it
Running BGP tests.

<!--
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)
mssonicbld added a commit that referenced this pull request Jan 15, 2025
<!--
 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

Adding the below fix from FRR FRRouting/frr#17297

This is to fix the following crash which is a statistical issue

```
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
Core was generated by `/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M dplane_fpm_nl -M snmp'.
Program terminated with signal SIGABRT, Aborted.
#0 0x00007fccd7351e2c in ?? () from /lib/x86_64-linux-gnu/libc.so.6
[Current thread is 1 (Thread 0x7fccd6faf7c0 (LWP 36))]
(gdb) bt
#0 0x00007fccd7351e2c in ?? () from /lib/x86_64-linux-gnu/libc.so.6
#1 0x00007fccd7302fb2 in raise () from /lib/x86_64-linux-gnu/libc.so.6
#2 0x00007fccd72ed472 in abort () from /lib/x86_64-linux-gnu/libc.so.6
#3 0x00007fccd75bb3a9 in _zlog_assert_failed (xref=xref@entry=0x7fccd7652380 <_xref.16>, extra=extra@entry=0x0) at ../lib/zlog.c:678
#4 0x00007fccd759b2fe in route_node_delete (node=<optimized out>) at ../lib/table.c:352
#5 0x00007fccd759b445 in route_unlock_node (node=0x0) at ../lib/table.h:258
#6 route_next (node=<optimized out>) at ../lib/table.c:436
#7 route_next (node=node@entry=0x56029d89e560) at ../lib/table.c:410
#8 0x000056029b6b6b7a in if_lookup_by_name_per_ns (ns=ns@entry=0x56029d873d90, ifname=ifname@entry=0x7fccc0029340 "PortChannel1020")
 at ../zebra/interface.c:312
#9 0x000056029b6b8b36 in zebra_if_dplane_ifp_handling (ctx=0x7fccc0029310) at ../zebra/interface.c:1867
#10 zebra_if_dplane_result (ctx=0x7fccc0029310) at ../zebra/interface.c:2221
#11 0x000056029b7137a9 in rib_process_dplane_results (thread=<optimized out>) at ../zebra/zebra_rib.c:4810
#12 0x00007fccd75a0e0d in thread_call (thread=thread@entry=0x7ffe8e553cc0) at ../lib/thread.c:1990
#13 0x00007fccd7559368 in frr_run (master=0x56029d65a040) at ../lib/libfrr.c:1198
#14 0x000056029b6ac317 in main (argc=9, argv=0x7ffe8e5540d8) at ../zebra/main.c:478
```

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

#### How I did it
Added patch.

#### How to verify it
Running BGP tests.

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

3 participants