Skip to content

Commit 1e6576c

Browse files
sihuihan88lguohan
sihuihan88
authored and
lguohan
committed
[devices]: Update qos and buffer configuration for Dell S6000 (#1441)
Signed-off-by: Sihui Han <[email protected]>
1 parent a0e68bf commit 1e6576c

File tree

4 files changed

+172
-24
lines changed

4 files changed

+172
-24
lines changed

‎device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers.json.j2

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,13 @@
6868
}
6969
},
7070
"BUFFER_POOL": {
71-
"ingress_lossless_pool": {
72-
"size": "7274496",
71+
"ingress_lossless_pool0": {
72+
"size": "3637248",
73+
"type": "ingress",
74+
"mode": "static"
75+
},
76+
"ingress_lossless_pool1": {
77+
"size": "3637248",
7378
"type": "ingress",
7479
"mode": "static"
7580
},
@@ -95,6 +100,20 @@
95100
}
96101
},
97102
"BUFFER_PROFILE": {
103+
"ingress_lossless_profile0": {
104+
"pool":"[BUFFER_POOL|ingress_lossless_pool0]",
105+
"xon":"18432",
106+
"xoff":"76800",
107+
"size":"113664",
108+
"static_th":"0"
109+
},
110+
"ingress_lossless_profile1": {
111+
"pool":"[BUFFER_POOL|ingress_lossless_pool1]",
112+
"xon":"18432",
113+
"xoff":"76800",
114+
"size":"113664",
115+
"static_th":"0"
116+
},
98117
"ingress_lossy_profile": {
99118
"pool":"[BUFFER_POOL|ingress_lossy_pool]",
100119
"size":"1518",
@@ -117,6 +136,12 @@
117136
}
118137
},
119138
"BUFFER_PG": {
139+
"{{ port_names }}|3": {
140+
"profile" : "[BUFFER_PROFILE|ingress_lossless_profile0]"
141+
},
142+
"{{ port_names }}|4": {
143+
"profile" : "[BUFFER_PROFILE|ingress_lossless_profile1]"
144+
},
120145
"{{ port_names }}|0-1": {
121146
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
122147
}

‎device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
{
2+
"TC_TO_PRIORITY_GROUP_MAP": {
3+
"AZURE": {
4+
"0": "0",
5+
"1": "1",
6+
"3": "3",
7+
"4": "4"
8+
}
9+
},
10+
"MAP_PFC_PRIORITY_TO_QUEUE": {
11+
"AZURE": {
12+
"0": "0",
13+
"1": "1",
14+
"3": "3",
15+
"4": "4"
16+
}
17+
},
18+
"TC_TO_QUEUE_MAP": {
19+
"AZURE": {
20+
"0": "0",
21+
"1": "1",
22+
"3": "3",
23+
"4": "4"
24+
}
25+
},
26+
"DSCP_TO_TC_MAP": {
27+
"AZURE": {
28+
"0":"0",
29+
"1":"0",
30+
"2":"0",
31+
"3":"3",
32+
"4":"4",
33+
"5":"0",
34+
"6":"0",
35+
"7":"0",
36+
"8":"1",
37+
"9":"0",
38+
"10":"0",
39+
"11":"0",
40+
"12":"0",
41+
"13":"0",
42+
"14":"0",
43+
"15":"0",
44+
"16":"0",
45+
"17":"0",
46+
"18":"0",
47+
"19":"0",
48+
"20":"0",
49+
"21":"0",
50+
"22":"0",
51+
"23":"0",
52+
"24":"0",
53+
"25":"0",
54+
"26":"0",
55+
"27":"0",
56+
"28":"0",
57+
"29":"0",
58+
"30":"0",
59+
"31":"0",
60+
"32":"0",
61+
"33":"0",
62+
"34":"0",
63+
"35":"0",
64+
"36":"0",
65+
"37":"0",
66+
"38":"0",
67+
"39":"0",
68+
"40":"0",
69+
"41":"0",
70+
"42":"0",
71+
"43":"0",
72+
"44":"0",
73+
"45":"0",
74+
"46":"0",
75+
"47":"0",
76+
"48":"0",
77+
"49":"0",
78+
"50":"0",
79+
"51":"0",
80+
"52":"0",
81+
"53":"0",
82+
"54":"0",
83+
"55":"0",
84+
"56":"0",
85+
"57":"0",
86+
"58":"0",
87+
"59":"0",
88+
"60":"0",
89+
"61":"0",
90+
"62":"0",
91+
"63":"0"
92+
}
93+
},
94+
"SCHEDULER": {
95+
"scheduler.0" : {
96+
"type":"DWRR",
97+
"weight": "25"
98+
},
99+
"scheduler.1" : {
100+
"type":"DWRR",
101+
"weight": "30"
102+
},
103+
"scheduler.2" : {
104+
"type":"DWRR",
105+
"weight": "20"
106+
}
107+
},
108+
"PORT_QOS_MAP": {
109+
"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": {
110+
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
111+
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
112+
"tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
113+
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
114+
"pfc_enable": "3,4"
115+
}
116+
},
117+
"WRED_PROFILE": {
118+
"AZURE_LOSSY" : {
119+
"wred_green_enable":"true",
120+
"wred_yellow_enable":"true",
121+
"ecn":"ecn_all",
122+
"red_max_threshold":"512000",
123+
"red_min_threshold":"512000",
124+
"yellow_max_threshold":"512000",
125+
"yellow_min_threshold":"512000",
126+
"green_max_threshold": "184320",
127+
"green_min_threshold": "184320"
128+
}
129+
},
130+
"QUEUE": {
131+
"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-1" : {
132+
"wred_profile" : "[WRED_PROFILE|AZURE_LOSSY]"
133+
},
134+
"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" : {
135+
"scheduler" : "[SCHEDULER|scheduler.0]"
136+
},
137+
"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" : {
138+
"scheduler" : "[SCHEDULER|scheduler.1]"
139+
},
140+
"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" : {
141+
"scheduler" : "[SCHEDULER|scheduler.2]"
142+
}
143+
}
144+
}

‎dockers/docker-orchagent/swssconfig.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ HWSKU=`sonic-cfggen -d -v "DEVICE_METADATA['localhost']['hwsku']"`
4343

4444
SWSSCONFIG_ARGS="00-copp.config.json ipinip.json ports.json switch.json "
4545

46-
if [ "$HWSKU" == "Force10-S6000" ]; then
47-
SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "
48-
elif [ "$HWSKU" == "Force10-S6000-Q32" ]; then
49-
SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "
50-
elif [ "$HWSKU" == "Force10-S6100" ]; then
46+
if [ "$HWSKU" == "Force10-S6100" ]; then
5147
SWSSCONFIG_ARGS+="th.64ports.buffers.json th.64ports.qos.json "
5248
elif [ "$HWSKU" == "Arista-7050-QX32" ]; then
5349
SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "

0 commit comments

Comments
 (0)