[202012] Update 7260 MMU and ECN settings (sonic-net#11398)

Signed-off-by: Neetha John <nejo@microsoft.com> Why I did it Improve throughput and latency for 7260 deployments How I did it Update the dynamic threshold to 0 and ECN settings as 2mb/10mb/5% How to verify it Updated unit tests to use the modified values for 7260 ecn settings.
praveen-li · Jul 12, 2022 · 4de610a · 4de610a
1 parent c6f9664
commit 4de610a
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 26 deletions.
diff --git a/device/common/profiles/th2/7260/BALANCED/pg_profile_lookup.ini b/device/common/profiles/th2/7260/BALANCED/pg_profile_lookup.ini
@@ -1,11 +1,11 @@
 # PG lossless profiles.
 # speed cable size    xon  xoff     threshold xon_offset
- 100000  5m   1248    1248 54080     -3        2496
- 100000  40m  1248    1248 59696     -3        2496
- 100000  300m 1248    1248 101088    -3        2496
-  50000  5m   1248    1248 54080     -3        2496
-  50000  40m  1248    1248 59696     -3        2496
-  50000  300m 1248    1248 101088    -3        2496
-  40000  5m   1248    1248 29536     -3        2496
-  40000  40m  1248    1248 31616     -3        2496
-  40000  300m 1248    1248 48256     -3        2496
+ 100000  5m   1248    1248 54080      0        2496
+ 100000  40m  1248    1248 59696      0        2496
+ 100000  300m 1248    1248 101088     0        2496
+  50000  5m   1248    1248 54080      0        2496
+  50000  40m  1248    1248 59696      0        2496
+  50000  300m 1248    1248 101088     0        2496
+  40000  5m   1248    1248 29536      0        2496
+  40000  40m  1248    1248 31616      0        2496
+  40000  300m 1248    1248 48256      0        2496
diff --git a/device/common/profiles/th2/7260/BALANCED/qos.json.j2 b/device/common/profiles/th2/7260/BALANCED/qos.json.j2
@@ -289,4 +289,24 @@
 {%- endmacro %}
 {% endif %}
 
+{%- macro generate_wred_profiles() %}
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "10000000",
+            "green_min_threshold"    : "2000000",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+{%- endmacro %}
+
 {%- include 'qos_config.j2' %}
diff --git a/device/common/profiles/th2/7260/RDMA-CENTRIC/pg_profile_lookup.ini b/device/common/profiles/th2/7260/RDMA-CENTRIC/pg_profile_lookup.ini
@@ -1,11 +1,11 @@
 # PG lossless profiles.
 # speed cable size    xon  xoff     threshold xon_offset
- 100000  5m   1248    1248 54080     -3        2496
- 100000  40m  1248    1248 59696     -3        2496
- 100000  300m 1248    1248 101088    -3        2496
-  50000  5m   1248    1248 54080     -3        2496
-  50000  40m  1248    1248 59696     -3        2496
-  50000  300m 1248    1248 101088    -3        2496
-  40000  5m   1248    1248 29536     -3        2496
-  40000  40m  1248    1248 31616     -3        2496
-  40000  300m 1248    1248 48256     -3        2496
+ 100000  5m   1248    1248 54080      0        2496
+ 100000  40m  1248    1248 59696      0        2496
+ 100000  300m 1248    1248 101088     0        2496
+  50000  5m   1248    1248 54080      0        2496
+  50000  40m  1248    1248 59696      0        2496
+  50000  300m 1248    1248 101088     0        2496
+  40000  5m   1248    1248 29536      0        2496
+  40000  40m  1248    1248 31616      0        2496
+  40000  300m 1248    1248 48256      0        2496
diff --git a/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2 b/device/common/profiles/th2/7260/RDMA-CENTRIC/qos.json.j2
@@ -289,4 +289,24 @@
 {%- endmacro %}
 {% endif %}
 
+{%- macro generate_wred_profiles() %}
+    "WRED_PROFILE": {
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable"      : "true",
+            "wred_yellow_enable"     : "true",
+            "wred_red_enable"        : "true",
+            "ecn"                    : "ecn_all",
+            "green_max_threshold"    : "10000000",
+            "green_min_threshold"    : "2000000",
+            "yellow_max_threshold"   : "2097152",
+            "yellow_min_threshold"   : "1048576",
+            "red_max_threshold"      : "2097152",
+            "red_min_threshold"      : "1048576",
+            "green_drop_probability" : "5",
+            "yellow_drop_probability": "5",
+            "red_drop_probability"   : "5"
+        }
+    },
+{%- endmacro %}
+
 {%- include 'qos_config.j2' %}
diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor-remap-disabled.json
@@ -636,8 +636,8 @@
             "wred_yellow_enable"     : "true",
             "wred_red_enable"        : "true",
             "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
-            "green_min_threshold"    : "1048576",
+            "green_max_threshold"    : "10000000",
+            "green_min_threshold"    : "2000000",
             "yellow_max_threshold"   : "2097152",
             "yellow_min_threshold"   : "1048576",
             "red_max_threshold"      : "2097152",

diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-dualtor.json
@@ -739,8 +739,8 @@
             "wred_yellow_enable"     : "true",
             "wred_red_enable"        : "true",
             "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
-            "green_min_threshold"    : "1048576",
+            "green_max_threshold"    : "10000000",
+            "green_min_threshold"    : "2000000",
             "yellow_max_threshold"   : "2097152",
             "yellow_min_threshold"   : "1048576",
             "red_max_threshold"      : "2097152",

diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1-remap-disabled.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1-remap-disabled.json
@@ -348,8 +348,8 @@
             "wred_yellow_enable"     : "true",
             "wred_red_enable"        : "true",
             "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
-            "green_min_threshold"    : "1048576",
+            "green_max_threshold"    : "10000000",
+            "green_min_threshold"    : "2000000",
             "yellow_max_threshold"   : "2097152",
             "yellow_min_threshold"   : "1048576",
             "red_max_threshold"      : "2097152",

diff --git a/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json b/src/sonic-config-engine/tests/sample_output/py3/qos-arista7260-t1.json
@@ -348,8 +348,8 @@
             "wred_yellow_enable"     : "true",
             "wred_red_enable"        : "true",
             "ecn"                    : "ecn_all",
-            "green_max_threshold"    : "2097152",
-            "green_min_threshold"    : "1048576",
+            "green_max_threshold"    : "10000000",
+            "green_min_threshold"    : "2000000",
             "yellow_max_threshold"   : "2097152",
             "yellow_min_threshold"   : "1048576",
             "red_max_threshold"      : "2097152",