-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
Introduced Cavium target #4
Conversation
Relating to sonic-net/sonic-linux-kernel#3 |
this has conflict with current master? can you update to current master? |
@garyachy , can you bring this commit the the latest master? This branch has conflicts and must be resolved. |
@ lguohan sure, will do it soon |
2ed8459
to
c34f336
Compare
@lguohan please review |
@@ -113,3 +118,5 @@ brcm-all: target/sonic-generic.bin $(addprefix target/,docker-syncd.gz docker-or | |||
|
|||
## Note: docker-fpm.gz must be the last to build the implicit dependency fpmsyncd | |||
mlnx-all: target/sonic-generic.bin $(addprefix target/,docker-syncd-mlnx.gz docker-orchagent-mlnx.gz docker-fpm.gz docker-database.gz) | |||
|
|||
cavm-all: target/sonic-generic.bin |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Doesn't need to have other dockers like the above two?
Dockers are introduced via another PR Sent from my phone 15 ???. 2016 ?. ? 11:04 Shuotian Cheng <[email protected]mailto:[email protected]> ???????(??): @stcheng commented on this pull request. In Makefilehttps://github.com//pull/4#pullrequestreview-111589:
Note: docker-fpm.gz must be the last to build the implicit dependency fpmsyncdmlnx-all: target/sonic-generic.bin $(addprefix target/,docker-syncd-mlnx.gz docker-orchagent-mlnx.gz docker-fpm.gz docker-database.gz) Doesn't need to have other dockers like the above two? You are receiving this because you authored the thread. |
Dockers for Cavium : |
@@ -0,0 +1,3 @@ | |||
CONSOLE_PORT=0x2f8 | |||
CONSOLE_DEV=1 | |||
CONSOLE_SPEED=115200 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all sonic kernel use 9600 baud rate
as noted in the comment in sonic-net/sonic-linux-kernel#3, I suggest drop the LINUX_PATCH for the sonic image build for now. We should be able to merge the other parts |
@@ -61,7 +61,7 @@ mlnx/swss_1.0.0_amd64.deb mlnx/intfsyncd mlnx/neighsyncd mlnx/orchagent mlnx/por | |||
cp sonic-swss/debian/swss/usr/bin/fpmsyncd . | |||
|
|||
$(addprefix sonic-linux-kernel/,linux-headers-3.16.0-4-amd64_3.16.7-ckt11-2+acs8u2_amd64.deb linux-headers-3.16.0-4-common_3.16.7-ckt11-2+acs8u2_amd64.deb linux-image-3.16.0-4-amd64-dbg_3.16.7-ckt11-2+acs8u2_amd64.deb linux-image-3.16.0-4-amd64_3.16.7-ckt11-2+acs8u2_amd64.deb xen-linux-system-3.16.0-4-amd64_3.16.7-ckt11-2+acs8u2_amd64.deb): | |||
pushd sonic-linux-kernel; sudo ./build.sh; popd | |||
pushd sonic-linux-kernel; sudo ./build.sh $(LINUX_PATCH); popd |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggest drop this for now. Let's first agree on how the sonic kernel is going to be build in the other repo.
## Path to vendor linux patch folder | ||
ifeq ($(MAKECMDGOALS),cavm-all) | ||
export LINUX_PATCH=cavm-as7512 | ||
endif |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggest drop this for now. Let's first agree on how the sonic kernel is going to be build in the other repo
b36a160
to
dc84c41
Compare
* Upgrade linux-image version * Add missing dependency of igb * Fix mft build rule * Add missing dependency of ixgbe * [Broadcom]: Update OpenNSL modules to be compatible with kernel 3.16.0-5 (#3) * [Nephos] Update SDK version to support new kernel module 3.16.0-5 (#4) * [mellanox]: Update URL for SDK (#5)
Update package revision Create submodule for sources Signed-off-by: marian-pritsak <[email protected]>
Update package revision Create submodule for sources Signed-off-by: marian-pritsak <[email protected]>
Update package revision Create submodule for sources Signed-off-by: marian-pritsak <[email protected]>
Update package revision Create submodule for sources Signed-off-by: marian-pritsak <[email protected]>
Update package revision Create submodule for sources Signed-off-by: marian-pritsak <[email protected]>
Update package revision Create submodule for sources Signed-off-by: marian-pritsak <[email protected]>
Submodule update for sonic-linkmgrd Incorporates: c11a576 (2021-11-22 09:38:46) [ci]: show code coverage in azure pipeline (#4) 4ceb01d (2021-11-18 20:24:20) Fix MUX toggling issue (#1) d640527 (2021-11-12 22:31:44) [ci]: fix artifact download b9f247d (2021-11-12 22:31:44) [ci]: use native arm64/armhf build 3059122 (2021-09-27 11:32:23) [linkgrd] Add Missing Apache License Header
Co-authored-by: Sanjay Thyamagundalu <[email protected]>
60d2467 Add depends to p4rt debian package (sonic-net#4) Signed-off-by: Brian O'Connor <[email protected]>
* Implement ipCidrRouteDest oid (default routes) * (doc) * Fix test cases * Clean commented code, refine code on default route missing case, fix MockRedis
Squashed commit of the following: commit 6c580806f962d508056e687108e04dc2a9df9276 Author: Qi Luo <[email protected]> Date: Fri Jan 26 15:08:53 2018 -0800 Fix queue counter value type, and wrap queue index (sonic-net#4) * Fix queue counter value type * Wrap queue index commit 66d738c297f852a5d504de1405ae55ff7d45dd0f Author: Qi Luo <[email protected]> Date: Fri Jan 26 02:44:32 2018 +0000 Added ciscoPfcExtMIB, ciscoSwitchQosMIB MIBs Squashed commit of the following: commit 0b68d9ed01ffe6a4b06345494e7bf7d3728c2371 Author: Qi Luo <[email protected]> Date: Thu Jan 25 18:27:53 2018 -0800 Fix PFC queue index base and value type (sonic-net#3) * Fix PFC queue index base * Fix pfc counter64 commit e84d1d89b8925cb547dfd435a5c1e8b58c74dedc Author: Qi Luo <[email protected]> Date: Tue Jan 23 23:59:51 2018 +0000 Added ciscoPfcExtMIB, ciscoSwitchQosMIB MIBs Squashed commit of the following: commit f0cbfff09066e372c1fe99983692a1dd719e5e80 Author: Qi Luo <[email protected]> Date: Tue Jan 23 23:20:02 2018 +0000 Fix Pfc/Qos counter integer range commit c954e4e44d1e44fc5b4b2269a5bbcee63aeb07c7 Author: AndriiS <[email protected]> Date: Thu Jan 11 21:51:35 2018 +0200 Added ciscoPfcExtMIB, ciscoSwitchQosMIB MIBs (sonic-net#1) Remove lag from csqIfQosGroupStatsTable (sonic-net#5)
OSPFv2 in SONiC and Klish Support HLD
11/2 Merge PBR changes to Main
1de25f6 Modified module.py reboot() to reboot all IMM when reboot API is issued on CPM. ca45505 PMON SFP: mods so that test code can make API calls without first requiring get_transceiver_info() and get_transceiver_bulk_status() calls c16904b Added nokia_cmd to start/stop nokia-xcvr-resync.service c1d27a4 PMON SFP API: fix tx_disable_channel and power_override support 6871167 Merge pull request sonic-net#4 from nokia/sakthi_sfp_reset da5b5fc Addressed code review comments 0ab6be9 Changed the sfp reset design to reset when the admin is up and oper is down ccbff9f Add support for SFP reset 81b1410 Changed the asic thermal temperature name to capital letter ASIC instead of asic 6669936 Added midplane link-status-flap command to show the ethmgr port flaps 9a7ca27 Modified Qfpga nokia_cmd cli commands to use meaningful qfpga port names. bd58726 Added CLI commands to show QFPGA port status, port statistics, error-counters, epipe counters 51a6559 Fixed situation where transceiver module status is incorrect after dynamic removal/insertion 487d4ed Fixed the syntax error on nokia_install_ndk_service 1772002 Fixed code review comments and some code cleanup for Asic Thermal 25af678 Added support for Asic Thermal c24b16a Add nokia_cmd cli support co clear midplane port counters Signed-off-by: mlok <[email protected]>
#### 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 ```
* Add disable option for docker-lldp add compilation flag INCLUDE_LLDP Signed-off-by: ivanekovtune-at-githedgehog <[email protected]> * Add disable option for docker-snmp; add build flag INCLUDE_SNMP Signed-off-by: ivanekovtune-at-githedgehog <[email protected]> * Add disable option for docker-teamd; add build flag INCLUDE_TEAMD Signed-off-by: ivanekovtune-at-githedgehog <[email protected]> * Add disable option for docker-router-advertiser; add build flag INCLUDE_ROUTER_ADVERTISER Signed-off-by: ivanekovtune-at-githedgehog <[email protected]> * Add disable option for BGP; add build flag INCLUDE_BGP Signed-off-by: ivanekovtune-at-githedgehog <[email protected]> * Add disable option for swss; add build flag INCLUDE_SWSS Signed-off-by: ivanekovtune-at-githedgehog <[email protected]> * Add disable option for docker-platform-monitor; add build flag INCLUDE_PMON Signed-off-by: ivanekovtune-at-githedgehog <[email protected]> * Add disable option for database; add build flag INCLUDE_DATABASE Signed-off-by: ivanekovtune-at-githedgehog <[email protected]> Signed-off-by: ivanekovtune-at-githedgehog <[email protected]>
* Add disable option for docker-lldp add compilation flag INCLUDE_LLDP Signed-off-by: ivanekovtune-at-githedgehog <[email protected]> * Add disable option for docker-snmp; add build flag INCLUDE_SNMP Signed-off-by: ivanekovtune-at-githedgehog <[email protected]> * Add disable option for docker-teamd; add build flag INCLUDE_TEAMD Signed-off-by: ivanekovtune-at-githedgehog <[email protected]> * Add disable option for docker-router-advertiser; add build flag INCLUDE_ROUTER_ADVERTISER Signed-off-by: ivanekovtune-at-githedgehog <[email protected]> * Add disable option for BGP; add build flag INCLUDE_BGP Signed-off-by: ivanekovtune-at-githedgehog <[email protected]> * Add disable option for swss; add build flag INCLUDE_SWSS Signed-off-by: ivanekovtune-at-githedgehog <[email protected]> * Add disable option for docker-platform-monitor; add build flag INCLUDE_PMON Signed-off-by: ivanekovtune-at-githedgehog <[email protected]> * Add disable option for database; add build flag INCLUDE_DATABASE Signed-off-by: ivanekovtune-at-githedgehog <[email protected]> Signed-off-by: ivanekovtune-at-githedgehog <[email protected]>
…ing fastboot Fix fastreboot path to shutdown SLB neighbors during fastboot This issue was found when the new build on internal branch started failing. Build failure log: ``` Applying patch ../sonic-utilities.patch/0002-Stopping-all-BGP-SLB-neighbors-if-they-re-presented-.patch patching file scripts/fast-reboot Hunk sonic-net#1 succeeded at 43 with fuzz 1 (offset 7 lines). Hunk sonic-net#2 FAILED at 123. Hunk sonic-net#3 succeeded at 502 with fuzz 1 (offset 81 lines). Hunk sonic-net#4 succeeded at 582 (offset 95 lines). 1 out of 4 hunks FAILED -- rejects in file scripts/fast-reboot ``` Repro'd this locally: ``` vadixit@DevVM-20:~/workspace/Networking-acs-buildimage/src/sonic-utilities$ quilt push -a Applying patch patches/0002-Stopping-all-BGP-SLB-neighbors-if-they-re-presented-.patch patching file scripts/fast-reboot Hunk sonic-net#1 succeeded at 42 with fuzz 1 (offset 6 lines). Hunk sonic-net#2 FAILED at 123. Hunk sonic-net#3 succeeded at 489 with fuzz 1 (offset 68 lines). Hunk sonic-net#4 succeeded at 569 (offset 82 lines). 1 out of 4 hunks FAILED -- rejects in file scripts/fast-reboot Patch patches/0002-Stopping-all-BGP-SLB-neighbors-if-they-re-presented-.patch does not apply (enforce with -f) ``` Issue fixed with this change: ``` vadixit@DevVM-20:~/workspace/Networking-acs-buildimage/src/sonic-utilities$ quilt push -a Applying patch patches/0001-fast-reboot-patch-Handle-SLB-neighbors-shutdown-duri.patch patching file scripts/fast-reboot Now at patch patches/0001-fast-reboot-patch-Handle-SLB-neighbors-shutdown-duri.patch ``` Additionally, changed the series file and renamed the 0002 patch as 0001 patch as this is the only patch on this branch right now.
Implementing following CVL APIs : SortDepTables GetOrderedTables GetDepTables GetDepDataForDelete GetValidationTimeStats ClearValidationTimeStats
…est HEAD automatically (sonic-net#15725) #### Why I did it src/sonic-dash-api/sonic-dash-api ``` * 3f728d1 - (HEAD -> master, origin/master, origin/HEAD) Update vnet_direct in route.proto (#4) (11 days ago) [Ze Gan] ``` #### How I did it #### How to verify it #### Description for the changelog
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
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
Added Cavium target. This target is used to build linux kernel with vendor specific patches (set by LINUX_PATCH). This change does not impact existing vendors.