From 2bb9cdd96f312b79f4bcd2d317c1ad79ec62bec0 Mon Sep 17 00:00:00 2001 From: Wenda Date: Wed, 22 Aug 2018 18:26:32 +0000 Subject: [PATCH 1/3] Enable WRED red color profile on mellanox platform Signed-off-by: Wenda Ni --- device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/qos.json | 2 ++ device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json | 2 ++ device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/qos.json | 2 ++ device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json | 2 ++ .../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/qos.json | 2 ++ 5 files changed, 10 insertions(+) diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/qos.json b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/qos.json index 3e01af3f2c64..df3d29c636e3 100644 --- a/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/qos.json +++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/qos.json @@ -127,6 +127,7 @@ "AZURE_LOSSY": { "wred_green_enable":"true", "wred_yellow_enable":"true", + "wred_red_enable":"true", "ecn":"ecn_all", "red_max_threshold":"516096", "red_min_threshold":"516096", @@ -138,6 +139,7 @@ "AZURE_LOSSLESS": { "wred_green_enable":"true", "wred_yellow_enable":"true", + "wred_red_enable":"true", "ecn":"ecn_all", "red_max_threshold":"516096", "red_min_threshold":"516096", diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json index 74045469dbfd..2ea9b9dc019d 100644 --- a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json +++ b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json @@ -127,6 +127,7 @@ "AZURE_LOSSY": { "wred_green_enable":"true", "wred_yellow_enable":"true", + "wred_red_enable":"true", "ecn":"ecn_all", "red_max_threshold":"516096", "red_min_threshold":"516096", @@ -138,6 +139,7 @@ "AZURE_LOSSLESS": { "wred_green_enable":"true", "wred_yellow_enable":"true", + "wred_red_enable":"true", "ecn":"ecn_all", "red_max_threshold":"516096", "red_min_threshold":"516096", diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/qos.json b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/qos.json index 95652cf96f4e..0d01a3f1cbad 100644 --- a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/qos.json +++ b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/qos.json @@ -127,6 +127,7 @@ "AZURE_LOSSY": { "wred_green_enable":"true", "wred_yellow_enable":"true", + "wred_red_enable":"true", "ecn":"ecn_all", "red_max_threshold":"516096", "red_min_threshold":"516096", @@ -138,6 +139,7 @@ "AZURE_LOSSLESS": { "wred_green_enable":"true", "wred_yellow_enable":"true", + "wred_red_enable":"true", "ecn":"ecn_all", "red_max_threshold":"516096", "red_min_threshold":"516096", diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json index 3e01af3f2c64..df3d29c636e3 100644 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json +++ b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json @@ -127,6 +127,7 @@ "AZURE_LOSSY": { "wred_green_enable":"true", "wred_yellow_enable":"true", + "wred_red_enable":"true", "ecn":"ecn_all", "red_max_threshold":"516096", "red_min_threshold":"516096", @@ -138,6 +139,7 @@ "AZURE_LOSSLESS": { "wred_green_enable":"true", "wred_yellow_enable":"true", + "wred_red_enable":"true", "ecn":"ecn_all", "red_max_threshold":"516096", "red_min_threshold":"516096", diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/qos.json b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/qos.json index d35f614de635..03c89438ab68 100644 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/qos.json +++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/qos.json @@ -127,6 +127,7 @@ "AZURE_LOSSY": { "wred_green_enable":"true", "wred_yellow_enable":"true", + "wred_red_enable":"true", "ecn":"ecn_all", "red_max_threshold":"516096", "red_min_threshold":"516096", @@ -138,6 +139,7 @@ "AZURE_LOSSLESS": { "wred_green_enable":"true", "wred_yellow_enable":"true", + "wred_red_enable":"true", "ecn":"ecn_all", "red_max_threshold":"516096", "red_min_threshold":"516096", From a5d64e3647660173193dc8bf1e10e756ce0e4945 Mon Sep 17 00:00:00 2001 From: Wenda Date: Thu, 23 Aug 2018 02:54:06 +0000 Subject: [PATCH 2/3] Change ingress alpha to 2^(-3) on a7050 --- .../x86_64-arista_7050_qx32/Arista-7050-QX32/buffers.json.j2 | 2 +- .../x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers.json.j2 | 2 +- 2 files changed, 2 insertions(+), 2 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 551f73ca0477..f9bad4994501 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 @@ -90,7 +90,7 @@ "xon":"18432", "xoff":"40560", "size":"41808", - "dynamic_th":"-4", + "dynamic_th":"-3", "xon_offset":"2496" }, "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 index 551f73ca0477..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 @@ -90,7 +90,7 @@ "xon":"18432", "xoff":"40560", "size":"41808", - "dynamic_th":"-4", + "dynamic_th":"-3", "xon_offset":"2496" }, "ingress_lossy_profile": { From 5b256aabf7c9fd94079ecbb3735f229b18284725 Mon Sep 17 00:00:00 2001 From: Wenda Date: Thu, 23 Aug 2018 03:13:20 +0000 Subject: [PATCH 3/3] a7050: Add dscp 46 mapping to pg 5 and queue 5; link pg 5 and queue 5 to lossy profile; Make ecn off by default on queues Signed-off-by: Wenda --- .../Arista-7050-QX32/buffers.json.j2 | 6 ++++ .../Arista-7050-QX32/qos.json | 29 ++++++++--------- .../Arista-7050-QX-32S/buffers.json.j2 | 6 ++++ .../Arista-7050-QX-32S/qos.json | 32 +++++++------------ 4 files changed, 37 insertions(+), 36 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 f9bad4994501..782dc528f71e 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 @@ -115,6 +115,9 @@ }, "{{ port_names }}|0-1": { "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" + }, + "{{ port_names }}|5": { + "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" } }, "BUFFER_QUEUE": { @@ -123,6 +126,9 @@ }, "{{ port_names }}|0-1": { "profile" : "[BUFFER_PROFILE|egress_lossy_profile]" + }, + "{{ port_names }}|5": { + "profile" : "[BUFFER_PROFILE|egress_lossy_profile]" } } } 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 index 926911ab59d0..6cb1e880ab10 100644 --- 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 @@ -4,7 +4,8 @@ "0": "0", "1": "1", "3": "3", - "4": "4" + "4": "4", + "5": "5" } }, "MAP_PFC_PRIORITY_TO_QUEUE": { @@ -12,7 +13,8 @@ "0": "0", "1": "1", "3": "3", - "4": "4" + "4": "4", + "5": "5" } }, "TC_TO_QUEUE_MAP": { @@ -20,7 +22,8 @@ "0": "0", "1": "1", "3": "3", - "4": "4" + "4": "4", + "5": "5" } }, "DSCP_TO_TC_MAP": { @@ -71,7 +74,7 @@ "43":"0", "44":"0", "45":"0", - "46":"0", + "46":"5", "47":"0", "48":"0", "49":"0", @@ -93,14 +96,6 @@ }, "SCHEDULER": { "scheduler.0" : { - "type":"DWRR", - "weight": "25" - }, - "scheduler.1" : { - "type":"DWRR", - "weight": "30" - }, - "scheduler.2" : { "type":"DWRR", "weight": "20" } @@ -130,14 +125,16 @@ }, "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]", - "wred_profile" : "[WRED_PROFILE|AZURE_LOSSLESS]" + "scheduler" : "[SCHEDULER|scheduler.0]" }, "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.1]" + "scheduler" : "[SCHEDULER|scheduler.0]" }, "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|1" : { - "scheduler" : "[SCHEDULER|scheduler.2]" + "scheduler" : "[SCHEDULER|scheduler.0]" + }, + "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|5" : { + "scheduler" : "[SCHEDULER|scheduler.0]" } } } 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..782dc528f71e 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 @@ -115,6 +115,9 @@ }, "{{ port_names }}|0-1": { "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" + }, + "{{ port_names }}|5": { + "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" } }, "BUFFER_QUEUE": { @@ -123,6 +126,9 @@ }, "{{ port_names }}|0-1": { "profile" : "[BUFFER_PROFILE|egress_lossy_profile]" + }, + "{{ port_names }}|5": { + "profile" : "[BUFFER_PROFILE|egress_lossy_profile]" } } } 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 index 698811c610ff..6cb1e880ab10 100644 --- 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 @@ -4,7 +4,8 @@ "0": "0", "1": "1", "3": "3", - "4": "4" + "4": "4", + "5": "5" } }, "MAP_PFC_PRIORITY_TO_QUEUE": { @@ -12,7 +13,8 @@ "0": "0", "1": "1", "3": "3", - "4": "4" + "4": "4", + "5": "5" } }, "TC_TO_QUEUE_MAP": { @@ -20,7 +22,8 @@ "0": "0", "1": "1", "3": "3", - "4": "4" + "4": "4", + "5": "5" } }, "DSCP_TO_TC_MAP": { @@ -71,7 +74,7 @@ "43":"0", "44":"0", "45":"0", - "46":"0", + "46":"5", "47":"0", "48":"0", "49":"0", @@ -93,14 +96,6 @@ }, "SCHEDULER": { "scheduler.0" : { - "type":"DWRR", - "weight": "25" - }, - "scheduler.1" : { - "type":"DWRR", - "weight": "30" - }, - "scheduler.2" : { "type":"DWRR", "weight": "20" } @@ -132,17 +127,14 @@ "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]" }, - "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" : { - "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|4" : { - "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.1]" + "scheduler" : "[SCHEDULER|scheduler.0]" }, "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|1" : { - "scheduler" : "[SCHEDULER|scheduler.2]" + "scheduler" : "[SCHEDULER|scheduler.0]" + }, + "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|5" : { + "scheduler" : "[SCHEDULER|scheduler.0]" } } }