From d0ff360840042de3846e144547a5f74ee12f1ea3 Mon Sep 17 00:00:00 2001 From: Wenda Date: Tue, 10 Apr 2018 21:12:56 +0000 Subject: [PATCH 1/6] Merge ingress service pools of lossless and lossy traffic Signed-off-by: Wenda --- .../Arista-7050-QX-32S/buffers.json.j2 | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) 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 index 10f9da575a1b..2102318ea06f 100644 --- 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 @@ -69,22 +69,17 @@ }, "BUFFER_POOL": { "ingress_lossless_pool": { - "size": "7274496", - "type": "ingress", - "mode": "dynamic" - }, - "ingress_lossy_pool": { - "size": "5491712", + "size": "12766208", "type": "ingress", "mode": "dynamic" }, "egress_lossless_pool": { - "size": "7274496", + "size": "12766208", "type": "egress", "mode": "static" }, "egress_lossy_pool": { - "size": "5491712", + "size": "7994676", "type": "egress", "mode": "dynamic" } @@ -99,14 +94,14 @@ "xon_offset":"2496" }, "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossy_pool]", + "pool":"[BUFFER_POOL|ingress_lossless_pool]", "size":"1518", - "dynamic_th":"3" + "static_th":"9993344" }, "egress_lossless_profile": { "pool":"[BUFFER_POOL|egress_lossless_pool]", "size":"0", - "static_th":"7274496" + "static_th":"12766208" }, "egress_lossy_profile": { "pool":"[BUFFER_POOL|egress_lossy_pool]", From 6b083ef1d2b67d18ffaac2e8108f4189a30b48a0 Mon Sep 17 00:00:00 2001 From: Wenda Date: Thu, 12 Apr 2018 03:14:10 +0000 Subject: [PATCH 2/6] Work around the SAI bug in the case that PG_MIN_LIMIT for lossy traffic is not zero Signed-off-by: Wenda --- .../Arista-7050-QX-32S/buffers.json.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 index 2102318ea06f..a98b06eeb884 100644 --- 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 @@ -79,7 +79,7 @@ "mode": "static" }, "egress_lossy_pool": { - "size": "7994676", + "size": "8072396", "type": "egress", "mode": "dynamic" } @@ -95,8 +95,8 @@ }, "ingress_lossy_profile": { "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"1518", - "static_th":"9993344" + "size":"0", + "static_th":"10090496" }, "egress_lossless_profile": { "pool":"[BUFFER_POOL|egress_lossless_pool]", From e4631391d6577c8496010d8f7d1239ad28c037c1 Mon Sep 17 00:00:00 2001 From: Wenda Date: Thu, 12 Apr 2018 23:45:26 +0000 Subject: [PATCH 3/6] Restore lossy traffic ingress to use dynamic threshold Signed-off-by: Wenda --- .../x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers.json.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index a98b06eeb884..f9bad4994501 100644 --- 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 @@ -96,7 +96,7 @@ "ingress_lossy_profile": { "pool":"[BUFFER_POOL|ingress_lossless_pool]", "size":"0", - "static_th":"10090496" + "dynamic_th":"3" }, "egress_lossless_profile": { "pool":"[BUFFER_POOL|egress_lossless_pool]", From 4fa17a959e55dd23864421cb8c8970a1f821bea8 Mon Sep 17 00:00:00 2001 From: Wenda Date: Fri, 13 Apr 2018 15:59:57 +0000 Subject: [PATCH 4/6] Change alpha of lossless PGs to 1/16 Signed-off-by: Wenda --- .../x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers.json.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index f9bad4994501..551f73ca0477 100644 --- 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 @@ -90,7 +90,7 @@ "xon":"18432", "xoff":"40560", "size":"41808", - "dynamic_th":"-3", + "dynamic_th":"-4", "xon_offset":"2496" }, "ingress_lossy_profile": { From 586fba4fd54267f10710b00ef4088c0dd9fccb33 Mon Sep 17 00:00:00 2001 From: Wenda Date: Sat, 14 Apr 2018 00:05:08 +0000 Subject: [PATCH 5/6] Apply the pool merge operation to a7050-qx32 --- .../Arista-7050-QX32/buffers.json.j2 | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 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 index 10f9da575a1b..551f73ca0477 100644 --- 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 @@ -69,22 +69,17 @@ }, "BUFFER_POOL": { "ingress_lossless_pool": { - "size": "7274496", - "type": "ingress", - "mode": "dynamic" - }, - "ingress_lossy_pool": { - "size": "5491712", + "size": "12766208", "type": "ingress", "mode": "dynamic" }, "egress_lossless_pool": { - "size": "7274496", + "size": "12766208", "type": "egress", "mode": "static" }, "egress_lossy_pool": { - "size": "5491712", + "size": "8072396", "type": "egress", "mode": "dynamic" } @@ -95,18 +90,18 @@ "xon":"18432", "xoff":"40560", "size":"41808", - "dynamic_th":"-3", + "dynamic_th":"-4", "xon_offset":"2496" }, "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossy_pool]", - "size":"1518", + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", "dynamic_th":"3" }, "egress_lossless_profile": { "pool":"[BUFFER_POOL|egress_lossless_pool]", "size":"0", - "static_th":"7274496" + "static_th":"12766208" }, "egress_lossy_profile": { "pool":"[BUFFER_POOL|egress_lossy_pool]", From 24552146ce310ac360881535c0d29bb7f710f3f6 Mon Sep 17 00:00:00 2001 From: Wenda Date: Sat, 14 Apr 2018 00:26:26 +0000 Subject: [PATCH 6/6] Apply the pool merge operation to s6000 Signed-off-by: Wenda --- .../Force10-S6000/buffers.json.j2 | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) 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 index 10f9da575a1b..551f73ca0477 100644 --- 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 @@ -69,22 +69,17 @@ }, "BUFFER_POOL": { "ingress_lossless_pool": { - "size": "7274496", - "type": "ingress", - "mode": "dynamic" - }, - "ingress_lossy_pool": { - "size": "5491712", + "size": "12766208", "type": "ingress", "mode": "dynamic" }, "egress_lossless_pool": { - "size": "7274496", + "size": "12766208", "type": "egress", "mode": "static" }, "egress_lossy_pool": { - "size": "5491712", + "size": "8072396", "type": "egress", "mode": "dynamic" } @@ -95,18 +90,18 @@ "xon":"18432", "xoff":"40560", "size":"41808", - "dynamic_th":"-3", + "dynamic_th":"-4", "xon_offset":"2496" }, "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossy_pool]", - "size":"1518", + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", "dynamic_th":"3" }, "egress_lossless_profile": { "pool":"[BUFFER_POOL|egress_lossless_pool]", "size":"0", - "static_th":"7274496" + "static_th":"12766208" }, "egress_lossy_profile": { "pool":"[BUFFER_POOL|egress_lossy_pool]",