[mellanox-simx] add ability to build simx-compatiable image #2664

mykolaf · 2019-03-12T23:00:10Z

Signed-off-by: Mykola Faryma mykolaf@mellanox.com

- What I did
Add ability to build an image for Mellanox SimX.

Providing a way to build a SimX image.

Currently a few things need to be changed in the image to make it compatiable with SimX:

Disabling FW upgrade
Disabling pmon service
Patch mlnx-hw-management*

Approach sumary

Use the same image for SimX and for real HW. Introudce new platform strings for SimX.

Add new onie string under devices/mellanox:
├── x86_64-mlnx_msn3700_simx-r0
│   ├── ACS-MSN3700 ../x86_64-mlnx_msn3700-r0/ACS-MSN3700
│   ├── default_sku ../x86_64-mlnx_msn2700-r0/default_sku
│   ├── platform_reboot -> ../x86_64-mlnx_msn2700-r0/platform_reboot
│   ├── platform_wait -> ../x86_64-mlnx_msn2700-r0/platform_wait
│   ├── plugins .../x86_64-mlnx_msn2700-r0/plugins
│   ├── syseeprom.hex
│   └── pmon_daemon_control.json
├── x86_64-mlnx_msn2700_simx-r0
│   ├── ACS-MSN2700 ../x86_64-mlnx_msn2700-r0/ACS-MSN2700
│   ├── default_sku ../x86_64-mlnx_msn2700-r0/default_sku
│   ├── platform_reboot -> ../x86_64-mlnx_msn2700-r0/platform_reboot
│   ├── platform_wait -> ../x86_64-mlnx_msn2700-r0/platform_wait
│   ├── plugins> ../x86_64-mlnx_msn2700-r0/plugins
│   ├── syseeprom.hex
│   └── pmon_daemon_control.json

Disabling fw-upgrade

We can modify the platform/mellanox/mlnx-fw-upgrade.sh to skip the update on SimX in runtime.

Disabling pmon

With the new hooks to dynamically load pmon daemons, we can disable the pmon functionality on our new "devices".

Patching the hw-mgmt

make it handle the simulation correctly
same hw-mgmt for SimX and HW

Pros

Simple
Vendor specific changes
Allows to use same image for SimX + HW

Verification

The image was verified on msn2700_simx and a real switch. The default SKU was used.

lguohan · 2019-03-13T04:46:00Z

why is this a separate platform? why cannot reuse the mellanox platform?

liat-grozovik

The idea behind new platform is to be able to run ASIC simulator without pmon as well as FW upgrade which is not part of it.
@mykolaf the name says only simx while i believe it should be mellanox-simx. It does everything as mellanox platform but don't run FW upgrade nor start/stop pmon and hw-mgmt service which are unique for mellanox ASIC simulator.
Please also update the commit message with more information about the idea behind the new platform.

lguohan · 2019-03-13T18:53:02Z

I am trying to limit the platform we need to support. I think it can still be mallanox platform since the asic is still mellanox asic. i think in this case we should use the onie platform string to differentiate that.

lguohan

do not introduce a new platform, use mellanox.

lguohan · 2019-03-20T16:36:11Z

Makefile.work

@@ -118,7 +118,8 @@ SONIC_BUILD_INSTRUCTION :=  make \
                           KERNEL_PROCURE_METHOD=$(KERNEL_PROCURE_METHOD) \
                           HTTP_PROXY=$(http_proxy) \
                           HTTPS_PROXY=$(https_proxy) \
-                           SONIC_ENABLE_SYSTEM_TELEMETRY=$(ENABLE_SYSTEM_TELEMETRY)
+                           SONIC_ENABLE_SYSTEM_TELEMETRY=$(ENABLE_SYSTEM_TELEMETRY) \
+                           $(SONIC_OVERRIDE_BUILD_VARS)


can you make this as a run time option. it is better not to build another image at all.

We can not have one image for simx and real hw, because of the hw-management patch.
Can this delayed install feature help with that? Is there some wiki on that feature ?
Maybe we could build both patched and unpatched hw-mgmt and install on system accordingly?

check this

platform/broadcom/one-image.mk:$(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(DELL_S6000_PLATFORM_MODULE) \ platform/broadcom/platform-modules-s6000.mk:$(DELL_S6000_PLATFORM_MODULE)_PLATFORM = x86_64-dell_s6000_s1220-r0

you can create two hw-mgmt package, one for simx and one for real hw, and then based on the platform onie string, you can selectively to install either one of it.

lguohan · 2019-03-20T16:37:23Z

files/build_templates/pmon.service.j2

@@ -6,9 +6,14 @@ Before=ntp-config.service

 [Service]
 User={{ sonicadmin_user }}
+{% if disable_pmon == 'y' %}


it is better to add some hook to say if onie string matches a specific string, then we do not start pmon docker.

@jleveque to give any comments on this.

Agree with Guohan that it might be easier to maintain if we test for ONIE platform strings here, instead of introducing a new variable.

lguohan · 2019-03-20T16:38:25Z

files/build_templates/sonic_debian_extension.j2

 j2 platform/mellanox/mlnx-fw-upgrade.j2 | sudo tee $FILESYSTEM_ROOT/usr/bin/mlnx-fw-upgrade.sh
+{% else %}
+echo | sudo tee $FILESYSTEM_ROOT/usr/bin/mlnx-fw-upgrade.sh


in the mlnx-fw-upgrade.sh, can you detect the onie string and act accordingly?

lguohan · 2019-03-20T16:38:44Z

platform/mellanox/hw-management/Makefile

@@ -5,8 +5,11 @@ MAIN_TARGET = hw-management_1.mlnx.$(MLNX_HW_MANAGEMENT_VERSION)_amd64.deb

 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :

+ifeq ($(BUILD_SIMX), 'y')
+	git am 0002-Make-hw-mgmt-SimX-compatiable.diff


where is this patch, in this repo?

This patch is not to be upstreamed.

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

Pull request message updated with approach summary

lguohan

Why I did it 69abbc3c - (HEAD, origin/master, origin/HEAD) Revert "[GCU] Complete RDMA Platform Validation Checks [device][platform] Update Inventec new platform d6356 #2791" DellEMC S6100 Watchdog Support #2854 (8 minutes ago) 4fead896 - [sonic-package-manager] fix CLI plugin compatibility issue [sonic-utilities] advance submodule head to latest #2842 (27 hours ago) db61efca - [vlan][dhcp_relay] Clear dhcpv6 relay counter while deleting vlan ([201811] [services] Restart SwSS service upon unexpected critical process exit #2852) (33 hours ago) d5544b4a - [config] Generate sysinfo as needed when override config ([minigraph]: Add mirror type v6 condition #2836) (6 days ago) f258e2a3 - [GCU] Complete RDMA Platform Validation Checks ([device][platform] Update Inventec new platform d6356 #2791) (6 days ago) b4f4e63e - Revert "Revert frr route check ([mlnx] fix url inconsistency in fw.mk #2761)" (Support TACACS Accounting #2762) (7 days ago) 3d89589f - Update pcieutil error message on loading common pcie module (Enable Debugs in BCM Kernel-bde and Knet Modules #2786) (11 days ago) e6aacd37 - Update TRANSCEIVER_INFO table after CDB FW upgrade (Remove unused packages in docker images and host (#2807) #2837) (2 weeks ago) 33d665c4 - replace shell=True, replace xml, and replace exit() ([mellanox-simx] add ability to build simx-compatiable image #2664) (2 weeks ago) 9e510a83 - [chassis][voq[Add "config fabric port ..." commands and tests. (Watchdog enable/disable in DellEMC S6100 #2730) (2 weeks ago) aeb0dbc1 - Fix the invalid variable issue when set-fips in uboot (fix bug in file sonic-cfggen #2834) (3 weeks ago) 1e73632d - [test]: add UT coverage for GCU (Feed device info to orchagent process #2818) (3 weeks ago) 3a9995b6 - [config]Support multi-asic Golden Config override with fix ([mellanox] Update Mellanox MFT packedge #2825) (3 weeks ago) 3fb32588 - Revert "[chassis]: remote cli commands infra for sonic chassis ([mellanox] add makefiles to build Mellanox SDK from sources #2701)" ([dhcp_relay] Base DHCP Relay Docker container on Debian Stretch #2832) (3 weeks ago) 2ffe6e37 - [show][mlnx] replace shell=True, replace xml (Add support of HwSKU Mellanox-SN2700-C28D8 #2700) (3 weeks ago) a5091bba - [sonic_sku_create] remove shell=True, replace exit() with sys.exit() (removed exec from script which that prevents the further lines to be … #2816) (3 weeks ago) 71ef4f16 - [build] Fix base OS compilation issue caused by incompatibility with requests >= 2.29.0. ([201811][sairedis][utilities] advance sub module heads #2830) (3 weeks ago) 1097373b - [show] Added alias interface mode support for 'show interfaces counters ...' command ([kernel]: update sonic kernel to 4.9.0-8-2 #2468) (4 weeks ago) <Julian Chang - TW> 589375fc - correctly parsing complete ipv6 vnet info ([201811][mellanox] Update Mellanox FW version to 13.1910.0928 #2827) (4 weeks ago) 634ac77c - LAG keepalive script to reduce lacp session wait during warm-reboot (Set proper hostname on containers startup #2806) (4 weeks ago) 331c9de0 - [config]: Dynamically start and stop ndppd ([Arista] Add QoS needed files for Arista 7170 #2814) (4 weeks ago) d1f307d0 - [GCU]Fix rdma check failure ([device/celestica]: Add fwutil #2824) (4 weeks ago) ce81a340 - Revert "[config]Support multi-asic Golden Config override (Before issue “sonic-clear counters”, “show interface counters” result not complete #2738)" ([BGP docker]: start bgp_eoiu_mark service to populate bgp eoiu marker… #2823) (4 weeks ago) 61e0e810 - Added platform plugin support in load_minigraph ([db migrator] migrate the DB to latest schema when needed #2808) (4 weeks ago) d4355a96 - Change default CDB run mode to non-hitless (Revert "Watchdog enable/disable in DellEMC S6100 " #2817) (4 weeks ago) 88ffb167 - [config]config reload should generate sysinfo if missing ([Mellanox] Update SAI #2778) (4 weeks ago) 7443b9e5 - [sonic-package-manager] support extension with multiple YANG modules (dhcp_relay service stopped with "systemctl stop swss" but not restarted with "systemctl restart swss" #2752) (4 weeks ago) 522c3a9e - [sonic-package-manager] add support for multiple CLI plugin files (Updated Makefile infrastructure to build debug images. #2753) (4 weeks ago) b38fcfd1 - [show][muxcable] fix show mux hwmode muxdirection RC (syncd-rpc.mk: Fix stretch dockers build failure #2812) (5 weeks ago) 7e24463f - [chassis]: remote cli commands infra for sonic chassis ([mellanox] add makefiles to build Mellanox SDK from sources #2701) (6 weeks ago) bee593e4 - [DPB]Fixing typo in config breakout output ([submodule update]: Quagga bgpd crash fix #2802) (6 weeks ago) ada603c5 - [config]Support multi-asic Golden Config override (Before issue “sonic-clear counters”, “show interface counters” result not complete #2738) (6 weeks ago) 88a7daa8 - [show][barefoot] replace shell=True ([teamd] retry creating team_port after interface info changed #2699) (6 weeks ago) 5e99edb5 - [sonic_package_manager] replace shell=True (Upgrade Mellanox HW-MGMT: fix high CPU utilization issue #2726) (6 weeks ago) b547bb45 - [acl-loader] Only add default deny rule when table is L3 or L3V6 ([201811] [radvd] Build radvd from source; Patch so as not to treat out-of-range MTU as an error #2796) (6 weeks ago)

Why I did it 69abbc3c - (HEAD, origin/master, origin/HEAD) Revert "[GCU] Complete RDMA Platform Validation Checks [device][platform] Update Inventec new platform d6356 sonic-net#2791" DellEMC S6100 Watchdog Support sonic-net#2854 (8 minutes ago) 4fead896 - [sonic-package-manager] fix CLI plugin compatibility issue [sonic-utilities] advance submodule head to latest sonic-net#2842 (27 hours ago) db61efca - [vlan][dhcp_relay] Clear dhcpv6 relay counter while deleting vlan ([201811] [services] Restart SwSS service upon unexpected critical process exit sonic-net#2852) (33 hours ago) d5544b4a - [config] Generate sysinfo as needed when override config ([minigraph]: Add mirror type v6 condition sonic-net#2836) (6 days ago) f258e2a3 - [GCU] Complete RDMA Platform Validation Checks ([device][platform] Update Inventec new platform d6356 sonic-net#2791) (6 days ago) b4f4e63e - Revert "Revert frr route check ([mlnx] fix url inconsistency in fw.mk sonic-net#2761)" (Support TACACS Accounting sonic-net#2762) (7 days ago) 3d89589f - Update pcieutil error message on loading common pcie module (Enable Debugs in BCM Kernel-bde and Knet Modules sonic-net#2786) (11 days ago) e6aacd37 - Update TRANSCEIVER_INFO table after CDB FW upgrade (Remove unused packages in docker images and host (sonic-net#2807) sonic-net#2837) (2 weeks ago) 33d665c4 - replace shell=True, replace xml, and replace exit() ([mellanox-simx] add ability to build simx-compatiable image sonic-net#2664) (2 weeks ago) 9e510a83 - [chassis][voq[Add "config fabric port ..." commands and tests. (Watchdog enable/disable in DellEMC S6100 sonic-net#2730) (2 weeks ago) aeb0dbc1 - Fix the invalid variable issue when set-fips in uboot (fix bug in file sonic-cfggen sonic-net#2834) (3 weeks ago) 1e73632d - [test]: add UT coverage for GCU (Feed device info to orchagent process sonic-net#2818) (3 weeks ago) 3a9995b6 - [config]Support multi-asic Golden Config override with fix ([mellanox] Update Mellanox MFT packedge sonic-net#2825) (3 weeks ago) 3fb32588 - Revert "[chassis]: remote cli commands infra for sonic chassis ([mellanox] add makefiles to build Mellanox SDK from sources sonic-net#2701)" ([dhcp_relay] Base DHCP Relay Docker container on Debian Stretch sonic-net#2832) (3 weeks ago) 2ffe6e37 - [show][mlnx] replace shell=True, replace xml (Add support of HwSKU Mellanox-SN2700-C28D8 sonic-net#2700) (3 weeks ago) a5091bba - [sonic_sku_create] remove shell=True, replace exit() with sys.exit() (removed exec from script which that prevents the further lines to be … sonic-net#2816) (3 weeks ago) 71ef4f16 - [build] Fix base OS compilation issue caused by incompatibility with requests >= 2.29.0. ([201811][sairedis][utilities] advance sub module heads sonic-net#2830) (3 weeks ago) 1097373b - [show] Added alias interface mode support for 'show interfaces counters ...' command ([kernel]: update sonic kernel to 4.9.0-8-2 sonic-net#2468) (4 weeks ago) <Julian Chang - TW> 589375fc - correctly parsing complete ipv6 vnet info ([201811][mellanox] Update Mellanox FW version to 13.1910.0928 sonic-net#2827) (4 weeks ago) 634ac77c - LAG keepalive script to reduce lacp session wait during warm-reboot (Set proper hostname on containers startup sonic-net#2806) (4 weeks ago) 331c9de0 - [config]: Dynamically start and stop ndppd ([Arista] Add QoS needed files for Arista 7170 sonic-net#2814) (4 weeks ago) d1f307d0 - [GCU]Fix rdma check failure ([device/celestica]: Add fwutil sonic-net#2824) (4 weeks ago) ce81a340 - Revert "[config]Support multi-asic Golden Config override (Before issue “sonic-clear counters”, “show interface counters” result not complete sonic-net#2738)" ([BGP docker]: start bgp_eoiu_mark service to populate bgp eoiu marker… sonic-net#2823) (4 weeks ago) 61e0e810 - Added platform plugin support in load_minigraph ([db migrator] migrate the DB to latest schema when needed sonic-net#2808) (4 weeks ago) d4355a96 - Change default CDB run mode to non-hitless (Revert "Watchdog enable/disable in DellEMC S6100 " sonic-net#2817) (4 weeks ago) 88ffb167 - [config]config reload should generate sysinfo if missing ([Mellanox] Update SAI sonic-net#2778) (4 weeks ago) 7443b9e5 - [sonic-package-manager] support extension with multiple YANG modules (dhcp_relay service stopped with "systemctl stop swss" but not restarted with "systemctl restart swss" sonic-net#2752) (4 weeks ago) 522c3a9e - [sonic-package-manager] add support for multiple CLI plugin files (Updated Makefile infrastructure to build debug images. sonic-net#2753) (4 weeks ago) b38fcfd1 - [show][muxcable] fix show mux hwmode muxdirection RC (syncd-rpc.mk: Fix stretch dockers build failure sonic-net#2812) (5 weeks ago) 7e24463f - [chassis]: remote cli commands infra for sonic chassis ([mellanox] add makefiles to build Mellanox SDK from sources sonic-net#2701) (6 weeks ago) bee593e4 - [DPB]Fixing typo in config breakout output ([submodule update]: Quagga bgpd crash fix sonic-net#2802) (6 weeks ago) ada603c5 - [config]Support multi-asic Golden Config override (Before issue “sonic-clear counters”, “show interface counters” result not complete sonic-net#2738) (6 weeks ago) 88a7daa8 - [show][barefoot] replace shell=True ([teamd] retry creating team_port after interface info changed sonic-net#2699) (6 weeks ago) 5e99edb5 - [sonic_package_manager] replace shell=True (Upgrade Mellanox HW-MGMT: fix high CPU utilization issue sonic-net#2726) (6 weeks ago) b547bb45 - [acl-loader] Only add default deny rule when table is L3 or L3V6 ([201811] [radvd] Build radvd from source; Patch so as not to treat out-of-range MTU as an error sonic-net#2796) (6 weeks ago)

mykolaf force-pushed the simx branch from 185f2b4 to 22d52e9 Compare March 12, 2019 23:17

liat-grozovik previously requested changes Mar 13, 2019

View reviewed changes

mykolaf force-pushed the simx branch from 22d52e9 to 4317268 Compare March 18, 2019 16:01

lguohan requested changes Mar 18, 2019

View reviewed changes

mykolaf force-pushed the simx branch from 4317268 to 790e31d Compare March 20, 2019 14:33

mykolaf changed the title ~~[platforms] add simx platform~~ [mellanox-simx] add ability to build simx-compatiable image Mar 20, 2019

mykolaf force-pushed the simx branch from 790e31d to 95ee393 Compare March 20, 2019 16:31

lguohan reviewed Mar 20, 2019

View reviewed changes

mykolaf force-pushed the simx branch from 95ee393 to 566327e Compare April 4, 2019 12:44

[Mellanox] build one image for Mellanox & Mellanox SimX

e4355cf

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

mykolaf force-pushed the simx branch from 566327e to e4355cf Compare April 4, 2019 13:00

This comment has been minimized.

Sign in to view

mykolaf marked this pull request as ready for review April 5, 2019 11:20

mykolaf requested a review from lguohan April 5, 2019 13:59

lguohan approved these changes Apr 11, 2019

View reviewed changes

lguohan merged commit d993d6f into sonic-net:master Apr 11, 2019

mykolaf deleted the simx branch February 18, 2020 13:14

StormLiangMS mentioned this pull request May 30, 2023

[submodule][master] sonic-utilities #15264

Merged

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[mellanox-simx] add ability to build simx-compatiable image #2664

[mellanox-simx] add ability to build simx-compatiable image #2664

mykolaf commented Mar 12, 2019 •

edited

Loading

lguohan commented Mar 13, 2019

liat-grozovik left a comment

lguohan commented Mar 13, 2019

lguohan left a comment

lguohan Mar 20, 2019

mykolaf Mar 20, 2019

lguohan Mar 21, 2019

lguohan Mar 20, 2019

lguohan Mar 20, 2019

jleveque Mar 20, 2019

lguohan Mar 20, 2019

lguohan Mar 20, 2019

mykolaf Mar 20, 2019

This comment has been minimized.

lguohan left a comment

[mellanox-simx] add ability to build simx-compatiable image #2664

[mellanox-simx] add ability to build simx-compatiable image #2664

Conversation

mykolaf commented Mar 12, 2019 • edited Loading

Providing a way to build a SimX image.

Approach sumary

Disabling fw-upgrade

Disabling pmon

Patching the hw-mgmt

Pros

Verification

lguohan commented Mar 13, 2019

liat-grozovik left a comment

Choose a reason for hiding this comment

lguohan commented Mar 13, 2019

lguohan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment has been minimized.

lguohan left a comment

Choose a reason for hiding this comment

mykolaf commented Mar 12, 2019 •

edited

Loading