[devices]: Buffers & qos config change on a6100 and a7050 (#2037)

* a7050 & a6100 ecn profile th_min = 1MB = 1048576 bytes, th_max = 2MB = 2097152 bytes, pmax = 5% a6100 dscp 46 -> 5; apply lossy traffic profile dwrr equal weight on 5 queues ingress lossless alpha 2^(-3) Signed-off-by: Wenda Ni <[email protected]> * Adjust config format for wred profile on a7050 & a6100 Signed-off-by: Wenda <[email protected]> * Update sonic-utilities submodule reference point Signed-off-by: Wenda <[email protected]>
sonic-net · Sep 12, 2018 · 09a61f1 · 09a61f1
1 parent 2f0a3c6
commit 09a61f1
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 62 deletions.
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json
@@ -115,17 +115,21 @@
             "wred_yellow_enable":"true",
             "wred_red_enable":"true",
             "ecn":"ecn_all",
-            "red_max_threshold":"312000",
-            "red_min_threshold":"104000",
-            "yellow_max_threshold":"312000",
-            "yellow_min_threshold":"104000",
-            "green_max_threshold":"312000",
-            "green_min_threshold":"104000"
+            "red_max_threshold":"2097152",
+            "red_min_threshold":"1048576",
+            "yellow_max_threshold":"2097152",
+            "yellow_min_threshold":"1048576",
+            "green_max_threshold":"2097152",
+            "green_min_threshold":"1048576",
+            "green_drop_probability":"5",
+            "yellow_drop_probability":"5",
+            "red_drop_probability":"5"
         }
     },
     "QUEUE": {
         "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|3-4" : {
-            "scheduler"     :   "[SCHEDULER|scheduler.0]"
+            "scheduler"     :   "[SCHEDULER|scheduler.0]",
+            "wred_profile"  :   "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|0" : {
             "scheduler"     :   "[SCHEDULER|scheduler.0]"

diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json b/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/qos.json
@@ -115,17 +115,21 @@
             "wred_yellow_enable":"true",
             "wred_red_enable":"true",
             "ecn":"ecn_all",
-            "red_max_threshold":"312000",
-            "red_min_threshold":"104000",
-            "yellow_max_threshold":"312000",
-            "yellow_min_threshold":"104000",
-            "green_max_threshold":"312000",
-            "green_min_threshold":"104000"
+            "red_max_threshold":"2097152",
+            "red_min_threshold":"1048576",
+            "yellow_max_threshold":"2097152",
+            "yellow_min_threshold":"1048576",
+            "green_max_threshold":"2097152",
+            "green_min_threshold":"1048576",
+            "green_drop_probability":"5",
+            "yellow_drop_probability":"5",
+            "red_drop_probability":"5"
         }
     },
     "QUEUE": {
         "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|3-4" : {
-            "scheduler"     :   "[SCHEDULER|scheduler.0]"
+            "scheduler"     :   "[SCHEDULER|scheduler.0]",
+            "wred_profile"  :   "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|0" : {
             "scheduler"     :   "[SCHEDULER|scheduler.0]"

diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini
@@ -1,17 +1,17 @@
 # PG lossless profiles.
 # speed cable size    xon  xoff threshold xon_offset
-  10000  5m   1248    2288 35776  -4        2288
-  25000  5m   1248    2288 53248  -4        2288
-  40000  5m   1248    2288 66560  -4        2288
-  50000  5m   1248    2288 90272  -4        2288
- 100000  5m   1248    2288 165568 -4        2288
-  10000  40m  1248    2288 37024  -4        2288
-  25000  40m  1248    2288 53248  -4        2288
-  40000  40m  1248    2288 71552  -4        2288
-  50000  40m  1248    2288 96096  -4        2288
- 100000  40m  1248    2288 177632 -4        2288
-  10000  300m 1248    2288 46176  -4        2288
-  25000  300m 1248    2288 79040  -4        2288
-  40000  300m 1248    2288 108160 -4        2288
-  50000  300m 1248    2288 141856 -4        2288
- 100000  300m 1248    2288 268736 -4        2288
+  10000  5m   1248    2288 35776  -3        2288
+  25000  5m   1248    2288 53248  -3        2288
+  40000  5m   1248    2288 66560  -3        2288
+  50000  5m   1248    2288 90272  -3        2288
+ 100000  5m   1248    2288 165568 -3        2288
+  10000  40m  1248    2288 37024  -3        2288
+  25000  40m  1248    2288 53248  -3        2288
+  40000  40m  1248    2288 71552  -3        2288
+  50000  40m  1248    2288 96096  -3        2288
+ 100000  40m  1248    2288 177632 -3        2288
+  10000  300m 1248    2288 46176  -3        2288
+  25000  300m 1248    2288 79040  -3        2288
+  40000  300m 1248    2288 108160 -3        2288
+  50000  300m 1248    2288 141856 -3        2288
+ 100000  300m 1248    2288 268736 -3        2288
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json
@@ -83,7 +83,7 @@
             "43":"0",
             "44":"0",
             "45":"0",
-            "46":"0",
+            "46":"5",
             "47":"0",
             "48":"0",
             "49":"0",
@@ -105,14 +105,6 @@
     },
     "SCHEDULER": {
         "scheduler.0" : {
-            "type":"DWRR",
-            "weight": "25"
-        },
-        "scheduler.1" : {
-            "type":"DWRR",
-            "weight": "30"
-        },
-        "scheduler.2" : {
             "type":"DWRR",
             "weight": "20"
         }
@@ -127,41 +119,35 @@
         }
     },
     "WRED_PROFILE": {
-        "AZURE_LOSSY" : {
-            "wred_green_enable":"true",
-            "wred_yellow_enable":"true",
-            "ecn":"ecn_all",
-            "red_max_threshold":"512000",
-            "red_min_threshold":"512000",
-            "yellow_max_threshold":"512000",
-            "yellow_min_threshold":"512000",
-            "green_max_threshold": "184320",
-            "green_min_threshold": "184320"
-        },
         "AZURE_LOSSLESS" : {
             "wred_green_enable":"true",
             "wred_yellow_enable":"true",
+            "wred_red_enable":"true",
             "ecn":"ecn_all",
-            "red_max_threshold":"512000",
-            "red_min_threshold":"512000",
-            "yellow_max_threshold":"512000",
-            "yellow_min_threshold":"512000",
-            "green_max_threshold": "184320",
-            "green_min_threshold": "184320"
+            "red_max_threshold":"2097152",
+            "red_min_threshold":"1048576",
+            "yellow_max_threshold":"2097152",
+            "yellow_min_threshold":"1048576",
+            "green_max_threshold":"2097152",
+            "green_min_threshold":"1048576",
+            "green_drop_probability":"5",
+            "yellow_drop_probability":"5",
+            "red_drop_probability":"5"
         }
     },
     "QUEUE": {
-        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63|0-1" : {
-            "wred_profile"  :   "[WRED_PROFILE|AZURE_LOSSY]"
-        },
         "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63|3-4" : {
-            "scheduler"     :   "[SCHEDULER|scheduler.0]"
+            "scheduler"     :   "[SCHEDULER|scheduler.0]",
+            "wred_profile"  :   "[WRED_PROFILE|AZURE_LOSSLESS]"
         },
         "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63|0" : {
-            "scheduler"     :   "[SCHEDULER|scheduler.1]"
+            "scheduler"     :   "[SCHEDULER|scheduler.0]"
         },
         "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63|1" : {
-            "scheduler"     :   "[SCHEDULER|scheduler.2]"
+            "scheduler"     :   "[SCHEDULER|scheduler.0]"
+        },
+        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63|5" : {
+            "scheduler"     :   "[SCHEDULER|scheduler.0]"
         }
     }
 }
diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2
@@ -121,6 +121,9 @@ def
     "BUFFER_PG": {
         "{{ port_names_all }}|0-1": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
+        },
+        "{{ port_names_all }}|5": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
         }
     },
 {% endif %}
@@ -134,6 +137,9 @@ def
         },
         "{{ port_names_all }}|0-1": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
+        },
+        "{{ port_names_all }}|5": {
+            "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
         }
     }
 {% endif %}

diff --git a/src/sonic-utilities b/src/sonic-utilities