From 58d7e134ea0a1983e732b2644c71a0403ab7910e Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Tue, 10 Dec 2024 23:12:48 -0800 Subject: [PATCH 01/13] [build]: Add an artificial dependency between two modules for centec-arm64 (#19914) For centec-arm64, both platform-modules-fs and platform-modules-e530 try to compile the same directory of kernel sources. If both compilations are running at the same time, then this is going to lead to errors. Fix this by introducing an artificial dependency between the two so that the compilations are forced to be serialized. Signed-off-by: Saikrishna Arcot --- platform/centec-arm64/platform-modules-fs.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/platform/centec-arm64/platform-modules-fs.mk b/platform/centec-arm64/platform-modules-fs.mk index 5942eabe2069..8bfff5c9dad0 100644 --- a/platform/centec-arm64/platform-modules-fs.mk +++ b/platform/centec-arm64/platform-modules-fs.mk @@ -9,4 +9,8 @@ FS_S5800_48T4S_PLATFORM_MODULE = platform-modules-s5800-48t4s_$(FS_S5800_48T4S_P $(FS_S5800_48T4S_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-modules-fs $(FS_S5800_48T4S_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON) $(FS_S5800_48T4S_PLATFORM_MODULE)_PLATFORM = arm64-fs_s5800_48t4s-r0 +# Both this and the e530 modules compile ../centec/centec-dal/, which causes a problem +# if both are being compiled at the same time. To get around that, add an artificial +# dependency here so that this part is serialized. +$(FS_S5800_48T4S_PLATFORM_MODULE)_AFTER = $(CENTEC_E530_48T4X_P_PLATFORM_MODULE) SONIC_DPKG_DEBS += $(FS_S5800_48T4S_PLATFORM_MODULE) From 5d9e561708f75216ab8b3f51fe8e765ca94a065e Mon Sep 17 00:00:00 2001 From: Oleksandr Ivantsiv Date: Wed, 11 Dec 2024 00:04:11 -0800 Subject: [PATCH 02/13] [nvidia-bluefield] Remove the virtual smart switch leftovers. (#21050) - Why I did it Remove the virtual smart switch leftovers from the Nvidia DPU initialization flow. - How I did it Remove unused code from the bash script. --- .../bluefield-platform-modules/bin/bfnet.sh | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/platform/nvidia-bluefield/bluefield-platform-modules/bin/bfnet.sh b/platform/nvidia-bluefield/bluefield-platform-modules/bin/bfnet.sh index e05761675336..c82ce3023d4e 100755 --- a/platform/nvidia-bluefield/bluefield-platform-modules/bin/bfnet.sh +++ b/platform/nvidia-bluefield/bluefield-platform-modules/bin/bfnet.sh @@ -17,25 +17,6 @@ # pci_iface=eth0-midplane -cp_iface=Ethernet0 -pidfile=/run/dhcl-internal.$cp_iface.pid -leasefile=/var/lib/dhcp/dhcl-internal.$cp_iface.leases - -stop_cp_dhclient() -{ - if [[ -f $pidfile ]]; then - kill $(cat $pidfile) - rm -f $pidfile - fi - rm -f $leasefile -} - -start_cp_dhclient() -{ - stop_cp_dhclient - - /sbin/dhclient -pf $pidfile -lf $leasefile $cp_iface -nw -} start() { @@ -46,17 +27,10 @@ start() if [[ $? != "0" ]]; then exit 1 fi - - hwsku=$(sonic-cfggen -d -v 'DEVICE_METADATA["localhost"]["hwsku"]') - if [[ $hwsku == *"-C1" ]]; then - start_cp_dhclient - fi } stop() { - stop_cp_dhclient - /usr/bin/mst stop rmmod mlx5_ib mlx5_core } From cd7f25f4a09e4a696bae2a5af9e886faf6f2508a Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Wed, 11 Dec 2024 19:01:31 +0800 Subject: [PATCH 03/13] [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#21128) #### Why I did it src/sonic-utilities ``` * d5cbe464 - (HEAD -> master, origin/master, origin/HEAD) [GCU] Add data acl table and rule check (#3668) (3 minutes ago) [jingwenxie] ``` #### How I did it #### How to verify it #### Description for the changelog --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index 03d833511eb5..d5cbe4641d1c 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit 03d833511eb55eb2d979d6f67bf3576a6152ab42 +Subproject commit d5cbe4641d1c1a616ec5c6376cc75fc862f357c7 From 1b5edaaa4abe391dea57acd57493c159310151d6 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Wed, 11 Dec 2024 19:01:46 +0800 Subject: [PATCH 04/13] [submodule] Update submodule sonic-host-services to the latest HEAD automatically (#21106) #### Why I did it src/sonic-host-services ``` * b0b3ca5 - (HEAD -> master, origin/master, origin/HEAD) Support for Memory Statistics Host-Services (#167) (14 hours ago) [kanza-latif] * d455924 - Update pipeline to Bookworm (#193) (33 hours ago) [Saikrishna Arcot] ``` #### How I did it #### How to verify it #### Description for the changelog --- src/sonic-host-services | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-host-services b/src/sonic-host-services index 438e54aca685..b0b3ca54614a 160000 --- a/src/sonic-host-services +++ b/src/sonic-host-services @@ -1 +1 @@ -Subproject commit 438e54aca68507d70b37100d00e4be3647c7f59f +Subproject commit b0b3ca54614ac6fd350f2609f1ebd74757b72f14 From 1a536dff35e27205b8a59f471f44f6eb97e07f96 Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Thu, 12 Dec 2024 00:48:16 +0800 Subject: [PATCH 05/13] [build] Enable reproducible build options to reduce community build failures. (#21115) --- rules/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/config b/rules/config index 3d3a81ce60f2..3b4fd5851a3b 100644 --- a/rules/config +++ b/rules/config @@ -264,7 +264,7 @@ TRUSTED_GPG_URLS = https://packages.trafficmanager.net/debian/public_key.gpg,htt # web : web packages, downloaded by wget, curl # git : git repositories, donloaded by git clone # docker: docker base images -SONIC_VERSION_CONTROL_COMPONENTS ?= none +SONIC_VERSION_CONTROL_COMPONENTS ?= deb,py2,py3,web,git,docker ifeq ($(SONIC_VERSION_CONTROL_COMPONENTS),all) override MIRROR_SNAPSHOT = y @@ -303,7 +303,7 @@ INCLUDE_MUX = y ENABLE_ASAN ?= n # reset default container registry from dockerhub to other -DEFAULT_CONTAINER_REGISTRY ?= +DEFAULT_CONTAINER_REGISTRY ?= publicmirror.azurecr.io # INCLUDE_BOOTCHART - install systemd-bootchart INCLUDE_BOOTCHART = y From 10afa2edd67ea40b02c0d3ec813b908f2e557a38 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Wed, 11 Dec 2024 08:58:35 -0800 Subject: [PATCH 06/13] Fix docker-sonic-vs following upgrade to Bookworm (#21063) FRR 10.0.1 upgrade (#20269) brought in a mgmtd daemon for FRR. This needs to be started up in docker-sonic-vs as part of the other daemons in this container. Additionally, Debian Bookworm provides version 2.5.0 of scapy, but the pip3 command later in the file downgraded it to 2.4.5, which does not work in Bookworm. Fix this by removing the pip3 installation for scapy, and updating the other packages installed via pip3. Signed-off-by: Saikrishna Arcot --- platform/vs/docker-sonic-vs/Dockerfile.j2 | 5 ++--- platform/vs/docker-sonic-vs/start.sh | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/vs/docker-sonic-vs/Dockerfile.j2 b/platform/vs/docker-sonic-vs/Dockerfile.j2 index e2fd50bfcfba..92ba5b06dbd1 100644 --- a/platform/vs/docker-sonic-vs/Dockerfile.j2 +++ b/platform/vs/docker-sonic-vs/Dockerfile.j2 @@ -74,9 +74,8 @@ RUN pip3 uninstall -y enum34 # Dependencies of restore_neighbors.py RUN pip3 install \ - scapy==2.4.4 \ - pyroute2==0.5.14 \ - netifaces==0.10.9 + pyroute2==0.7.2 \ + netifaces==0.11.0 {% if docker_sonic_vs_debs.strip() -%} # Copy built Debian packages diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh index f28f05f3707d..f7dbde8dcff7 100755 --- a/platform/vs/docker-sonic-vs/start.sh +++ b/platform/vs/docker-sonic-vs/start.sh @@ -160,6 +160,8 @@ supervisorctl start vlanmgrd supervisorctl start zebra +supervisorctl start mgmtd + supervisorctl start staticd supervisorctl start buffermgrd From 5258772d4adcfe8590560b9115d91ab67257e585 Mon Sep 17 00:00:00 2001 From: Patrick MacArthur Date: Wed, 11 Dec 2024 12:00:08 -0500 Subject: [PATCH 07/13] [Arista] Update platform library submodules (#20929) (this is a replacement for PR #20603; this PR includes a revert for the "Disable lpmode for chassis" change) Add support for new psus Add support for new fan modules Report fan information from all fabric cards Fix psud warning due to invalid pmbus threshold reported --- platform/barefoot/sonic-platform-modules-arista | 2 +- platform/broadcom/sonic-platform-modules-arista | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista index ed942d617ddd..2e2acb67f9ea 160000 --- a/platform/barefoot/sonic-platform-modules-arista +++ b/platform/barefoot/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit ed942d617ddde8e63b5190ad3a7d8171c1dbde9a +Subproject commit 2e2acb67f9ea20366f5d26c1c61b6952810d6d88 diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista index ed942d617ddd..2e2acb67f9ea 160000 --- a/platform/broadcom/sonic-platform-modules-arista +++ b/platform/broadcom/sonic-platform-modules-arista @@ -1 +1 @@ -Subproject commit ed942d617ddde8e63b5190ad3a7d8171c1dbde9a +Subproject commit 2e2acb67f9ea20366f5d26c1c61b6952810d6d88 From c0ff0678ad3106d0b9a04c178abc996d8d3550c0 Mon Sep 17 00:00:00 2001 From: yue-fred-gao <132678244+yue-fred-gao@users.noreply.github.com> Date: Wed, 11 Dec 2024 12:58:56 -0500 Subject: [PATCH 08/13] [vpp]: add platform vpp (#20841) Why I did it Add platform vpp to sonic-buildimage to enable building sonic-vpp as other platforms. How I did it Add vpp submodule from https://github.com/sonic-net/sonic-platform-vpp How to verify it git clone --recurse-submodules https://github.com/sonic-net/sonic-buildimage.git make init make configure PLATFORM=vpp make SONIC_BUILD_JOBS=4 target/sonic-vpp.img.gz Signed-off-by: Yue Gao --- .gitmodules | 3 +++ platform/vpp | 1 + 2 files changed, 4 insertions(+) create mode 160000 platform/vpp diff --git a/.gitmodules b/.gitmodules index b76f589bdfa8..f8d10f3af4ab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -130,3 +130,6 @@ [submodule "platform/marvell-teralynx/sonic-platform-marvell-teralynx"] path = platform/marvell-teralynx/sonic-platform-marvell-teralynx url = https://github.com/Marvell-switching/sonic-platform-marvell.git +[submodule "platform/vpp"] + path = platform/vpp + url = https://github.com/sonic-net/sonic-platform-vpp.git \ No newline at end of file diff --git a/platform/vpp b/platform/vpp new file mode 160000 index 000000000000..fbda3bd10348 --- /dev/null +++ b/platform/vpp @@ -0,0 +1 @@ +Subproject commit fbda3bd10348381886038790f11cc2641bf972b9 From ade34bfe837e44cf56dbbbdf0281ccd3b98c5f3b Mon Sep 17 00:00:00 2001 From: Vivek Date: Wed, 11 Dec 2024 10:34:07 -0800 Subject: [PATCH 09/13] [Bookworm] Fix timezone propagation to containers (#21079) - Why I did it Fix #20925 Not cherry-pickable to 202405, will raise a separate PR - How I did it Mount /etc/localtime on containers and remove /etc/timezone dependency - How to verify it root@sonic:/home/admin# zdump /etc/localtime /etc/localtime Fri Dec 6 23:24:03 2024 IST root@sonic:/home/admin# docker exec swss zdump /etc/localtime /etc/localtime Fri Dec 6 23:24:12 2024 IST Verify swss.rec/sairedis.rec and syslog are following same time Signed-off-by: Vivek --- dockers/docker-database/docker-database-init.sh | 4 ---- dockers/docker-dhcp-relay/start.sh | 4 ---- dockers/docker-dhcp-server/start.sh | 4 ---- dockers/docker-eventd/start.sh | 3 --- dockers/docker-fpm-frr/docker_init.sh | 4 ---- dockers/docker-iccpd/start.sh | 3 --- dockers/docker-lldp/start.sh | 4 ---- dockers/docker-macsec/Dockerfile.j2 | 1 - dockers/docker-macsec/start.sh | 6 ------ dockers/docker-macsec/supervisord.conf | 11 ----------- dockers/docker-mux/docker-init.sh | 4 ---- dockers/docker-nat/start.sh | 4 ---- dockers/docker-orchagent/docker-init.j2 | 4 ---- dockers/docker-platform-monitor/docker_init.j2 | 4 ---- dockers/docker-router-advertiser/docker-init.sh | 4 ---- dockers/docker-sflow/Dockerfile.j2 | 1 - dockers/docker-sflow/start.sh | 5 ----- dockers/docker-sflow/supervisord.conf | 11 ----------- dockers/docker-snmp/start.sh | 4 ---- dockers/docker-sonic-gnmi/start.sh | 4 ---- dockers/docker-sonic-mgmt-framework/start.sh | 4 ---- dockers/docker-sonic-p4rt/start.sh | 3 --- dockers/docker-sonic-telemetry/start.sh | 4 ---- dockers/docker-teamd/start.sh | 4 ---- rules/docker-bmp.mk | 2 +- rules/docker-database.mk | 2 +- rules/docker-dhcp-relay.mk | 2 +- rules/docker-dhcp-server.mk | 1 + rules/docker-eventd.mk | 2 +- rules/docker-fpm-frr.mk | 2 +- rules/docker-gnmi.mk | 2 +- rules/docker-iccpd.mk | 2 +- rules/docker-lldp.mk | 2 +- rules/docker-macsec.mk | 2 +- rules/docker-mux.mk | 2 +- rules/docker-nat.mk | 2 +- rules/docker-orchagent.mk | 2 +- rules/docker-p4rt.mk | 2 +- rules/docker-platform-monitor.mk | 2 +- rules/docker-router-advertiser.mk | 2 +- rules/docker-sflow.mk | 2 +- rules/docker-snmp.mk | 2 +- rules/docker-sonic-mgmt-framework.mk | 2 +- rules/docker-teamd.mk | 2 +- rules/docker-telemetry.mk | 2 +- 45 files changed, 21 insertions(+), 124 deletions(-) delete mode 100644 dockers/docker-macsec/start.sh delete mode 100644 dockers/docker-sflow/start.sh diff --git a/dockers/docker-database/docker-database-init.sh b/dockers/docker-database/docker-database-init.sh index 076e06396447..7afdbf6dc477 100755 --- a/dockers/docker-database/docker-database-init.sh +++ b/dockers/docker-database/docker-database-init.sh @@ -133,10 +133,6 @@ do chown -R redis:redis /var/lib/$inst done -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - chown -R redis:redis $REDIS_DIR REDIS_BMP_DIR="/var/lib/redis_bmp" chown -R redis:redis $REDIS_BMP_DIR diff --git a/dockers/docker-dhcp-relay/start.sh b/dockers/docker-dhcp-relay/start.sh index ce0dce10ed3c..87a9e5711f2f 100755 --- a/dockers/docker-dhcp-relay/start.sh +++ b/dockers/docker-dhcp-relay/start.sh @@ -10,10 +10,6 @@ then ${CTR_SCRIPT} -f dhcp_relay -o ${RUNTIME_OWNER} -v ${IMAGE_VERSION} fi -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - # If our supervisor config has entries in the "dhcp-relay" group... if [ $(supervisorctl status | grep -c "^dhcp-relay:") -gt 0 ]; then # Wait for all interfaces to come up and be assigned IPv4 addresses before diff --git a/dockers/docker-dhcp-server/start.sh b/dockers/docker-dhcp-server/start.sh index 46b8eb503a4a..e24f742b4a93 100755 --- a/dockers/docker-dhcp-server/start.sh +++ b/dockers/docker-dhcp-server/start.sh @@ -13,7 +13,3 @@ if test -f ${CTR_SCRIPT} then ${CTR_SCRIPT} -f dhcp_server -o ${RUNTIME_OWNER} -v ${IMAGE_VERSION} fi - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-eventd/start.sh b/dockers/docker-eventd/start.sh index 2c357a857436..60cd6a00aecb 100755 --- a/dockers/docker-eventd/start.sh +++ b/dockers/docker-eventd/start.sh @@ -4,6 +4,3 @@ if [ "${RUNTIME_OWNER}" == "" ]; then RUNTIME_OWNER="kube" fi -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-fpm-frr/docker_init.sh b/dockers/docker-fpm-frr/docker_init.sh index 662a78b5adcf..e24585945ccc 100755 --- a/dockers/docker-fpm-frr/docker_init.sh +++ b/dockers/docker-fpm-frr/docker_init.sh @@ -108,8 +108,4 @@ chmod 0755 /usr/sbin/bgp-unisolate mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - exec /usr/local/bin/supervisord diff --git a/dockers/docker-iccpd/start.sh b/dockers/docker-iccpd/start.sh index cb36ce69cfff..85a1c49edab1 100644 --- a/dockers/docker-iccpd/start.sh +++ b/dockers/docker-iccpd/start.sh @@ -11,6 +11,3 @@ sonic-cfggen -d -t /usr/share/sonic/templates/iccpd.j2 > $ICCPD_CONF_PATH/iccpd. mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-lldp/start.sh b/dockers/docker-lldp/start.sh index 5295daed8a9d..e92105db3712 100755 --- a/dockers/docker-lldp/start.sh +++ b/dockers/docker-lldp/start.sh @@ -23,7 +23,3 @@ mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status rm -f /var/run/lldpd.socket - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-macsec/Dockerfile.j2 b/dockers/docker-macsec/Dockerfile.j2 index fc8674859f27..e616a5569b32 100644 --- a/dockers/docker-macsec/Dockerfile.j2 +++ b/dockers/docker-macsec/Dockerfile.j2 @@ -21,7 +21,6 @@ RUN apt-get clean -y && \ apt-get autoremove -y && \ rm -rf /debs -COPY ["start.sh", "/usr/bin/"] COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] COPY ["files/supervisor-proc-exit-listener", "/usr/bin"] COPY ["critical_processes", "/etc/supervisor"] diff --git a/dockers/docker-macsec/start.sh b/dockers/docker-macsec/start.sh deleted file mode 100644 index bfb684eecadd..000000000000 --- a/dockers/docker-macsec/start.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - diff --git a/dockers/docker-macsec/supervisord.conf b/dockers/docker-macsec/supervisord.conf index 3ab4f372f101..fb88f17049b2 100644 --- a/dockers/docker-macsec/supervisord.conf +++ b/dockers/docker-macsec/supervisord.conf @@ -28,17 +28,6 @@ stdout_logfile=syslog stderr_logfile=syslog dependent_startup=true -[program:start] -command=/usr/bin/start.sh -priority=2 -autostart=false -autorestart=false -startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog -dependent_startup=true -dependent_startup_wait_for=rsyslogd:running - [program:macsecmgrd] command=/usr/bin/macsecmgrd priority=2 diff --git a/dockers/docker-mux/docker-init.sh b/dockers/docker-mux/docker-init.sh index 1679ec5d9f8f..bea1686132a1 100755 --- a/dockers/docker-mux/docker-init.sh +++ b/dockers/docker-mux/docker-init.sh @@ -3,10 +3,6 @@ # Generate supervisord config file mkdir -p /etc/supervisor/conf.d/ -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - # The docker container should start this script as PID 1, so now that supervisord is # properly configured, we exec supervisord so that it runs as PID 1 for the # duration of the container's lifetime diff --git a/dockers/docker-nat/start.sh b/dockers/docker-nat/start.sh index 74912ce01485..68603d007a51 100755 --- a/dockers/docker-nat/start.sh +++ b/dockers/docker-nat/start.sh @@ -3,7 +3,3 @@ rm -f /var/run/nat/* mkdir -p /var/warmboot/nat - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-orchagent/docker-init.j2 b/dockers/docker-orchagent/docker-init.j2 index af37252a7a71..39e95c73332b 100755 --- a/dockers/docker-orchagent/docker-init.j2 +++ b/dockers/docker-orchagent/docker-init.j2 @@ -70,8 +70,4 @@ if [ -f "$IS_SUPERVISOR" ]; then fi fi -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - exec /usr/local/bin/supervisord diff --git a/dockers/docker-platform-monitor/docker_init.j2 b/dockers/docker-platform-monitor/docker_init.j2 index ebef713e27f1..c8e2943e6688 100755 --- a/dockers/docker-platform-monitor/docker_init.j2 +++ b/dockers/docker-platform-monitor/docker_init.j2 @@ -128,8 +128,4 @@ else sonic-cfggen -d -a "$confvar" -t $SUPERVISOR_CONF_TEMPLATE > $SUPERVISOR_CONF_FILE fi -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - exec /usr/local/bin/supervisord diff --git a/dockers/docker-router-advertiser/docker-init.sh b/dockers/docker-router-advertiser/docker-init.sh index 02c5a8c72be1..6e1bb5545f82 100755 --- a/dockers/docker-router-advertiser/docker-init.sh +++ b/dockers/docker-router-advertiser/docker-init.sh @@ -14,8 +14,4 @@ sonic-cfggen $CFGGEN_PARAMS chmod +x /usr/bin/wait_for_link.sh -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - exec /usr/local/bin/supervisord diff --git a/dockers/docker-sflow/Dockerfile.j2 b/dockers/docker-sflow/Dockerfile.j2 index a5eebf3a0959..75ad9169cec5 100644 --- a/dockers/docker-sflow/Dockerfile.j2 +++ b/dockers/docker-sflow/Dockerfile.j2 @@ -26,7 +26,6 @@ RUN apt-get clean -y && \ RUN sed -ri '/^DAEMON_ARGS=""/c DAEMON_ARGS="-c /var/log/hsflowd.crash"' /etc/init.d/hsflowd -COPY ["start.sh", "/usr/bin/"] COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] COPY ["files/supervisor-proc-exit-listener", "/usr/bin"] COPY ["critical_processes", "/etc/supervisor"] diff --git a/dockers/docker-sflow/start.sh b/dockers/docker-sflow/start.sh deleted file mode 100644 index 8996769c4c5e..000000000000 --- a/dockers/docker-sflow/start.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-sflow/supervisord.conf b/dockers/docker-sflow/supervisord.conf index d6cd5092e53d..2c8b006df917 100644 --- a/dockers/docker-sflow/supervisord.conf +++ b/dockers/docker-sflow/supervisord.conf @@ -28,17 +28,6 @@ stdout_logfile=syslog stderr_logfile=syslog dependent_startup=true -[program:start] -command=/usr/bin/start.sh -priority=2 -autostart=false -autorestart=false -startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog -dependent_startup=true -dependent_startup_wait_for=rsyslogd:running - [program:sflowmgrd] command=/usr/bin/sflowmgrd priority=2 diff --git a/dockers/docker-snmp/start.sh b/dockers/docker-snmp/start.sh index 6de6f740b0ad..aefd0bfc3db6 100755 --- a/dockers/docker-snmp/start.sh +++ b/dockers/docker-snmp/start.sh @@ -27,7 +27,3 @@ sonic-cfggen $SONIC_CFGGEN_ARGS mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-sonic-gnmi/start.sh b/dockers/docker-sonic-gnmi/start.sh index c3a928a6f800..2401f3c3d7cd 100755 --- a/dockers/docker-sonic-gnmi/start.sh +++ b/dockers/docker-sonic-gnmi/start.sh @@ -12,7 +12,3 @@ fi mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-sonic-mgmt-framework/start.sh b/dockers/docker-sonic-mgmt-framework/start.sh index 2fefbb349cb5..d6722a27fc77 100755 --- a/dockers/docker-sonic-mgmt-framework/start.sh +++ b/dockers/docker-sonic-mgmt-framework/start.sh @@ -2,7 +2,3 @@ mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-sonic-p4rt/start.sh b/dockers/docker-sonic-p4rt/start.sh index 2fefbb349cb5..d64f9d1dbc8f 100755 --- a/dockers/docker-sonic-p4rt/start.sh +++ b/dockers/docker-sonic-p4rt/start.sh @@ -3,6 +3,3 @@ mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-sonic-telemetry/start.sh b/dockers/docker-sonic-telemetry/start.sh index 8d36f740fa38..08f7292f55ba 100755 --- a/dockers/docker-sonic-telemetry/start.sh +++ b/dockers/docker-sonic-telemetry/start.sh @@ -12,7 +12,3 @@ fi mkdir -p /var/sonic echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/dockers/docker-teamd/start.sh b/dockers/docker-teamd/start.sh index 0b45239355ee..d67bc4e925c8 100755 --- a/dockers/docker-teamd/start.sh +++ b/dockers/docker-teamd/start.sh @@ -3,7 +3,3 @@ rm -f /var/run/teamd/* mkdir -p /var/warmboot/teamd - -TZ=$(cat /etc/timezone) -rm -rf /etc/localtime -ln -sf /usr/share/zoneinfo/$TZ /etc/localtime diff --git a/rules/docker-bmp.mk b/rules/docker-bmp.mk index b38718a161c6..95ad79799e65 100644 --- a/rules/docker-bmp.mk +++ b/rules/docker-bmp.mk @@ -39,7 +39,7 @@ endif $(DOCKER_BMP)_CONTAINER_NAME = bmp $(DOCKER_BMP)_RUN_OPT += -t $(DOCKER_BMP)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_BMP)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_BMP)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_BMP)_RUN_OPT += -v /var/run/dbus:/var/run/dbus:rw $(DOCKER_BMP)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-database.mk b/rules/docker-database.mk index 3b16960f632a..55e78b523362 100644 --- a/rules/docker-database.mk +++ b/rules/docker-database.mk @@ -30,7 +30,7 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_DATABASE_DBG) $(DOCKER_DATABASE)_CONTAINER_NAME = database $(DOCKER_DATABASE)_RUN_OPT += -t --security-opt apparmor=unconfined --security-opt="systempaths=unconfined" $(DOCKER_DATABASE)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_DATABASE)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_DATABASE)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_DATABASE)_BASE_IMAGE_FILES += redis-cli:/usr/bin/redis-cli $(DOCKER_DATABASE)_FILES += $(SYSCTL_NET_CONFIG) $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk index 6462b4d41165..c8aa011d43f9 100644 --- a/rules/docker-dhcp-relay.mk +++ b/rules/docker-dhcp-relay.mk @@ -48,7 +48,7 @@ endif $(DOCKER_DHCP_RELAY)_CONTAINER_NAME = dhcp_relay $(DOCKER_DHCP_RELAY)_CONTAINER_PRIVILEGED = false $(DOCKER_DHCP_RELAY)_CONTAINER_VOLUMES += /etc/sonic:/etc/sonic:ro -$(DOCKER_DHCP_RELAY)_CONTAINER_VOLUMES += /etc/timezone:/etc/timezone:ro +$(DOCKER_DHCP_RELAY)_CONTAINER_VOLUMES += /etc/localtime:/etc/localtime:ro $(DOCKER_DHCP_RELAY)_CONTAINER_TMPFS += /tmp/ $(DOCKER_DHCP_RELAY)_CONTAINER_TMPFS += /var/tmp/ diff --git a/rules/docker-dhcp-server.mk b/rules/docker-dhcp-server.mk index b3960f16a9c6..530fdd9a4112 100644 --- a/rules/docker-dhcp-server.mk +++ b/rules/docker-dhcp-server.mk @@ -37,6 +37,7 @@ endif $(DOCKER_DHCP_SERVER)_CONTAINER_NAME = dhcp_server $(DOCKER_DHCP_SERVER)_VERSION = 1.0.0 $(DOCKER_DHCP_SERVER)_PACKAGE_NAME = dhcp-server +$(DOCKER_DHCP_SERVER)_CONTAINER_VOLUMES += /etc/localtime:/etc/localtime:ro $(DOCKER_DHCP_SERVER)_SERVICE_REQUIRES = config-setup $(DOCKER_DHCP_SERVER)_SERVICE_AFTER = swss syncd diff --git a/rules/docker-eventd.mk b/rules/docker-eventd.mk index 77c4fad21ea8..510dc338af00 100644 --- a/rules/docker-eventd.mk +++ b/rules/docker-eventd.mk @@ -35,7 +35,7 @@ $(DOCKER_EVENTD)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) $(DOCKER_EVENTD)_CONTAINER_NAME = eventd $(DOCKER_EVENTD)_RUN_OPT += -t $(DOCKER_EVENTD)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_EVENTD)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_EVENTD)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro SONIC_BOOKWORM_DOCKERS += $(DOCKER_EVENTD) SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_EVENTD_DBG) diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk index f3353e3a34d9..edfa17f5eb68 100644 --- a/rules/docker-fpm-frr.mk +++ b/rules/docker-fpm-frr.mk @@ -30,7 +30,7 @@ SONIC_DOCKER_DBG_IMAGES += $(DOCKER_FPM_FRR_DBG) $(DOCKER_FPM_FRR)_CONTAINER_NAME = bgp $(DOCKER_FPM_FRR)_RUN_OPT += -t --cap-add=NET_ADMIN --cap-add=SYS_ADMIN $(DOCKER_FPM_FRR)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_FPM_FRR)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_FPM_FRR)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_FPM_FRR)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-gnmi.mk b/rules/docker-gnmi.mk index fccbafd2a880..9f2c6ac7406e 100644 --- a/rules/docker-gnmi.mk +++ b/rules/docker-gnmi.mk @@ -32,7 +32,7 @@ endif $(DOCKER_GNMI)_CONTAINER_NAME = gnmi $(DOCKER_GNMI)_RUN_OPT += -t $(DOCKER_GNMI)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_GNMI)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_GNMI)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_GNMI)_RUN_OPT += -v /var/run/dbus:/var/run/dbus:rw $(DOCKER_GNMI)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-iccpd.mk b/rules/docker-iccpd.mk index a83f93642e98..eff5b4d68dcd 100644 --- a/rules/docker-iccpd.mk +++ b/rules/docker-iccpd.mk @@ -23,7 +23,7 @@ endif $(DOCKER_ICCPD)_CONTAINER_NAME = iccpd $(DOCKER_ICCPD)_RUN_OPT += -t --cap-add=NET_ADMIN $(DOCKER_ICCPD)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_ICCPD)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_ICCPD)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_ICCPD)_BASE_IMAGE_FILES += mclagdctl:/usr/bin/mclagdctl diff --git a/rules/docker-lldp.mk b/rules/docker-lldp.mk index 81cc582a3f1b..e245da3dcae3 100644 --- a/rules/docker-lldp.mk +++ b/rules/docker-lldp.mk @@ -30,7 +30,7 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_LLDP_DBG) $(DOCKER_LLDP)_CONTAINER_NAME = lldp $(DOCKER_LLDP)_RUN_OPT += -t --cap-add=NET_ADMIN $(DOCKER_LLDP)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_LLDP)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_LLDP)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_LLDP)_BASE_IMAGE_FILES += lldpctl:/usr/bin/lldpctl $(DOCKER_LLDP)_BASE_IMAGE_FILES += lldpcli:/usr/bin/lldpcli diff --git a/rules/docker-macsec.mk b/rules/docker-macsec.mk index df52eccdf70f..682ef619e9be 100644 --- a/rules/docker-macsec.mk +++ b/rules/docker-macsec.mk @@ -41,7 +41,7 @@ $(DOCKER_MACSEC)_VERSION = 1.0.0 $(DOCKER_MACSEC)_PACKAGE_NAME = macsec $(DOCKER_MACSEC)_CONTAINER_PRIVILEGED = false $(DOCKER_MACSEC)_CONTAINER_VOLUMES += /etc/sonic:/etc/sonic:ro -$(DOCKER_MACSEC)_CONTAINER_VOLUMES += /etc/timezone:/etc/timezone:ro +$(DOCKER_MACSEC)_CONTAINER_VOLUMES += /etc/localtime:/etc/localtime:ro $(DOCKER_MACSEC)_CONTAINER_VOLUMES += /host/warmboot:/var/warmboot $(DOCKER_MACSEC)_SERVICE_REQUIRES = config-setup diff --git a/rules/docker-mux.mk b/rules/docker-mux.mk index a0b173233808..1f973755cf97 100644 --- a/rules/docker-mux.mk +++ b/rules/docker-mux.mk @@ -35,5 +35,5 @@ SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_MUX_DBG) $(DOCKER_MUX)_CONTAINER_NAME = mux $(DOCKER_MUX)_RUN_OPT += -t $(DOCKER_MUX)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_MUX)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_MUX)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_MUX)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-nat.mk b/rules/docker-nat.mk index d15c43622886..475ff4507f3b 100644 --- a/rules/docker-nat.mk +++ b/rules/docker-nat.mk @@ -31,7 +31,7 @@ endif $(DOCKER_NAT)_CONTAINER_NAME = nat $(DOCKER_NAT)_RUN_OPT += -t --cap-add=NET_ADMIN $(DOCKER_NAT)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_NAT)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_NAT)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_NAT)_RUN_OPT += -v /host/warmboot:/var/warmboot $(DOCKER_NAT)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-orchagent.mk b/rules/docker-orchagent.mk index 7cf538eaeb8d..a1a6c34e88a7 100644 --- a/rules/docker-orchagent.mk +++ b/rules/docker-orchagent.mk @@ -39,7 +39,7 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_ORCHAGENT_DBG) $(DOCKER_ORCHAGENT)_CONTAINER_NAME = swss $(DOCKER_ORCHAGENT)_RUN_OPT += --privileged -t $(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/network/interfaces:/etc/network/interfaces:ro -$(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/network/interfaces.d/:/etc/network/interfaces.d/:ro $(DOCKER_ORCHAGENT)_RUN_OPT += -v /host/machine.conf:/host/machine.conf:ro $(DOCKER_ORCHAGENT)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro diff --git a/rules/docker-p4rt.mk b/rules/docker-p4rt.mk index 85cfb67552c7..4b359be3c97d 100644 --- a/rules/docker-p4rt.mk +++ b/rules/docker-p4rt.mk @@ -33,7 +33,7 @@ endif $(DOCKER_P4RT)_CONTAINER_NAME = p4rt $(DOCKER_P4RT)_RUN_OPT += -t $(DOCKER_P4RT)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_P4RT)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_P4RT)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_P4RT)_GIT_COMMIT = $(shell cd "$($(SONIC_P4RT)_SRC_PATH)" && git log -n 1 --format=format:"%H %s" || echo "Unable to fetch git log for p4rt") $(DOCKER_P4RT)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk index baf4282517d3..0b79fd936a03 100644 --- a/rules/docker-platform-monitor.mk +++ b/rules/docker-platform-monitor.mk @@ -53,7 +53,7 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_PLATFORM_MONITOR_DBG) $(DOCKER_PLATFORM_MONITOR)_CONTAINER_NAME = pmon $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += --privileged -t $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /host/reboot-cause:/host/reboot-cause:rw $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /host/pmon/stormond:/usr/share/stormond:rw $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /var/run/platform_cache:/var/run/platform_cache:ro diff --git a/rules/docker-router-advertiser.mk b/rules/docker-router-advertiser.mk index fc23a43192ef..2537bfddfedc 100644 --- a/rules/docker-router-advertiser.mk +++ b/rules/docker-router-advertiser.mk @@ -33,5 +33,5 @@ SONIC_BOOKWORM_DBG_DOCKERS += $(DOCKER_ROUTER_ADVERTISER_DBG) $(DOCKER_ROUTER_ADVERTISER)_CONTAINER_NAME = radv $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -t $(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_ROUTER_ADVERTISER)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_ROUTER_ADVERTISER)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-sflow.mk b/rules/docker-sflow.mk index cf54436a0910..84e096927d9c 100644 --- a/rules/docker-sflow.mk +++ b/rules/docker-sflow.mk @@ -32,7 +32,7 @@ endif $(DOCKER_SFLOW)_CONTAINER_NAME = sflow $(DOCKER_SFLOW)_RUN_OPT += -t --cap-add=NET_ADMIN --cap-add=SYS_ADMIN $(DOCKER_SFLOW)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_SFLOW)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_SFLOW)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_SFLOW)_RUN_OPT += -v /host/warmboot:/var/warmboot $(DOCKER_SFLOW)_BASE_IMAGE_FILES += psample:/usr/bin/psample diff --git a/rules/docker-snmp.mk b/rules/docker-snmp.mk index 3546d47787a9..e1891f672be1 100644 --- a/rules/docker-snmp.mk +++ b/rules/docker-snmp.mk @@ -30,7 +30,7 @@ SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_SNMP_DBG) $(DOCKER_SNMP)_CONTAINER_NAME = snmp $(DOCKER_SNMP)_RUN_OPT += -t $(DOCKER_SNMP)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_SNMP)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_SNMP)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_SNMP)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) $(DOCKER_SNMP)_BASE_IMAGE_FILES += monit_snmp:/etc/monit/conf.d diff --git a/rules/docker-sonic-mgmt-framework.mk b/rules/docker-sonic-mgmt-framework.mk index b93c5e1006d3..b61716bb8f64 100644 --- a/rules/docker-sonic-mgmt-framework.mk +++ b/rules/docker-sonic-mgmt-framework.mk @@ -31,7 +31,7 @@ endif $(DOCKER_MGMT_FRAMEWORK)_CONTAINER_NAME = mgmt-framework $(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += -t $(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += -v /etc:/host_etc:ro $(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += -v /var/run/dbus:/var/run/dbus:rw $(DOCKER_MGMT_FRAMEWORK)_RUN_OPT += --mount type=bind,source="/var/platform/",target="/mnt/platform/" diff --git a/rules/docker-teamd.mk b/rules/docker-teamd.mk index 6d29e0f7e4c9..400268404b2c 100644 --- a/rules/docker-teamd.mk +++ b/rules/docker-teamd.mk @@ -34,7 +34,7 @@ endif $(DOCKER_TEAMD)_CONTAINER_NAME = teamd $(DOCKER_TEAMD)_RUN_OPT += -t --cap-add=NET_ADMIN $(DOCKER_TEAMD)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_TEAMD)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_TEAMD)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_TEAMD)_RUN_OPT += -v /host/warmboot:/var/warmboot $(DOCKER_TEAMD)_BASE_IMAGE_FILES += teamdctl:/usr/bin/teamdctl diff --git a/rules/docker-telemetry.mk b/rules/docker-telemetry.mk index f710eedd572a..bcbb68dfdb97 100644 --- a/rules/docker-telemetry.mk +++ b/rules/docker-telemetry.mk @@ -30,7 +30,7 @@ endif $(DOCKER_TELEMETRY)_CONTAINER_NAME = telemetry $(DOCKER_TELEMETRY)_RUN_OPT += -t $(DOCKER_TELEMETRY)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_TELEMETRY)_RUN_OPT += -v /etc/timezone:/etc/timezone:ro +$(DOCKER_TELEMETRY)_RUN_OPT += -v /etc/localtime:/etc/localtime:ro $(DOCKER_TELEMETRY)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) $(DOCKER_TELEMETRY)_BASE_IMAGE_FILES += monit_telemetry:/etc/monit/conf.d From 5b6ff85402154bc2437d7646c7a23585237de23b Mon Sep 17 00:00:00 2001 From: abdosi <58047199+abdosi@users.noreply.github.com> Date: Thu, 12 Dec 2024 07:18:38 +0530 Subject: [PATCH 10/13] [FRR Patch] Added patch in FRR to send tag value associated with route via Netlink to fpmsyncd (#20692) * Added patch in FRR to send tag value associated with route via NETLINK RTA_PRIORITY field which can be used as attribute/metadata in fpmsyncd for different use-cases. --------- Signed-off-by: Abhishek Dosi --- ...g-value-associated-with-route-via-ne.patch | 49 +++++++++++++++++++ src/sonic-frr/patch/series | 1 + 2 files changed, 50 insertions(+) create mode 100644 src/sonic-frr/patch/0063-Patch-to-send-tag-value-associated-with-route-via-ne.patch diff --git a/src/sonic-frr/patch/0063-Patch-to-send-tag-value-associated-with-route-via-ne.patch b/src/sonic-frr/patch/0063-Patch-to-send-tag-value-associated-with-route-via-ne.patch new file mode 100644 index 000000000000..606f1ff3f38f --- /dev/null +++ b/src/sonic-frr/patch/0063-Patch-to-send-tag-value-associated-with-route-via-ne.patch @@ -0,0 +1,49 @@ +From c0418c02dabe901f5dc39c85ce2e80bd361d7c78 Mon Sep 17 00:00:00 2001 +From: Abhishek Dosi +Date: Wed, 11 Dec 2024 11:19:05 +0000 +Subject: [PATCH] Patch to send tag value associated with route via netlink in + RTA_PRIORITY field. + +Signed-off-by: Abhishek Dosi +--- + zebra/rt_netlink.c | 22 ++++++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c +index 976c245c3..1f73f5759 100644 +--- a/zebra/rt_netlink.c ++++ b/zebra/rt_netlink.c +@@ -2348,10 +2348,28 @@ ssize_t netlink_route_multipath_msg_encode(int cmd, struct zebra_dplane_ctx *ctx + * path(s) + * by the routing protocol and for communicating with protocol peers. + */ +- if (!nl_attr_put32(&req->n, datalen, RTA_PRIORITY, +- ROUTE_INSTALLATION_METRIC)) ++ if (fpm) ++ { ++ /* Patch to send tag value as route attribute using RTA_PRIORITY ++ * which can be used as metadata/attribute to take application specific ++ * action. As seen in above comment this field is not use anyways and can be ++ * use by fpmsyncd */ ++ if (!nl_attr_put32(&req->n, datalen, RTA_PRIORITY, ++ cmd == RTM_DELROUTE ? dplane_ctx_get_old_tag(ctx) : ++ dplane_ctx_get_tag(ctx))) ++ { + return 0; + ++ } ++ } ++ else ++ { ++ if (!nl_attr_put32(&req->n, datalen, RTA_PRIORITY, ++ ROUTE_INSTALLATION_METRIC)) ++ { ++ return 0; ++ } ++ } + #if defined(SUPPORT_REALMS) + if (cmd == RTM_DELROUTE) + tag = dplane_ctx_get_old_tag(ctx); +-- +2.25.1 + diff --git a/src/sonic-frr/patch/series b/src/sonic-frr/patch/series index 86ec826af8c0..3c68abe241e8 100644 --- a/src/sonic-frr/patch/series +++ b/src/sonic-frr/patch/series @@ -42,3 +42,4 @@ 0060-bgpd-Validate-both-nexthop-information-NEXTHOP-and-N.patch 0061-Set-multipath-to-514-and-disable-bgp-vnc-for-optimiz.patch 0062-zebra-lib-use-internal-rbtree-per-ns.patch +0063-Patch-to-send-tag-value-associated-with-route-via-ne.patch From 2b92c3de290832bcd5f62d8082044180ff6af6b8 Mon Sep 17 00:00:00 2001 From: vincentpcng <129542523+vincentpcng@users.noreply.github.com> Date: Wed, 11 Dec 2024 19:38:08 -0800 Subject: [PATCH 11/13] Platform DCS-7060DX5-32 MMU rollback to avoid dependancy on Broadcom (#21035) Why I did it This commit is to avoid Broadcom driver dependency on the MMU config Work item tracking Microsoft ADO (number only): How I did it We upload the basic version of the Broadcom configure with limited configuration. How to verify it We verified the change internally in Arista --- .../Arista-7060DX5-32/BALANCED | 1 - .../Arista-7060DX5-32/buffers.json.j2 | 2 - .../Arista-7060DX5-32/buffers_defaults_t0.j2 | 1 - .../Arista-7060DX5-32/buffers_defaults_t1.j2 | 1 - .../Arista-7060DX5-32/pg_profile_lookup.ini | 1 - .../Arista-7060DX5-32/qos.json.j2 | 1 - .../th4-a7060dx5-32.config.bcm | 995 ------------------ 7 files changed, 1002 deletions(-) delete mode 120000 device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/BALANCED delete mode 100644 device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers.json.j2 delete mode 120000 device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t0.j2 delete mode 120000 device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t1.j2 delete mode 120000 device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/pg_profile_lookup.ini delete mode 100644 device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/qos.json.j2 diff --git a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/BALANCED b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/BALANCED deleted file mode 120000 index 2c9506a909fb..000000000000 --- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/BALANCED +++ /dev/null @@ -1 +0,0 @@ -../../../common/profiles/th4/gen/BALANCED \ No newline at end of file diff --git a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers.json.j2 b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers.json.j2 deleted file mode 100644 index 0b1cb2c541b6..000000000000 --- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers.json.j2 +++ /dev/null @@ -1,2 +0,0 @@ -{%- set default_topo = 't1' %} -{%- include 'buffers_config.j2' %} diff --git a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t0.j2 deleted file mode 120000 index 9524e6a476ac..000000000000 --- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t0.j2 +++ /dev/null @@ -1 +0,0 @@ -BALANCED/buffers_defaults_t0.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t1.j2 deleted file mode 120000 index c25cc95d6d57..000000000000 --- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/buffers_defaults_t1.j2 +++ /dev/null @@ -1 +0,0 @@ -BALANCED/buffers_defaults_t1.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/pg_profile_lookup.ini deleted file mode 120000 index 297cddb2d223..000000000000 --- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/pg_profile_lookup.ini +++ /dev/null @@ -1 +0,0 @@ -BALANCED/pg_profile_lookup.ini \ No newline at end of file diff --git a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/qos.json.j2 b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/qos.json.j2 deleted file mode 100644 index 3e548325ea30..000000000000 --- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/qos.json.j2 +++ /dev/null @@ -1 +0,0 @@ -{%- include 'qos_config.j2' %} diff --git a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/th4-a7060dx5-32.config.bcm b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/th4-a7060dx5-32.config.bcm index f4f77baf443a..0c7dd34d35b8 100644 --- a/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/th4-a7060dx5-32.config.bcm +++ b/device/arista/x86_64-arista_7060dx5_32/Arista-7060DX5-32/th4-a7060dx5-32.config.bcm @@ -647,998 +647,3 @@ device: FP_CONFIG: FP_ING_OPERMODE: GLOBAL_PIPE_AWARE ... ---- -device: - 0: - TM_THD_CONFIG: - SKIP_BUFFER_RESERVATION: 1 - THRESHOLD_MODE: LOSSY_AND_LOSSLESS - - TM_SCHEDULER_CONFIG: - NUM_MC_Q: NUM_MC_Q_2 -... ---- -device: - 0: - TM_ING_THD_PORT_PRI_GRP: - ? - PORT_ID: [[0,67], [204,219], [221,253],[255,271]] - TM_PRI_GRP_ID: [[0,7]] - : - MIN_GUARANTEE_CELLS: 0 - DYNAMIC_SHARED_LIMITS: 0 - SHARED_LIMIT_CELLS_STATIC: 0 - HEADROOM_LIMIT_CELLS: 0 - - TM_ING_THD_PORT_SERVICE_POOL: - ? - PORT_ID: [[0,67], [204,219], [221,253],[255,271]] - TM_ING_SERVICE_POOL_ID: [[0,3]] - : - MIN_GUARANTEE_CELLS: 0 - SHARED_LIMIT_CELLS: 0 - - TM_ING_THD_HEADROOM_POOL: - ? - BUFFER_POOL: 0 - TM_HEADROOM_POOL_ID: [[0,3]] - : - LIMIT_CELLS: 0 - - TM_THD_UC_Q: - ? - PORT_ID: [[1,67], [204,219], [221,253],[255,271]] - TM_UC_Q_ID: [[0,11]] - : - MIN_GUARANTEE_CELLS: 0 - SHARED_LIMITS: 1 - DYNAMIC_SHARED_LIMITS: 0 - SHARED_LIMIT_CELLS_STATIC: 0 - - TM_THD_MC_Q: - ? - PORT_ID: 0 - TM_MC_Q_ID: [[0,47]] - : - MIN_GUARANTEE_CELLS: 0 - ? - PORT_ID: [[1,67], [204,219], [221,253],[255,271]] - TM_MC_Q_ID: [[0,5]] - : - MIN_GUARANTEE_CELLS: 0 - SHARED_LIMITS: 1 - DYNAMIC_SHARED_LIMITS: 0 - SHARED_LIMIT_CELLS_STATIC: 0 - - TM_THD_Q_GRP: - ? - PORT_ID: [[0,67], [204,219], [221,253],[255,271]] - : - UC_Q_GRP_MIN_GUARANTEE_CELLS: 0 - MC_Q_GRP_MIN_GUARANTEE_CELLS: 0 -... ---- -device: - 0: - TM_ING_PORT: - ? - PORT_ID: [[0,67], [204,219], [221,253],[255,271]] - : - PAUSE: 0 - - TM_ING_PORT_PRI_GRP: - ? - PORT_ID: [[0,67], [204,219], [221,253],[255,271]] - TM_PRI_GRP_ID: [[0,7]] - : - PFC: 0 - LOSSLESS: 0 - ING_MIN_MODE: USE_PRI_GRP_MIN - - TM_PORT_UC_Q_TO_SERVICE_POOL: - ? - PORT_ID: [[1,67], [204,219], [221,253],[255,271]] - TM_UC_Q_ID: [[0,11]] - : - USE_QGROUP_MIN: 0 - - TM_PORT_MC_Q_TO_SERVICE_POOL: - ? - PORT_ID: 0 - TM_MC_Q_ID: [[0,47]] - : - USE_QGROUP_MIN: 0 - ? - PORT_ID: [[1,67], [204,219], [221,253],[255,271]] - TM_MC_Q_ID: [[0,5]] - : - USE_QGROUP_MIN: 0 -... ---- -device: - 0: - TM_ING_THD_HEADROOM_POOL: - ? - BUFFER_POOL: 0 - TM_HEADROOM_POOL_ID: [[0,3]] - : - LIMIT_CELLS: 0 - - TM_ING_THD_SERVICE_POOL: - ? - BUFFER_POOL: 0 - TM_ING_SERVICE_POOL_ID: [[0,3]] - : - SHARED_LIMIT_CELLS: 0 - SHARED_RESUME_OFFSET_CELLS: 0 - COLOR_SPECIFIC_LIMITS: 0 - - TM_EGR_THD_SERVICE_POOL: - ? - BUFFER_POOL: 0 - TM_EGR_SERVICE_POOL_ID: [[0,3]] - : - SHARED_LIMIT_CELLS: 0 - SHARED_RESUME_LIMIT_CELLS: 0 - COLOR_SPECIFIC_LIMITS: 0 - YELLOW_SHARED_LIMIT_CELLS: 0 - YELLOW_SHARED_RESUME_LIMIT_CELLS: 0 - RED_SHARED_LIMIT_CELLS: 0 - RED_SHARED_RESUME_LIMIT_CELLS: 0 - - TM_THD_MC_EGR_SERVICE_POOL: - ? - BUFFER_POOL: 0 - TM_EGR_SERVICE_POOL_ID: [[0,3]] - : - SHARED_LIMIT_CELLS: 0 - SHARED_RESUME_LIMIT_CELLS: 0 - COLOR_SPECIFIC_LIMITS: 0 - YELLOW_SHARED_LIMIT_CELLS: 0 - YELLOW_SHARED_RESUME_LIMIT_CELLS: 0 - RED_SHARED_LIMIT_CELLS: 0 - RED_SHARED_RESUME_LIMIT_CELLS: 0 -... - -### Mapping ---- -device: - 0: - TM_ING_UC_ING_PRI_MAP: - ? - # Profile 1 - TM_ING_UC_ING_PRI_MAP_ID: 1 - ING_PRI: [0, 1, 2, 5, 6, [8,15]] - : - TM_PRI_GRP_ID: 0 - ? - TM_ING_UC_ING_PRI_MAP_ID: 1 - ING_PRI: 3 - : - TM_PRI_GRP_ID: 3 - ? - TM_ING_UC_ING_PRI_MAP_ID: 1 - ING_PRI: 4 - : - TM_PRI_GRP_ID: 4 - ? - TM_ING_UC_ING_PRI_MAP_ID: 1 - ING_PRI: 7 - : - TM_PRI_GRP_ID: 7 - ? - # Profile 2 - TM_ING_UC_ING_PRI_MAP_ID: 1 - ING_PRI: [0, 1, 5, [8,15]] - : - TM_PRI_GRP_ID: 0 - ? - TM_ING_UC_ING_PRI_MAP_ID: 2 - ING_PRI: 2 - : - TM_PRI_GRP_ID: 2 - ? - TM_ING_UC_ING_PRI_MAP_ID: 2 - ING_PRI: 3 - : - TM_PRI_GRP_ID: 3 - ? - TM_ING_UC_ING_PRI_MAP_ID: 2 - ING_PRI: 4 - : - TM_PRI_GRP_ID: 4 - ? - TM_ING_UC_ING_PRI_MAP_ID: 2 - ING_PRI: 6 - : - TM_PRI_GRP_ID: 6 - ? - TM_ING_UC_ING_PRI_MAP_ID: 2 - ING_PRI: 7 - : - TM_PRI_GRP_ID: 7 - ? - # Profile 3 - TM_ING_UC_ING_PRI_MAP_ID: 3 - ING_PRI: [[0,15]] - : - TM_PRI_GRP_ID: 7 - - TM_ING_NONUC_ING_PRI_MAP: - ? - # Profile 1 - TM_ING_NONUC_ING_PRI_MAP_ID: 1 - ING_PRI: [0, 1, 2, 5, 6, [8,15]] - : - TM_PRI_GRP_ID: 0 - ? - TM_ING_NONUC_ING_PRI_MAP_ID: 1 - ING_PRI: 3 - : - TM_PRI_GRP_ID: 3 - ? - TM_ING_NONUC_ING_PRI_MAP_ID: 1 - ING_PRI: 4 - : - TM_PRI_GRP_ID: 4 - ? - TM_ING_NONUC_ING_PRI_MAP_ID: 1 - ING_PRI: 7 - : - TM_PRI_GRP_ID: 7 - ? - # Profile 2 - TM_ING_NONUC_ING_PRI_MAP_ID: 1 - ING_PRI: [0, 1, 5, [8,15]] - : - TM_PRI_GRP_ID: 0 - ? - TM_ING_NONUC_ING_PRI_MAP_ID: 2 - ING_PRI: 2 - : - TM_PRI_GRP_ID: 2 - ? - TM_ING_NONUC_ING_PRI_MAP_ID: 2 - ING_PRI: 3 - : - TM_PRI_GRP_ID: 3 - ? - TM_ING_NONUC_ING_PRI_MAP_ID: 2 - ING_PRI: 4 - : - TM_PRI_GRP_ID: 4 - ? - TM_ING_NONUC_ING_PRI_MAP_ID: 2 - ING_PRI: 6 - : - TM_PRI_GRP_ID: 6 - ? - TM_ING_NONUC_ING_PRI_MAP_ID: 2 - ING_PRI: 7 - : - TM_PRI_GRP_ID: 7 - ? - # Profile 3 - TM_ING_NONUC_ING_PRI_MAP_ID: 3 - ING_PRI: [[0,15]] - : - TM_PRI_GRP_ID: 7 - - TM_PRI_GRP_POOL_MAP: - ? - TM_PRI_GRP_POOL_MAP_ID: 1 - TM_PRI_GRP_ID: [[0,6]] - : - TM_ING_SERVICE_POOL_ID: 0 - TM_HEADROOM_POOL_ID: 0 - ? - TM_PRI_GRP_POOL_MAP_ID: 1 - TM_PRI_GRP_ID: 7 - : - TM_ING_SERVICE_POOL_ID: 1 - TM_HEADROOM_POOL_ID: 1 - - TM_ING_PORT: - ? - PORT_ID: [0] - : - ING_PRI_MAP_ID: 3 - PRI_GRP_MAP_ID: 1 - ? - PORT_ID: [[1,4], [204,207]] - : - ING_PRI_MAP_ID: 1 - PRI_GRP_MAP_ID: 1 - ? - PORT_ID: [[17,20], [34,37], [51,54], [221,224], [238,241], [255,258]] - : - ING_PRI_MAP_ID: 2 - PRI_GRP_MAP_ID: 1 - ? - PORT_ID: [50] - : - ING_PRI_MAP_ID: 1 - PRI_GRP_MAP_ID: 1 - ? - PORT_ID: [33, 67, 237, 271] - : - ING_PRI_MAP_ID: 1 - PRI_GRP_MAP_ID: 1 - - TM_PORT_UC_Q_TO_SERVICE_POOL: - ? - PORT_ID: [[1,4], [17,20], [33,37], [50,54], 67, [204,207], [221,224], [237,241], [255,258], 271] - TM_UC_Q_ID: [[0,6], [8,9]] - : - TM_EGR_SERVICE_POOL_ID: 0 - ? - PORT_ID: [[1,4], [17,20], [33,37], [50,54], 67, [204,207], [221,224], [237,241], [255,258], 271] - TM_UC_Q_ID: 7 - : - TM_EGR_SERVICE_POOL_ID: 1 - - TM_PORT_MC_Q_TO_SERVICE_POOL: - ? - PORT_ID: [0] - TM_MC_Q_ID: [[0,47]] - : - TM_EGR_SERVICE_POOL_ID: 1 - ? - PORT_ID: [[1,4], [17,20], [33,37], [50,54], 67, [204,207], [221,224], [237,241], [255,258], 271] - TM_MC_Q_ID: [[0,1]] - : - TM_EGR_SERVICE_POOL_ID: 0 -... - -### Scheduler ---- -device: - 0: - TM_SCHEDULER_PROFILE: - ? - TM_SCHEDULER_PROFILE_ID: 1 - TM_SCHEDULER_NODE_ID: [0, 1] - : - NUM_UC_Q: 1 - NUM_MC_Q: 1 - FLOW_CTRL_UC: 0 - ? - TM_SCHEDULER_PROFILE_ID: 1 - TM_SCHEDULER_NODE_ID: [2, 5, 6, 7, 8, 9] - : - NUM_UC_Q: 1 - NUM_MC_Q: 0 - FLOW_CTRL_UC: 0 - ? - TM_SCHEDULER_PROFILE_ID: 1 - TM_SCHEDULER_NODE_ID: [3, 4] - : - NUM_UC_Q: 1 - NUM_MC_Q: 0 - FLOW_CTRL_UC: 1 - ? - TM_SCHEDULER_PROFILE_ID: 1 - TM_SCHEDULER_NODE_ID: [10, 11] - : - NUM_UC_Q: 0 - NUM_MC_Q: 0 - FLOW_CTRL_UC: 0 - - TM_SCHEDULER_PROFILE: - ? - TM_SCHEDULER_PROFILE_ID: 2 - TM_SCHEDULER_NODE_ID: [0, 1] - : - NUM_UC_Q: 1 - NUM_MC_Q: 1 - FLOW_CTRL_UC: 0 - ? - TM_SCHEDULER_PROFILE_ID: 2 - TM_SCHEDULER_NODE_ID: [5, 7, 8, 9] - : - NUM_UC_Q: 1 - NUM_MC_Q: 0 - FLOW_CTRL_UC: 0 - ? - TM_SCHEDULER_PROFILE_ID: 2 - TM_SCHEDULER_NODE_ID: [2, 3, 4, 6] - : - NUM_UC_Q: 1 - NUM_MC_Q: 0 - FLOW_CTRL_UC: 1 - ? - TM_SCHEDULER_PROFILE_ID: 2 - TM_SCHEDULER_NODE_ID: [10, 11] - : - NUM_UC_Q: 0 - NUM_MC_Q: 0 - FLOW_CTRL_UC: 0 -... ---- -device: - 0: - TM_SCHEDULER_PORT_PROFILE: - ? - PORT_ID: [[1,4], [204,207]] - : - TM_SCHEDULER_PROFILE_ID: 1 - WRR: 0 - TM_SCHEDULER_PORT_PROFILE: - ? - PORT_ID: [[17,20], [34,37], [51,54], [221,224], [238,241], [255,258]] - : - TM_SCHEDULER_PROFILE_ID: 2 - WRR: 0 -... - -### Pools -### hard code service pool size for TH4 per architecture requirement. ---- -device: - 0: - TM_ING_THD_HEADROOM_POOL: - ? - BUFFER_POOL: 0 - TM_HEADROOM_POOL_ID: 0 - : - LIMIT_CELLS: 45696 - - TM_ING_THD_SERVICE_POOL: - ? - BUFFER_POOL: 0 - TM_ING_SERVICE_POOL_ID: 0 - : - SHARED_LIMIT_CELLS: 173222 - SHARED_RESUME_OFFSET_CELLS: 74 - COLOR_SPECIFIC_LIMITS: 0 - ? - BUFFER_POOL: 0 - TM_ING_SERVICE_POOL_ID: 1 - : - SHARED_LIMIT_CELLS: 605 - SHARED_RESUME_OFFSET_CELLS: 74 - COLOR_SPECIFIC_LIMITS: 0 - - TM_EGR_THD_SERVICE_POOL: - ? - BUFFER_POOL: 0 - TM_EGR_SERVICE_POOL_ID: 0 - : - SHARED_LIMIT_CELLS: 173222 - SHARED_RESUME_LIMIT_CELLS: 21643 - COLOR_SPECIFIC_LIMITS: 1 - YELLOW_SHARED_LIMIT_CELLS: 16240 - YELLOW_SHARED_RESUME_LIMIT_CELLS: 16230 - RED_SHARED_LIMIT_CELLS: 13533 - RED_SHARED_RESUME_LIMIT_CELLS: 13523 - ? - BUFFER_POOL: 0 - TM_EGR_SERVICE_POOL_ID: 1 - : - SHARED_LIMIT_CELLS: 605 - SHARED_RESUME_LIMIT_CELLS: 73 - COLOR_SPECIFIC_LIMITS: 1 - YELLOW_SHARED_LIMIT_CELLS: 57 - YELLOW_SHARED_RESUME_LIMIT_CELLS: 55 - RED_SHARED_LIMIT_CELLS: 48 - RED_SHARED_RESUME_LIMIT_CELLS: 46 - - TM_THD_MC_EGR_SERVICE_POOL: - ? - BUFFER_POOL: 0 - TM_EGR_SERVICE_POOL_ID: 0 - : - SHARED_LIMIT_CELLS: 15779 - SHARED_RESUME_LIMIT_CELLS: 1962 - COLOR_SPECIFIC_LIMITS: 1 - YELLOW_SHARED_LIMIT_CELLS: 1480 - YELLOW_SHARED_RESUME_LIMIT_CELLS: 1470 - RED_SHARED_LIMIT_CELLS: 1233 - RED_SHARED_RESUME_LIMIT_CELLS: 1223 - ? - BUFFER_POOL: 0 - TM_EGR_SERVICE_POOL_ID: 1 - : - SHARED_LIMIT_CELLS: 605 - SHARED_RESUME_LIMIT_CELLS: 73 - COLOR_SPECIFIC_LIMITS: 1 - YELLOW_SHARED_LIMIT_CELLS: 57 - YELLOW_SHARED_RESUME_LIMIT_CELLS: 55 - RED_SHARED_LIMIT_CELLS: 46 - RED_SHARED_RESUME_LIMIT_CELLS: 46 -... - -### Thresholds -###################################### ---- -device: - 0: - TM_ING_THD_PORT_PRI_GRP: - ? - PORT_ID: [[0,4], [17,20], [33,37], [50,54], 67, [204,207], [221,224], [237,241], [255,258], 271] - TM_PRI_GRP_ID: [0, 1, 5, 7] - : - SHARED_LIMIT_CELLS_STATIC: 227317 - MIN_GUARANTEE_CELLS: 0 - DYNAMIC_SHARED_LIMITS: 0 - RESUME_OFFSET_CELLS: 0 - RESUME_FLOOR_CELLS: 0 - HEADROOM_LIMIT_AUTO: 0 - HEADROOM_LIMIT_CELLS: 0 - ? - PORT_ID: [[1,4], [204,207]] - TM_PRI_GRP_ID: [2, 3, 4, 6] - : - MIN_GUARANTEE_CELLS: 18 - DYNAMIC_SHARED_LIMITS: 1 - SHARED_LIMIT_DYNAMIC: ALPHA_1_4 - RESUME_OFFSET_CELLS: 18 - RESUME_FLOOR_CELLS: 0 - HEADROOM_LIMIT_AUTO: 0 - HEADROOM_LIMIT_CELLS: 2874 - ? - PORT_ID: [[17,20], [34,37], [51,54], [221,224], [238,241], [255,258]] - TM_PRI_GRP_ID: [2, 3, 4, 6] - : - MIN_GUARANTEE_CELLS: 18 - DYNAMIC_SHARED_LIMITS: 1 - SHARED_LIMIT_DYNAMIC: ALPHA_1_4 - RESUME_OFFSET_CELLS: 18 - RESUME_FLOOR_CELLS: 0 - HEADROOM_LIMIT_AUTO: 0 - HEADROOM_LIMIT_CELLS: 675 - ? - PORT_ID: [50] - TM_PRI_GRP_ID: [2, 3, 4, 6] - : - MIN_GUARANTEE_CELLS: 0 - DYNAMIC_SHARED_LIMITS: 1 - SHARED_LIMIT_DYNAMIC: ALPHA_1_4 - RESUME_OFFSET_CELLS: 0 - RESUME_FLOOR_CELLS: 0 - HEADROOM_LIMIT_AUTO: 0 - ? - PORT_ID: [33, 67, 237, 271] - TM_PRI_GRP_ID: [2, 3, 4, 6] - : - MIN_GUARANTEE_CELLS: 0 - DYNAMIC_SHARED_LIMITS: 1 - SHARED_LIMIT_DYNAMIC: ALPHA_1_4 - RESUME_OFFSET_CELLS: 0 - RESUME_FLOOR_CELLS: 0 - HEADROOM_LIMIT_AUTO: 0 - ? - PORT_ID: [0] - TM_PRI_GRP_ID: [2, 3, 4, 6] - : - MIN_GUARANTEE_CELLS: 0 - DYNAMIC_SHARED_LIMITS: 1 - SHARED_LIMIT_DYNAMIC: ALPHA_1_4 - RESUME_OFFSET_CELLS: 0 - RESUME_FLOOR_CELLS: 0 - HEADROOM_LIMIT_AUTO: 0 - - TM_ING_THD_PORT_SERVICE_POOL: - ? - PORT_ID: [[0,4], [17,20], [33,37], [50,54], 67, [204,207], [221,224], [237,241], [255,258], 271] - TM_ING_SERVICE_POOL_ID: [0, 1] - : - MIN_GUARANTEE_CELLS: 0 - SHARED_LIMIT_CELLS: 227317 - RESUME_LIMIT_CELLS: 227317 - - TM_THD_UC_Q: - ? - PORT_ID: [[1,4], [17,20], [33,37], [50,54], 67, [204,207], [221,224], [237,241], [255,258], 271] - TM_UC_Q_ID: [0, 1, 5, 7, 8, 9] - : - SHARED_LIMITS: 1 - COLOR_SPECIFIC_LIMITS: 1 - RED_LIMIT_DYNAMIC: PERCENTAGE_675 - YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 - COLOR_SPECIFIC_DYNAMIC_LIMITS: 1 - MIN_GUARANTEE_CELLS: 7 - DYNAMIC_SHARED_LIMITS: 1 - SHARED_LIMIT_DYNAMIC: ALPHA_1 - RESUME_OFFSET_CELLS: 2 - ? - PORT_ID: [[1,4], [17,20], [33,37], [50,54], 67, [204,207], [221,224], [237,241], [255,258], 271] - TM_UC_Q_ID: [2, 3, 4, 6] - : - SHARED_LIMITS: 0 - COLOR_SPECIFIC_LIMITS: 0 - COLOR_SPECIFIC_DYNAMIC_LIMITS: 0 - MIN_GUARANTEE_CELLS: 0 - DYNAMIC_SHARED_LIMITS: 0 - SHARED_LIMIT_CELLS_STATIC: 227317 - RESUME_OFFSET_CELLS: 2 - - TM_THD_MC_Q: - ? - PORT_ID: [0] - TM_MC_Q_ID: [0, 1, 2, 3] - : - MIN_GUARANTEE_CELLS: 37 - DYNAMIC_SHARED_LIMITS: 1 - SHARED_LIMIT_DYNAMIC: ALPHA_2 - COLOR_SPECIFIC_LIMITS: 1 - COLOR_SPECIFIC_DYNAMIC_LIMITS: 1 - YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 - RED_LIMIT_DYNAMIC: PERCENTAGE_675 - RESUME_OFFSET_CELLS: 2 - ? - PORT_ID: [0] - TM_MC_Q_ID: [4, 5, 6, 7, 8, 9] - : - MIN_GUARANTEE_CELLS: 7 - SHARED_LIMITS: 1 - DYNAMIC_SHARED_LIMITS: 1 - SHARED_LIMIT_DYNAMIC: ALPHA_1_4 - COLOR_SPECIFIC_LIMITS: 1 - COLOR_SPECIFIC_DYNAMIC_LIMITS: 1 - YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 - RED_LIMIT_DYNAMIC: PERCENTAGE_675 - RESUME_OFFSET_CELLS: 2 - ? - PORT_ID: [[1,4], [17,20], [33,37], [50,54], 67, [204,207], [221,224], [237,241], [255,258], 271] - TM_MC_Q_ID: [0, 1] - : - SHARED_LIMITS: 1 - DYNAMIC_SHARED_LIMITS: 1 - SHARED_LIMIT_DYNAMIC: ALPHA_1 - COLOR_SPECIFIC_LIMITS: 1 - COLOR_SPECIFIC_DYNAMIC_LIMITS: 1 - YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 - RED_LIMIT_DYNAMIC: PERCENTAGE_675 - RESUME_OFFSET_CELLS: 2 - - TM_EGR_THD_UC_PORT_SERVICE_POOL: - ? - PORT_ID: [[1,4], [17,20], [33,37], [50,54], 67, [204,207], [221,224], [237,241], [255,258], 271] - TM_EGR_SERVICE_POOL_ID: 0 - : - SHARED_LIMIT_CELLS: 173222 - SHARED_RESUME_LIMIT_CELLS: 21651 - COLOR_SPECIFIC_LIMITS: 1 - YELLOW_SHARED_LIMIT_CELLS: 16239 - YELLOW_SHARED_RESUME_LIMIT_CELLS: 16237 - RED_SHARED_LIMIT_CELLS: 13532 - RED_SHARED_RESUME_LIMIT_CELLS: 13530 - ? - PORT_ID: [[1,4], [17,20], [33,37], [50,54], 67, [204,207], [221,224], [237,241], [255,258], 271] - TM_EGR_SERVICE_POOL_ID: 1 - : - SHARED_LIMIT_CELLS: 605 - SHARED_RESUME_LIMIT_CELLS: 73 - COLOR_SPECIFIC_LIMITS: 1 - YELLOW_SHARED_LIMIT_CELLS: 56 - YELLOW_SHARED_RESUME_LIMIT_CELLS: 54 - RED_SHARED_LIMIT_CELLS: 47 - RED_SHARED_RESUME_LIMIT_CELLS: 45 - - TM_EGR_THD_MC_PORT_SERVICE_POOL: - ? - PORT_ID: [[0,4], [17,20], [33,37], [50,54], 67, [204,207], [221,224], [237,241], [255,258], 271] - TM_EGR_SERVICE_POOL_ID: 0 - : - COLOR_SPECIFIC_LIMITS: 1 - RED_SHARED_LIMIT_CELLS: 1232 - YELLOW_SHARED_LIMIT_CELLS: 1479 - SHARED_LIMIT_CELLS: 15779 - RED_SHARED_RESUME_LIMIT_CELLS: 1230 - YELLOW_SHARED_RESUME_LIMIT_CELLS: 1477 - SHARED_RESUME_LIMIT_CELLS: 1970 - ? - PORT_ID: [[0,4], [17,20], [33,37], [50,54], 67, [204,207], [221,224], [237,241], [255,258], 271] - TM_EGR_SERVICE_POOL_ID: 1 - : - COLOR_SPECIFIC_LIMITS: 1 - RED_SHARED_LIMIT_CELLS: 47 - YELLOW_SHARED_LIMIT_CELLS: 56 - SHARED_LIMIT_CELLS: 605 - RED_SHARED_RESUME_LIMIT_CELLS: 45 - YELLOW_SHARED_RESUME_LIMIT_CELLS: 54 - SHARED_RESUME_LIMIT_CELLS: 73 - - -... -### THDR Limits ---- -device: - 0: - TM_THD_REPL_SERVICE_POOL: - COLOR_SPECIFIC_LIMITS: 1 - SHARED_LIMIT_CELLS: 2961 - SHARED_RESUME_LIMIT_CELLS: 2947 - YELLOW_SHARED_LIMIT_CELLS: 2220 - YELLOW_SHARED_RESUME_LIMIT_CELLS: 2206 - RED_SHARED_LIMIT_CELLS: 1850 - RED_SHARED_RESUME_LIMIT_CELLS: 1836 - - TM_THD_REPL_Q: - ? - REPL_Q_NUM: [0,8] - : - COLOR_SPECIFIC_LIMITS: 1 - COLOR_SPECIFIC_DYNAMIC_LIMITS: 1 - SHARED_LIMITS: 1 - DYNAMIC_SHARED_LIMITS: 1 - RESUME_OFFSET_CELLS: 14 - SHARED_LIMIT_DYNAMIC: ALPHA_1 - YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750 - RED_LIMIT_DYNAMIC: PERCENTAGE_675 - RESUME_OFFSET_YELLOW_CELLS: 14 - RESUME_OFFSET_RED_CELLS: 14 - - TM_THD_REPL_Q: - ? - REPL_Q_NUM: [0,5] - : - MIN_GUARANTEE_CELLS: 0 - ? - REPL_Q_NUM: [6,8] - : - MIN_GUARANTEE_CELLS: 37 - -... -### Mirror-on-drop ---- -device: - 0: - TM_MIRROR_ON_DROP_CONTROL: - RESERVED_LIMIT_CELLS: 2580 - - TM_MIRROR_ON_DROP_PROFILE: - ? - TM_MIRROR_ON_DROP_PROFILE_ID: 0 - : - PERCENTAGE_0_25: 65535 - PERCENTAGE_25_50: 65535 - PERCENTAGE_50_75: 65535 - PERCENTAGE_75_100: 65535 - - TM_MIRROR_ON_DROP_DESTINATION: - ? - TM_MIRROR_ON_DROP_DESTINATION_ID: 0 - : - TM_MC_Q_ID: 1 - PORT_ID: 1 -... - -### OBM ---- -device: - 0: - TM_OBM_PORT_PKT_PARSE: - ? - PORT_ID: [[1,4], [204,207]] - : - DSCP_MAP: 1 - HEADER_TYPE: OBM_HEADER_TYPE_ETHERNET - DEFAULT_PKT_PRI: 0 - - TM_OBM_PORT_PKT_PARSE: - ? - PORT_ID: [[17,20], [34,37], [51,54], [221,224], [238,241], [255,258]] - : - DSCP_MAP: 1 - HEADER_TYPE: OBM_HEADER_TYPE_ETHERNET - DEFAULT_PKT_PRI: 0 - - TM_OBM_PORT_PKT_PRI_TC_MAP: - ? - PORT_ID: [[1,4], [204,207]] - PKT_PRI_TYPE: PKT_PRI_TYPE_DSCP - PKT_PRI: [3, 4] - : - TRAFFIC_CLASS: OBM_TC_LOSSLESS0 - - TM_OBM_PORT_PKT_PRI_TC_MAP: - ? - PORT_ID: [[17,20], [34,37], [51,54], [221,224], [238,241], [255,258]] - PKT_PRI_TYPE: PKT_PRI_TYPE_DSCP - PKT_PRI: [2, 3, 4, 6] - : - TRAFFIC_CLASS: OBM_TC_LOSSLESS0 - - TM_OBM_THD_PORT: - ? - PORT_ID: [[1,4], [204,207]] - : - THD_AUTO: 0 - LOSSY_LOW_MAX_BYTES: 37376 - LOSSLESS0_MAX_BYTES: 235264 - MAX_BYTES: 235264 - - TM_OBM_THD_PORT: - ? - PORT_ID: [[17,20], [34,37], [51,54], [221,224], [238,241], [255,258]] - : - THD_AUTO: 0 - LOSSY_LOW_MAX_BYTES: 37376 - LOSSLESS0_MAX_BYTES: 235264 - MAX_BYTES: 235264 - - TM_OBM_THD_PORT_FLOW_CTRL: - ? - PORT_ID: [[1,4], [204,207]] - : - THD_AUTO: 0 - LOSSLESS0_XOFF_BYTES: 5184 - LOSSLESS0_XON_BYTES: 4672 - XOFF_BYTES: 5184 - XON_BYTES: 4672 - - TM_OBM_THD_PORT_FLOW_CTRL: - ? - PORT_ID: [[17,20], [34,37], [51,54], [221,224], [238,241], [255,258]] - : - THD_AUTO: 0 - LOSSLESS0_XOFF_BYTES: 5184 - LOSSLESS0_XON_BYTES: 4672 - XOFF_BYTES: 5184 - XON_BYTES: 4672 - - TM_OBM_PORT_FLOW_CTRL: - ? - PORT_ID: [[1,4], [204,207]] - : - FLOW_CTRL: 1 - FLOW_CTRL_TYPE: PFC - LOSSLESS0_FLOW_CTRL: 1 - - TM_OBM_PORT_FLOW_CTRL: - ? - PORT_ID: [[17,20], [34,37], [51,54], [221,224], [238,241], [255,258]] - : - FLOW_CTRL: 1 - FLOW_CTRL_TYPE: PFC - LOSSLESS0_FLOW_CTRL: 1 -... - -### PFC ---- -device: - 0: - PC_MAC_CONTROL: - ? - PORT_ID: [[1,4], [17,20], [33,37], [50,54], 67, [204,207], [221,224], [237,241], [255,258], 271] - : - PAUSE_TX: 0 - PAUSE_RX: 0 - - TM_PFC_EGR: - ? - PORT_ID: [[1,4], [204,207]] - : - TM_PFC_PRI_PROFILE_ID: 1 - - TM_PFC_EGR: - ? - PORT_ID: [[17,20], [34,37], [51,54], [221,224], [238,241], [255,258]] - : - TM_PFC_PRI_PROFILE_ID: 2 -... ---- -device: - 0: - TM_PFC_PRI_TO_PRI_GRP_MAP: - ? - TM_PFC_PRI_TO_PRI_GRP_MAP_ID: 1 - PFC_PRI: 3 - : - TM_PRI_GRP_ID: 3 - - TM_PFC_PRI_TO_PRI_GRP_MAP: - ? - TM_PFC_PRI_TO_PRI_GRP_MAP_ID: 1 - PFC_PRI: 4 - : - TM_PRI_GRP_ID: 4 - - TM_PFC_PRI_TO_PRI_GRP_MAP: - ? - TM_PFC_PRI_TO_PRI_GRP_MAP_ID: 2 - PFC_PRI: 2 - : - TM_PRI_GRP_ID: 2 - - TM_PFC_PRI_TO_PRI_GRP_MAP: - ? - TM_PFC_PRI_TO_PRI_GRP_MAP_ID: 2 - PFC_PRI: 3 - : - TM_PRI_GRP_ID: 3 - - TM_PFC_PRI_TO_PRI_GRP_MAP: - ? - TM_PFC_PRI_TO_PRI_GRP_MAP_ID: 2 - PFC_PRI: 4 - : - TM_PRI_GRP_ID: 4 - - TM_PFC_PRI_TO_PRI_GRP_MAP: - ? - TM_PFC_PRI_TO_PRI_GRP_MAP_ID: 2 - PFC_PRI: 6 - : - TM_PRI_GRP_ID: 6 - - TM_PFC_PRI_PROFILE: - ? - TM_PFC_PRI_PROFILE_ID: 1 - PFC_PRI: 3 - : - PFC: 1 - COS_LIST: [0, 0, 0, 1, 0, 0, 0, 0, 0, 0] - - TM_PFC_PRI_PROFILE: - ? - TM_PFC_PRI_PROFILE_ID: 1 - PFC_PRI: 4 - : - PFC: 1 - COS_LIST: [0, 0, 0, 0, 1, 0, 0, 0, 0, 0] - - TM_PFC_PRI_PROFILE: - ? - TM_PFC_PRI_PROFILE_ID: 2 - PFC_PRI: 2 - : - PFC: 1 - COS_LIST: [0, 0, 1, 0, 0, 0, 0, 0, 0, 0] - - TM_PFC_PRI_PROFILE: - ? - TM_PFC_PRI_PROFILE_ID: 2 - PFC_PRI: 3 - : - PFC: 1 - COS_LIST: [0, 0, 0, 1, 0, 0, 0, 0, 0, 0] - - TM_PFC_PRI_PROFILE: - ? - TM_PFC_PRI_PROFILE_ID: 2 - PFC_PRI: 4 - : - PFC: 1 - COS_LIST: [0, 0, 0, 0, 1, 0, 0, 0, 0, 0] - - TM_PFC_PRI_PROFILE: - ? - TM_PFC_PRI_PROFILE_ID: 2 - PFC_PRI: 6 - : - PFC: 1 - COS_LIST: [0, 0, 0, 0, 0, 0, 1, 0, 0, 0] - - TM_ING_PORT_PRI_GRP: - ? - PORT_ID: [[1,4], [204,207]] - TM_PRI_GRP_ID: [3, 4] - : - PFC: 1 - LOSSLESS: 1 - - TM_ING_PORT_PRI_GRP: - ? - PORT_ID: [[17,20], [34,37], [51,54], [221,224], [238,241], [255,258]] - TM_PRI_GRP_ID: [2, 3, 4, 6] - : - PFC: 1 - LOSSLESS: 1 - - PC_PFC: - ? - PORT_ID: [[1,4], [204,207]] - : - ENABLE_RX: 1 - ENABLE_TX: 1 - - PC_PFC: - ? - PORT_ID: [[17,20], [34,37], [51,54], [221,224], [238,241], [255,258]] - : - ENABLE_RX: 1 - ENABLE_TX: 1 -... From 5614f5150e4d640fe3eb520b05eee70f9fc925a2 Mon Sep 17 00:00:00 2001 From: noaOrMlnx <58519608+noaOrMlnx@users.noreply.github.com> Date: Thu, 12 Dec 2024 16:08:31 +0200 Subject: [PATCH 12/13] [Mellanox] Update buffer calculations for Mellanox-SN5600-C224O8 SKU (#20992) - Why I did it Update buffer calculations for Mellanox-SN5600-C224O8 HwSKU. - How I did it Update the lossless pull size - How to verify it Run sonic-mgmt QoS test --- .../Mellanox-SN5600-C224O8/buffers_defaults_t0.j2 | 6 +++--- .../Mellanox-SN5600-C224O8/buffers_defaults_t1.j2 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C224O8/buffers_defaults_t0.j2 b/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C224O8/buffers_defaults_t0.j2 index c20859c33f34..2a4c7eacd552 100644 --- a/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C224O8/buffers_defaults_t0.j2 +++ b/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C224O8/buffers_defaults_t0.j2 @@ -16,10 +16,10 @@ limitations under the License. #} {% set default_cable = '40m' %} -{% set ingress_lossless_pool_size = '113722268' %} -{% set ingress_lossless_pool_xoff = '19062784' %} +{% set ingress_lossless_pool_size = '144188416' %} +{% set ingress_lossless_pool_xoff = '1024' %} {% set egress_lossless_pool_size = '158229504' %} -{% set egress_lossy_pool_size = '113722268' %} +{% set egress_lossy_pool_size = '144188416' %} {% import 'buffers_defaults_objects.j2' as defs with context %} diff --git a/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C224O8/buffers_defaults_t1.j2 b/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C224O8/buffers_defaults_t1.j2 index 94ba1b680915..7ad4830e644c 100644 --- a/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C224O8/buffers_defaults_t1.j2 +++ b/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C224O8/buffers_defaults_t1.j2 @@ -16,10 +16,10 @@ limitations under the License. #} {% set default_cable = '250m' %} -{% set ingress_lossless_pool_size = '113722368' %} -{% set ingress_lossless_pool_xoff = '19062784' %} +{% set ingress_lossless_pool_size = '144188416' %} +{% set ingress_lossless_pool_xoff = '1024' %} {% set egress_lossless_pool_size = '158229504' %} -{% set egress_lossy_pool_size = '113722368' %} +{% set egress_lossy_pool_size = '144188416' %} {%-set ports2cable = { 'torrouter_server' : '40m', From ab16645700215ef34f74ebfa26bb96d7d269560b Mon Sep 17 00:00:00 2001 From: noaOrMlnx <58519608+noaOrMlnx@users.noreply.github.com> Date: Thu, 12 Dec 2024 16:09:59 +0200 Subject: [PATCH 13/13] [Mellanox] Update Mellanox-SN5600-C256S1 buffer calculations (#20991) - Why I did it Update buffer calculations for Mellanox-SN5600-C256S1 HwSKU. - How I did it Update lossless pool - How to verify it Run sonic-mgmt QoS test --- .../Mellanox-SN5600-C256S1/buffers_defaults_t0.j2 | 6 +++--- .../Mellanox-SN5600-C256S1/buffers_defaults_t1.j2 | 15 +++++++++++---- .../Mellanox-SN5600-C256S1/pg_profile_lookup.ini | 8 ++++++++ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_defaults_t0.j2 b/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_defaults_t0.j2 index b39eb626078a..09c7d8c1abb6 100644 --- a/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_defaults_t0.j2 +++ b/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_defaults_t0.j2 @@ -16,10 +16,10 @@ limitations under the License. #} {% set default_cable = '40m' %} -{% set ingress_lossless_pool_size = '115245056' %} -{% set ingress_lossless_pool_xoff = '14826496' %} +{% set ingress_lossless_pool_size = '142703616' %} +{% set ingress_lossless_pool_xoff = '1024' %} {% set egress_lossless_pool_size = '158229504' %} -{% set egress_lossy_pool_size = '115245056' %} +{% set egress_lossy_pool_size = '142703616' %} {% import 'buffers_defaults_objects.j2' as defs with context %} diff --git a/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_defaults_t1.j2 b/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_defaults_t1.j2 index 517c37f876fc..cb5b6956188c 100644 --- a/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_defaults_t1.j2 +++ b/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_defaults_t1.j2 @@ -15,11 +15,18 @@ See the License for the specific language governing permissions and limitations under the License. #} -{% set default_cable = '300m' %} -{% set ingress_lossless_pool_size = '137779200' %} -{% set ingress_lossless_pool_xoff = '10092544' %} +{% set default_cable = '250m' %} +{% set ingress_lossless_pool_size = '142703616' %} +{% set ingress_lossless_pool_xoff = '1024' %} {% set egress_lossless_pool_size = '158229504' %} -{% set egress_lossy_pool_size = '137779200' %} +{% set egress_lossy_pool_size = '142703616' %} + +{%-set ports2cable = { + 'torrouter_server' : '40m', + 'leafrouter_torrouter' : '250m', + 'spinerouter_leafrouter' : '1000m' + } +-%} {% import 'buffers_defaults_objects.j2' as defs with context %} diff --git a/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/pg_profile_lookup.ini b/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/pg_profile_lookup.ini index c2e2f3394472..748c4e323b9f 100644 --- a/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/pg_profile_lookup.ini +++ b/device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/pg_profile_lookup.ini @@ -49,3 +49,11 @@ 200000 300m 19456 19456 130048 0 400000 300m 19456 19456 243712 0 800000 300m 38912 38912 411648 0 + 10000 1000m 19456 19456 24576 0 + 25000 1000m 19456 19456 46080 0 + 40000 1000m 19456 19456 68608 0 + 50000 1000m 19456 19456 83968 0 + 100000 1000m 19456 19456 168960 0 + 200000 1000m 19456 19456 308224 0 + 400000 1000m 19456 19456 610304 0 + 800000 1000m 38912 38912 1153024 0