Buffers config (sonic-net#1476)

* Improve memory utilization through more sharing at the ingress on A7050-QX-32S Signed-off-by: Wenda <[email protected]> * Apply buffers config changes on A7050-QX-32S to A7050-QX32 Signed-off-by: Wenda <[email protected]> * Apply buffers config changes on A7050-QX-32S to S6000
Junchao-Mellanox · Mar 12, 2018 · 1f4ce09 · 1f4ce09
1 parent f88734b
commit 1f4ce09
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 72 deletions.
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers.json.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers.json.j2
@@ -68,15 +68,10 @@
     }
     },
     "BUFFER_POOL": {
-        "ingress_lossless_pool0": {
-            "size": "3637248",
+        "ingress_lossless_pool": {
+            "size": "7274496",
             "type": "ingress",
-            "mode": "static"
-        },
-        "ingress_lossless_pool1": {
-            "size": "3637248",
-            "type": "ingress",
-            "mode": "static"
+            "mode": "dynamic"
         },
         "ingress_lossy_pool": {
             "size": "5491712",
@@ -100,19 +95,13 @@
         }
     },
     "BUFFER_PROFILE": {
-        "ingress_lossless_profile0": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool0]",
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "xon":"18432",
             "xoff":"76800",
-            "size":"113664",
-            "static_th":"0"
-        },
-        "ingress_lossless_profile1": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool1]",
-            "xon":"18432",
-            "xoff":"76800",
-            "size":"113664",
-            "static_th":"0"
+            "size":"78048",
+            "dynamic_th":"-3",
+            "xon_offset":"2496"
         },
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossy_pool]",
@@ -136,11 +125,8 @@
         }
     },
     "BUFFER_PG": {
-        "{{ port_names }}|3": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossless_profile0]"
-        },
-        "{{ port_names }}|4": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossless_profile1]"
+        "{{ port_names }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossless_profile]"
         },
         "{{ port_names }}|0-1": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"

diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers.json.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers.json.j2
@@ -68,15 +68,10 @@
     }
     },
     "BUFFER_POOL": {
-        "ingress_lossless_pool0": {
-            "size": "3637248",
+        "ingress_lossless_pool": {
+            "size": "7274496",
             "type": "ingress",
-            "mode": "static"
-        },
-        "ingress_lossless_pool1": {
-            "size": "3637248",
-            "type": "ingress",
-            "mode": "static"
+            "mode": "dynamic"
         },
         "ingress_lossy_pool": {
             "size": "5491712",
@@ -100,19 +95,13 @@
         }
     },
     "BUFFER_PROFILE": {
-        "ingress_lossless_profile0": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool0]",
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "xon":"18432",
             "xoff":"76800",
-            "size":"113664",
-            "static_th":"0"
-        },
-        "ingress_lossless_profile1": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool1]",
-            "xon":"18432",
-            "xoff":"76800",
-            "size":"113664",
-            "static_th":"0"
+            "size":"78048",
+            "dynamic_th":"-3",
+            "xon_offset":"2496"
         },
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossy_pool]",
@@ -136,11 +125,8 @@
         }
     },
     "BUFFER_PG": {
-        "{{ port_names }}|3": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossless_profile0]"
-        },
-        "{{ port_names }}|4": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossless_profile1]"
+        "{{ port_names }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossless_profile]"
         },
         "{{ port_names }}|0-1": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"

diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers.json.j2
@@ -68,15 +68,10 @@
     }
     },
     "BUFFER_POOL": {
-        "ingress_lossless_pool0": {
-            "size": "3637248",
+        "ingress_lossless_pool": {
+            "size": "7274496",
             "type": "ingress",
-            "mode": "static"
-        },
-        "ingress_lossless_pool1": {
-            "size": "3637248",
-            "type": "ingress",
-            "mode": "static"
+            "mode": "dynamic"
         },
         "ingress_lossy_pool": {
             "size": "5491712",
@@ -100,19 +95,13 @@
         }
     },
     "BUFFER_PROFILE": {
-        "ingress_lossless_profile0": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool0]",
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "xon":"18432",
             "xoff":"76800",
-            "size":"113664",
-            "static_th":"0"
-        },
-        "ingress_lossless_profile1": {
-            "pool":"[BUFFER_POOL|ingress_lossless_pool1]",
-            "xon":"18432",
-            "xoff":"76800",
-            "size":"113664",
-            "static_th":"0"
+            "size":"78048",
+            "dynamic_th":"-3",
+            "xon_offset":"2496"
         },
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossy_pool]",
@@ -136,11 +125,8 @@
         }
     },
     "BUFFER_PG": {
-        "{{ port_names }}|3": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossless_profile0]"
-        },
-        "{{ port_names }}|4": {
-            "profile" : "[BUFFER_PROFILE|ingress_lossless_profile1]"
+        "{{ port_names }}|3-4": {
+            "profile" : "[BUFFER_PROFILE|ingress_lossless_profile]"
         },
         "{{ port_names }}|0-1": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"