Skip to content

Commit

Permalink
[QoS]: Qos config change (#2504)
Browse files Browse the repository at this point in the history 
* a7050-QX-32S, a7050-QX32, s6000: 1) dscp mapping; 2) DWRR

a7060-Q32, a7060-C32, a7060-D48C8, s6100, z9100-C32, z9100-D48C8, a7260-D108C8 mmu setting change:
1) Update headroom pool size; Update ingress service pool and egress lossy pool sizes accordingly;
2) Add DSCP 48 to TC 6 mapping;
3) scheduler weight redistribute

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Correct format

Signed-off-by: Wenda <wenni@microsoft.com>

* Link queue 2 to lossy buffer
Add scheduling weight to queue 2

Signed-off-by: Wenda <wenni@microsoft.com>

* Link pg 2 to lossy buffer

Signed-off-by: Wenda <wenni@microsoft.com>

* Add tc to pg, tc to queue, pfc to queue mapping for 2, 6 (and 7)

Signed-off-by: Wenda <wenni@microsoft.com>
  • Loading branch information
@wendani @lguohan
wendani authored and lguohan committed Feb 2, 2019
1 parent 4b70ae9 commit 8fda693
Show file tree
Hide file tree
Showing 25 changed files with 823 additions and 696 deletions.
8 changes: 4 additions & 4 deletions device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers.json.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,21 +113,21 @@
"{{ port_names }}|3-4": {
"profile" : "[BUFFER_PROFILE|ingress_lossless_profile]"
},
"{{ port_names }}|0-1": {
"{{ port_names }}|0-2": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"{{ port_names }}|5": {
"{{ port_names }}|5-6": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}
},
"BUFFER_QUEUE": {
"{{ port_names }}|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"{{ port_names }}|0-1": {
"{{ port_names }}|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"{{ port_names }}|5": {
"{{ port_names }}|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}
}
Expand Down
153 changes: 86 additions & 67 deletions device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,101 +3,114 @@
"AZURE": {
"0": "0",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5"
"5": "5",
"6": "6",
"7": "7"
}
},
"MAP_PFC_PRIORITY_TO_QUEUE": {
"AZURE": {
"0": "0",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5"
"5": "5",
"6": "6",
"7": "7"
}
},
"TC_TO_QUEUE_MAP": {
"AZURE": {
"0": "0",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5"
"5": "5",
"6": "6",
"7": "7"
}
},
"DSCP_TO_TC_MAP": {
"AZURE": {
"0":"0",
"1":"0",
"2":"0",
"0":"1",
"1":"1",
"2":"1",
"3":"3",
"4":"4",
"5":"0",
"6":"0",
"7":"0",
"8":"1",
"9":"0",
"10":"0",
"11":"0",
"12":"0",
"13":"0",
"14":"0",
"15":"0",
"16":"0",
"17":"0",
"18":"0",
"19":"0",
"20":"0",
"21":"0",
"22":"0",
"23":"0",
"24":"0",
"25":"0",
"26":"0",
"27":"0",
"28":"0",
"29":"0",
"30":"0",
"31":"0",
"32":"0",
"33":"0",
"34":"0",
"35":"0",
"36":"0",
"37":"0",
"38":"0",
"39":"0",
"40":"0",
"41":"0",
"42":"0",
"43":"0",
"44":"0",
"45":"0",
"5":"2",
"6":"1",
"7":"1",
"8":"0",
"9":"1",
"10":"1",
"11":"1",
"12":"1",
"13":"1",
"14":"1",
"15":"1",
"16":"1",
"17":"1",
"18":"1",
"19":"1",
"20":"1",
"21":"1",
"22":"1",
"23":"1",
"24":"1",
"25":"1",
"26":"1",
"27":"1",
"28":"1",
"29":"1",
"30":"1",
"31":"1",
"32":"1",
"33":"1",
"34":"1",
"35":"1",
"36":"1",
"37":"1",
"38":"1",
"39":"1",
"40":"1",
"41":"1",
"42":"1",
"43":"1",
"44":"1",
"45":"1",
"46":"5",
"47":"0",
"48":"0",
"49":"0",
"50":"0",
"51":"0",
"52":"0",
"53":"0",
"54":"0",
"55":"0",
"56":"0",
"57":"0",
"58":"0",
"59":"0",
"60":"0",
"61":"0",
"62":"0",
"63":"0"
"47":"1",
"48":"6",
"49":"1",
"50":"1",
"51":"1",
"52":"1",
"53":"1",
"54":"1",
"55":"1",
"56":"1",
"57":"1",
"58":"1",
"59":"1",
"60":"1",
"61":"1",
"62":"1",
"63":"1"
}
},
"SCHEDULER": {
"scheduler.0" : {
"type":"DWRR",
"weight": "20"
"weight": "14"
},
"scheduler.1" : {
"type":"DWRR",
"weight": "15"
}
},
"PORT_QOS_MAP": {
Expand Down Expand Up @@ -128,11 +141,11 @@
},
"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" : {
"scheduler" : "[SCHEDULER|scheduler.0]",
"scheduler" : "[SCHEDULER|scheduler.1]",
"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" : {
"scheduler" : "[SCHEDULER|scheduler.0]",
"scheduler" : "[SCHEDULER|scheduler.1]",
"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" : {
Expand All @@ -141,8 +154,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|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|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]"
},
"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|6" : {
"scheduler" : "[SCHEDULER|scheduler.0]"
}
}
}
8 changes: 4 additions & 4 deletions device/arista/x86_64-arista_7050_qx32s/Arista-7050-QX-32S/buffers.json.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,21 +113,21 @@
"{{ port_names }}|3-4": {
"profile" : "[BUFFER_PROFILE|ingress_lossless_profile]"
},
"{{ port_names }}|0-1": {
"{{ port_names }}|0-2": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"{{ port_names }}|5": {
"{{ port_names }}|5-6": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}
},
"BUFFER_QUEUE": {
"{{ port_names }}|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
},
"{{ port_names }}|0-1": {
"{{ port_names }}|0-2": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
},
"{{ port_names }}|5": {
"{{ port_names }}|5-6": {
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}
}
Expand Down
Loading

0 comments on commit 8fda693

Please sign in to comment.