From d44936fa59330791a94e35640e00f10672ae2a82 Mon Sep 17 00:00:00 2001 From: Stephen Sun <5379172+stephenxs@users.noreply.github.com> Date: Mon, 31 May 2021 11:03:16 +0800 Subject: [PATCH] [Mellanox][201911] Support buffer configuration for 2km cable (#7338) #### Why I did it 1. Update pg_profile_lookup.ini with 2000m cable supported 2. Update buffer configuration for t1 with uplink cable 2000m - For SN3800 platform: - C64: - t0: 32 100G down links and 32 100G up links. - t1: 56 100G down links and 8 100G up links with 2 km cable. - D112C8: 112 50G down links and 8 100G up links. - D24C52: 24 50G down links, 20 100G down links, and 32 100G up links. - D28C50: 28 50G down links, 18 100G down links, and 32 100G up links. - For SN2700 platform: - D48C8: 48 50G down links and 8 100G up links - C32: - t0: 16 100G down links and 16 100G up links. - t1: 24 100G down links and 8 100G up links with 2 km cable. Signed-off-by: Stephen Sun #### How I did it #### How to verify it Run QoS regression test --- .../Mellanox-SN2700-D48C8/pg_profile_lookup.ini | 5 +++++ .../Mellanox-SN2700/buffers_defaults_t1.j2 | 6 +++--- .../Mellanox-SN3800-C64/buffers_defaults_t1.j2 | 6 +++--- .../Mellanox-SN3800-D112C8/pg_profile_lookup.ini | 7 ++++++- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/pg_profile_lookup.ini index cdd674e4e7..b4bb2aaadb 100644 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/pg_profile_lookup.ini +++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/pg_profile_lookup.ini @@ -15,3 +15,8 @@ 40000 300m 19456 19456 45056 0 50000 300m 19456 19456 50176 0 100000 300m 19456 19456 78848 0 + 10000 2000m 19456 19456 29696 0 + 25000 2000m 19456 19456 58368 0 + 40000 2000m 19456 19456 87040 0 + 50000 2000m 19456 19456 105472 0 + 100000 2000m 19456 19456 199680 0 diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t1.j2 index 7275a84543..5a56a04fc0 100644 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t1.j2 +++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/buffers_defaults_t1.j2 @@ -1,8 +1,8 @@ {% set default_cable = '5m' %} -{% set ingress_lossless_pool_size = '9292800' %} -{% set ingress_lossless_pool_xoff = '1572864' %} +{% set ingress_lossless_pool_size = '8719360' %} +{% set ingress_lossless_pool_xoff = '2146304' %} {% set egress_lossless_pool_size = '13945824' %} -{% set egress_lossy_pool_size = '9292800' %} +{% set egress_lossy_pool_size = '8719360' %} {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t1.j2 index 075baea8d6..e5d25be97e 100644 --- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t1.j2 +++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/buffers_defaults_t1.j2 @@ -1,8 +1,8 @@ {% set default_cable = '5m' %} -{% set ingress_lossless_pool_size = '23900160' %} -{% set ingress_lossless_pool_xoff = '4489216' %} +{% set ingress_lossless_pool_size = '24219648' %} +{% set ingress_lossless_pool_xoff = '4169728' %} {% set egress_lossless_pool_size = '34287552' %} -{% set egress_lossy_pool_size = '23900160' %} +{% set egress_lossy_pool_size = '24219648' %} {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/pg_profile_lookup.ini index 810d7e77e6..fd98cbe468 100644 --- a/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/pg_profile_lookup.ini +++ b/device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/pg_profile_lookup.ini @@ -14,4 +14,9 @@ 25000 300m 19456 19456 44032 0 40000 300m 19456 19456 55296 0 50000 300m 19456 19456 63488 0 - 100000 300m 19456 19456 102400 0 + 100000 300m 19456 19456 102400 0 + 10000 2000m 19456 19456 33792 0 + 25000 2000m 19456 19456 65536 0 + 40000 2000m 19456 19456 97280 0 + 50000 2000m 19456 19456 118784 0 + 100000 2000m 19456 19456 225280 0