matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[devices]: Update qos and buffer configuration for Dell S6000 (#1441)

Browse Source 
Signed-off-by: Sihui Han <sihan@microsoft.com>
This commit is contained in:
sihuihan88 2018-03-01 20:56:12 -08:00 committed by lguohan
parent a0e68bf399
commit 1e6576c5b8
4 changed files with 172 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers.json.j2
View File

@ -68,8 +68,13 @@
} }
}, },
"BUFFER_POOL": { "BUFFER_POOL": {
"ingress_lossless_pool": { "ingress_lossless_pool0": {
"size": "7274496", "size": "3637248",
"type": "ingress",
"mode": "static"
},
"ingress_lossless_pool1": {
"size": "3637248",
"type": "ingress", "type": "ingress",
"mode": "static" "mode": "static"
}, },
@ -95,6 +100,20 @@
} }
}, },
"BUFFER_PROFILE": { "BUFFER_PROFILE": {
"ingress_lossless_profile0": {
"pool":"[BUFFER_POOL|ingress_lossless_pool0]",
"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"
},
"ingress_lossy_profile": { "ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossy_pool]", "pool":"[BUFFER_POOL|ingress_lossy_pool]",
"size":"1518", "size":"1518",
@ -117,6 +136,12 @@
} }
}, },
"BUFFER_PG": { "BUFFER_PG": {
"{{ port_names }}|3": {
"profile" : "[BUFFER_PROFILE|ingress_lossless_profile0]"
},
"{{ port_names }}|4": {
"profile" : "[BUFFER_PROFILE|ingress_lossless_profile1]"
},
"{{ port_names }}|0-1": { "{{ port_names }}|0-1": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
} }

17
device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini
View File

@ -1,17 +0,0 @@
# PG lossless profiles.
# speed cable size xon xoff threshold
10000 5m 113664 18432 76800 0
25000 5m 113664 18432 76800 0
40000 5m 113664 18432 76800 0
50000 5m 113664 18432 76800 0
100000 5m 113664 18432 76800 0
10000 40m 113664 18432 76800 0
25000 40m 113664 18432 76800 0
40000 40m 113664 18432 76800 0
50000 40m 113664 18432 76800 0
100000 40m 113664 18432 76800 0
10000 300m 113664 18432 76800 0
25000 300m 113664 18432 76800 0
40000 300m 113664 18432 76800 0
50000 300m 113664 18432 76800 0
100000 300m 113664 18432 76800 0

144
device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json Normal file
View File

@ -0,0 +1,144 @@
{
"TC_TO_PRIORITY_GROUP_MAP": {
"AZURE": {
"0": "0",
"1": "1",
"3": "3",
"4": "4"
}
},
"MAP_PFC_PRIORITY_TO_QUEUE": {
"AZURE": {
"0": "0",
"1": "1",
"3": "3",
"4": "4"
}
},
"TC_TO_QUEUE_MAP": {
"AZURE": {
"0": "0",
"1": "1",
"3": "3",
"4": "4"
}
},
"DSCP_TO_TC_MAP": {
"AZURE": {
"0":"0",
"1":"0",
"2":"0",
"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",
"46":"0",
"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"
}
},
"SCHEDULER": {
"scheduler.0" : {
"type":"DWRR",
"weight": "25"
},
"scheduler.1" : {
"type":"DWRR",
"weight": "30"
},
"scheduler.2" : {
"type":"DWRR",
"weight": "20"
}
},
"PORT_QOS_MAP": {
"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": {
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
"tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
"pfc_enable": "3,4"
}
},
"WRED_PROFILE": {
"AZURE_LOSSY" : {
"wred_green_enable":"true",
"wred_yellow_enable":"true",
"ecn":"ecn_all",
"red_max_threshold":"512000",
"red_min_threshold":"512000",
"yellow_max_threshold":"512000",
"yellow_min_threshold":"512000",
"green_max_threshold": "184320",
"green_min_threshold": "184320"
}
},
"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|0-1" : {
"wred_profile" : "[WRED_PROFILE|AZURE_LOSSY]"
},
"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|0" : {
"scheduler" : "[SCHEDULER|scheduler.1]"
},
"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]"
}
}
}

6
dockers/docker-orchagent/swssconfig.sh
View File

@ -43,11 +43,7 @@ HWSKU=`sonic-cfggen -d -v "DEVICE_METADATA['localhost']['hwsku']"`
SWSSCONFIG_ARGS="00-copp.config.json ipinip.json ports.json switch.json " SWSSCONFIG_ARGS="00-copp.config.json ipinip.json ports.json switch.json "
if [ "$HWSKU" == "Force10-S6000" ]; then if [ "$HWSKU" == "Force10-S6100" ]; then
SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "
elif [ "$HWSKU" == "Force10-S6000-Q32" ]; then
SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "
elif [ "$HWSKU" == "Force10-S6100" ]; then
SWSSCONFIG_ARGS+="th.64ports.buffers.json th.64ports.qos.json " SWSSCONFIG_ARGS+="th.64ports.buffers.json th.64ports.qos.json "
elif [ "$HWSKU" == "Arista-7050-QX32" ]; then elif [ "$HWSKU" == "Arista-7050-QX32" ]; then
SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json " SWSSCONFIG_ARGS+="td2.32ports.buffers.json td2.32ports.qos.json "