[Mellanox] Update the buffer setting (sonic-net#4989)

* Update the buffer size based on the latest excel Signed-off-by: Stephen Sun <[email protected]> * Align the buffer configuration with the latest formula: - reduce redundant "*2" in formula - use port MTU for local sending the PFC frame and peer lossless MTU for peer sending lossless traffic Buffer pool size updated accordingly. Signed-off-by: Stephen Sun <[email protected]>
santhosh-kt · Feb 25, 2021 · bd2ed89 · bd2ed89
1 parent e725364
commit bd2ed89
Show file tree

Hide file tree

Showing 12 changed files with 131 additions and 141 deletions.
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '5029836' %}
-{% set ingress_lossy_pool_size =  '5029836' %}
-{% set egress_lossless_pool_size =  '14024599' %}
-{% set egress_lossy_pool_size =  '5029836' %}
+{% set ingress_lossless_pool_size =  '4580864' %}
+{% set ingress_lossy_pool_size =  '4580864' %}
+{% set egress_lossless_pool_size =  '13945824' %}
+{% set egress_lossy_pool_size =  '4580864' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -38,7 +38,7 @@
         "ingress_lossless_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"0"
+            "dynamic_th":"7"
         },
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossy_pool]",
@@ -52,8 +52,8 @@
         },
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"4096",
-            "dynamic_th":"3"
+            "size":"9216",
+            "dynamic_th":"7"
         },
         "q_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '2097100' %}
-{% set ingress_lossy_pool_size =  '2097100' %}
-{% set egress_lossless_pool_size =  '14024599' %}
-{% set egress_lossy_pool_size =  '2097100' %}
+{% set ingress_lossless_pool_size =  '3302912' %}
+{% set ingress_lossy_pool_size =  '3302912' %}
+{% set egress_lossless_pool_size =  '13945824' %}
+{% set egress_lossy_pool_size =  '3302912' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -38,7 +38,7 @@
         "ingress_lossless_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"0"
+            "dynamic_th":"7"
         },
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossy_pool]",
@@ -52,8 +52,8 @@
         },
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"4096",
-            "dynamic_th":"3"
+            "size":"9216",
+            "dynamic_th":"7"
         },
         "q_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/pg_profile_lookup.ini
@@ -1,17 +1,17 @@
-# PG lossless profiles.
-# speed cable size    xon  xoff threshold
-  10000  5m   34816  18432 16384  0
-  25000  5m   34816  18432 16384  0
-  40000  5m   34816  18432 16384  0
-  50000  5m   34816  18432 16384  0
- 100000  5m   36864  18432 18432  0
-  10000  40m  36864  18432 18432  0
-  25000  40m  39936  18432 21504  0
-  40000  40m  41984  18432 23552  0
-  50000  40m  41984  18432 23552  0
- 100000  40m  54272  18432 35840  0
-  10000  300m 49152  18432 30720  0
-  25000  300m 71680  18432 53248  0
-  40000  300m 94208  18432 75776  0
-  50000  300m 94208  18432 75776  0
- 100000  300m 184320 18432 165888 0
+#  PG lossless profiles.
+# speed cable  size   xon    xoff   threshold
+  10000    5m 49152  19456  29696          0
+  25000    5m 49152  19456  29696          0
+  40000    5m 49152  19456  29696          0
+  50000    5m 49152  19456  29696          0
+ 100000    5m 50176  19456  30720          0
+  10000   40m 49152  19456  29696          0
+  25000   40m 51200  19456  31744          0
+  40000   40m 52224  19456  32768          0
+  50000   40m 53248  19456  33792          0
+ 100000   40m 58368  19456  38912          0
+  10000  300m 56320  19456  36864          0
+  25000  300m 67584  19456  48128          0
+  40000  300m 78848  19456  59392          0
+  50000  300m 86016  19456  66560          0
+ 100000  300m 123904 19456  104448         0
diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t0.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '14983147' %}
-{% set ingress_lossy_pool_size =  '14983147' %}
-{% set egress_lossless_pool_size =  '34340822' %}
-{% set egress_lossy_pool_size =  '14983147' %}
+{% set ingress_lossless_pool_size =  '14542848' %}
+{% set ingress_lossy_pool_size =  '14542848' %}
+{% set egress_lossless_pool_size =  '34287552' %}
+{% set egress_lossy_pool_size =  '14542848' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -38,7 +38,7 @@
         "ingress_lossless_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"0"
+            "dynamic_th":"7"
         },
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossy_pool]",
@@ -52,8 +52,8 @@
         },
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"4096",
-            "dynamic_th":"3"
+            "size":"9216",
+            "dynamic_th":"7"
         },
         "q_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",

diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t1.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '9158635' %}
-{% set ingress_lossy_pool_size =  '9158635' %}
-{% set egress_lossless_pool_size =  '34340822' %}
-{% set egress_lossy_pool_size =  '9158635' %}
+{% set ingress_lossless_pool_size =  '11622400' %}
+{% set ingress_lossy_pool_size =  '11622400' %}
+{% set egress_lossless_pool_size =  '34287552' %}
+{% set egress_lossy_pool_size =  '11622400' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -38,7 +38,7 @@
         "ingress_lossless_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"0"
+            "dynamic_th":"7"
         },
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossy_pool]",
@@ -52,8 +52,8 @@
         },
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"4096",
-            "dynamic_th":"3"
+            "size":"9216",
+            "dynamic_th":"7"
         },
         "q_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",

diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/pg_profile_lookup.ini
@@ -1,22 +1,20 @@
-# speed    cable   size      xon      xoff      threshold
-   1000    5m      35840     18432    17408     0
-  10000    5m      36864     18432    18432     0
-  25000    5m      36864     18432    18432     0
-  40000    5m      36864     18432    18432     0
-  50000    5m      37888     18432    19456     0
- 100000    5m      38912     18432    20480     0
- 200000    5m      41984     18432    23552     0
-   1000    40m     36864     18432    18432     0
-  10000    40m     38912     18432    20480     0
-  25000    40m     41984     18432    23552     0
-  40000    40m     45056     18432    26624     0
-  50000    40m     47104     18432    28672     0
- 100000    40m     59392     18432    40960     0
- 200000    40m     81920     18432    63488     0
-   1000    300m    37888     18432    19456     0
-  10000    300m    53248     18432    34816     0
-  25000    300m    78848     18432    60416     0
-  40000    300m    104448    18432    86016     0
-  50000    300m    121856    18432    103424    0
- 100000    300m    206848    18432    188416    0
- 200000    300m    376832    18432    358400    0
+#  PG lossless profiles.
+# speed cable  size   xon    xoff   threshold
+  10000    5m 52224  19456  32768          0
+  25000    5m 52224  19456  32768          0
+  40000    5m 53248  19456  33792          0
+  50000    5m 53248  19456  33792          0
+ 100000    5m 53248  19456  33792          0
+ 200000    5m 55296  19456  35840          0
+  10000   40m 53248  19456  33792          0
+  25000   40m 55296  19456  35840          0
+  40000   40m 57344  19456  37888          0
+  50000   40m 58368  19456  38912          0
+ 100000   40m 63488  19456  44032          0
+ 200000   40m 74752  19456  55296          0
+  10000  300m 60416  19456  40960          0
+  25000  300m 73728  19456  54272          0
+  40000  300m 86016  19456  66560          0
+  50000  300m 95232  19456  75776          0
+ 100000  300m 137216 19456  117760         0
+ 200000  300m 223232 19456  203776         0
diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/buffers_defaults_t0.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '28196784' %}
-{% set ingress_lossy_pool_size =  '28196784' %}
-{% set egress_lossless_pool_size =  '34340832' %}
-{% set egress_lossy_pool_size =  '28196784' %}
+{% set ingress_lossless_pool_size =  '13924352' %}
+{% set ingress_lossy_pool_size =  '13924352' %}
+{% set egress_lossless_pool_size =  '34287552' %}
+{% set egress_lossy_pool_size =  '13924352' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -38,7 +38,7 @@
         "ingress_lossless_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"0"
+            "dynamic_th":"7"
         },
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossy_pool]",
@@ -52,8 +52,8 @@
         },
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"4096",
-            "dynamic_th":"3"
+            "size":"9216",
+            "dynamic_th":"7"
         },
         "q_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",

diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/buffers_defaults_t1.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '17891280' %}
-{% set ingress_lossy_pool_size =  '17891280' %}
-{% set egress_lossless_pool_size =  '34340832' %}
-{% set egress_lossy_pool_size =  '17891280' %}
+{% set ingress_lossless_pool_size =  '12457984' %}
+{% set ingress_lossy_pool_size =  '12457984' %}
+{% set egress_lossless_pool_size =  '34287552' %}
+{% set egress_lossy_pool_size =  '12457984' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -38,7 +38,7 @@
         "ingress_lossless_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"0"
+            "dynamic_th":"7"
         },
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossy_pool]",
@@ -52,8 +52,8 @@
         },
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"4096",
-            "dynamic_th":"3"
+            "size":"9216",
+            "dynamic_th":"7"
         },
         "q_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",

diff --git a/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn3800-r0/ACS-MSN3800/pg_profile_lookup.ini
@@ -1,23 +1,17 @@
-# PG lossless profiles.
-# speed cable size    xon    xoff   threshold
-   1000 5m    32768   18432  14336  0
-  10000 5m    34816   18432  16384  0
-  25000 5m    38912   18432  20480  0
-  40000 5m    41984   18432  23552  0
-  50000 5m    44032   18432  25600  0
- 100000 5m    55296   18432  36864  0
- 200000 5m    77824   18432  59392  0
-   1000 40m   33792   18432  15360  0
-  10000 40m   36864   18432  18432  0
-  25000 40m   43008   18432  24576  0
-  40000 40m   49152   18432  30720  0
-  50000 40m   53248   18432  34816  0
- 100000 40m   72704   18432  54272  0
- 200000 40m   112640  18432  94208  0
-   1000 300m  34816   18432  16384  0
-  10000 300m  50176   18432  31744  0
-  25000 300m  75776   18432  57344  0
-  40000 300m  101376  18432  82944  0
-  50000 300m  117760  18432  99328  0
- 100000 300m  202752  18432  184320 0
- 200000 300m  373760  18432  355328 0
+#  PG lossless profiles.
+# speed cable  size   xon    xoff   threshold
+  10000    5m 54272  19456  34816          0
+  25000    5m 58368  19456  38912          0
+  40000    5m 61440  19456  41984          0
+  50000    5m 64512  19456  45056          0
+ 100000    5m 75776  19456  56320          0
+  10000   40m 55296  19456  35840          0
+  25000   40m 60416  19456  40960          0
+  40000   40m 65536  19456  46080          0
+  50000   40m 69632  19456  50176          0
+ 100000   40m 86016  19456  66560          0
+  10000  300m 63488  19456  44032          0
+  25000  300m 78848  19456  59392          0
+  40000  300m 95232  19456  75776          0
+  50000  300m 106496 19456  87040          0
+ 100000  300m 159744 19456  140288         0
diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '56623104' %}
-{% set ingress_lossy_pool_size =  '56623104' %}
+{% set ingress_lossless_pool_size =  '26451968' %}
+{% set ingress_lossy_pool_size =  '26451968' %}
 {% set egress_lossless_pool_size =  '60817392' %}
-{% set egress_lossy_pool_size =  '56623104' %}
+{% set egress_lossy_pool_size =  '26451968' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -38,7 +38,7 @@
         "ingress_lossless_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"0"
+            "dynamic_th":"7"
         },
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossy_pool]",
@@ -52,8 +52,8 @@
         },
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"4096",
-            "dynamic_th":"3"
+            "size":"9216",
+            "dynamic_th":"7"
         },
         "q_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",

diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2
@@ -1,8 +1,8 @@
 {% set default_cable = '5m' %}
-{% set ingress_lossless_pool_size =  '36011952' %}
-{% set ingress_lossy_pool_size =  '36011952' %}
+{% set ingress_lossless_pool_size =  '20627456' %}
+{% set ingress_lossy_pool_size =  '20627456' %}
 {% set egress_lossless_pool_size =  '60817392' %}
-{% set egress_lossy_pool_size =  '36011952' %}
+{% set egress_lossy_pool_size =  '20627456' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
     {# Generate list of ports #}
@@ -38,7 +38,7 @@
         "ingress_lossless_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "dynamic_th":"0"
+            "dynamic_th":"7"
         },
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossy_pool]",
@@ -52,8 +52,8 @@
         },
         "egress_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",
-            "size":"4096",
-            "dynamic_th":"3"
+            "size":"9216",
+            "dynamic_th":"7"
         },
         "q_lossy_profile": {
             "pool":"[BUFFER_POOL|egress_lossy_pool]",