Skip to content

Commit

Permalink
swssconfig: Updating QOS settings (sonic-net#113)
Browse files Browse the repository at this point in the history
* Update td2 qos settings
* Copy all configuration files to swss package
* Add td2 qos configurations in small chunks
  • Loading branch information
pavel-shirshov authored and Shuotian Cheng committed Oct 24, 2016
1 parent ef029e8 commit 3733769
Show file tree
Hide file tree
Showing 11 changed files with 333 additions and 12 deletions.
14 changes: 14 additions & 0 deletions debian/swss.install
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
swssconfig/sample/00-copp.config.json etc/swss/config.d
swssconfig/sample/buffer.config.json etc/swss/config.d
swssconfig/sample/netbouncer.json etc/swss/config.d
swssconfig/sample/qos.config.json etc/swss/config.d
swssconfig/sample/td2.32ports.buffers.json etc/swss/config.d
swssconfig/sample/td2.32ports.qos.json etc/swss/config.d
swssconfig/sample/td2.32ports.buffers.1.json etc/swss/config.d
swssconfig/sample/td2.32ports.buffers.2.json etc/swss/config.d
swssconfig/sample/td2.32ports.buffers.3.json etc/swss/config.d
swssconfig/sample/td2.32ports.qos.1.json etc/swss/config.d
swssconfig/sample/td2.32ports.qos.2.json etc/swss/config.d
swssconfig/sample/td2.32ports.qos.3.json etc/swss/config.d
swssconfig/sample/td2.32ports.qos.4.json etc/swss/config.d
swssconfig/sample/td2.32ports.qos.5.json etc/swss/config.d
swssconfig/sample/td2.32ports.qos.6.json etc/swss/config.d
50 changes: 50 additions & 0 deletions swssconfig/sample/td2.32ports.buffers.1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[
{
"BUFFER_POOL_TABLE:ingress_lossless_pool0": {
"size": "3637248",
"type": "ingress",
"mode": "static"
},
"OP": "SET"
},
{
"BUFFER_POOL_TABLE:ingress_lossless_pool1": {
"size": "3637248",
"type": "ingress",
"mode": "static"
},
"OP": "SET"
},
{
"BUFFER_POOL_TABLE:ingress_lossy_pool": {
"size": "5491712",
"type": "ingress",
"mode": "dynamic"
},
"OP": "SET"
},
{
"BUFFER_POOL_TABLE:egress_lossless_pool0": {
"size": "113664",
"type": "egress",
"mode": "static"
},
"OP": "SET"
},
{
"BUFFER_POOL_TABLE:egress_lossless_pool1": {
"size": "113664",
"type": "egress",
"mode": "static"
},
"OP": "SET"
},
{
"BUFFER_POOL_TABLE:egress_lossy_pool": {
"size": "5491712",
"type": "egress",
"mode": "dynamic"
},
"OP": "SET"
}
]
54 changes: 54 additions & 0 deletions swssconfig/sample/td2.32ports.buffers.2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
[
{
"BUFFER_PROFILE_TABLE:ingress_lossless_profile0": {
"pool": "[BUFFER_POOL_TABLE:ingress_lossless_pool0]",
"xon": "18432",
"xoff": "76800",
"size": "113664",
"static_th": "0"
},
"OP": "SET"
},
{
"BUFFER_PROFILE_TABLE:ingress_lossless_profile1": {
"pool":"[BUFFER_POOL_TABLE:ingress_lossless_pool1]",
"xon":"18432",
"xoff":"76800",
"size":"113664",
"static_th": "0"
},
"OP": "SET"
},
{
"BUFFER_PROFILE_TABLE:ingress_lossy_profile": {
"pool":"[BUFFER_POOL_TABLE:ingress_lossy_pool]",
"size":"1518",
"dynamic_th":"3"
},
"OP": "SET"
},
{
"BUFFER_PROFILE_TABLE:egress_lossless_profile0": {
"pool":"[BUFFER_POOL_TABLE:egress_lossless_pool0]",
"size":"1518",
"static_th":"3637248"
},
"OP": "SET"
},
{
"BUFFER_PROFILE_TABLE:egress_lossless_profile1": {
"pool":"[BUFFER_POOL_TABLE:egress_lossless_pool1]",
"size":"1518",
"static_th":"3637248"
},
"OP": "SET"
},
{
"BUFFER_PROFILE_TABLE:egress_lossy_profile": {
"pool":"[BUFFER_POOL_TABLE:egress_lossy_pool]",
"size":"1518",
"dynamic_th":"3"
},
"OP": "SET"
}
]
38 changes: 38 additions & 0 deletions swssconfig/sample/td2.32ports.buffers.3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
[
{
"BUFFER_PG_TABLE: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": {
"profile" : "[BUFFER_PROFILE_TABLE:ingress_lossless_profile0]"
},
"OP": "SET"
},
{
"BUFFER_PG_TABLE: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": {
"profile" : "[BUFFER_PROFILE_TABLE:ingress_lossless_profile1]"
},
"OP": "SET"
},
{
"BUFFER_PG_TABLE: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": {
"profile" : "[BUFFER_PROFILE_TABLE:ingress_lossy_profile]"
},
"OP": "SET"
},
{
"BUFFER_QUEUE_TABLE: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": {
"profile" : "[BUFFER_PROFILE_TABLE:egress_lossless_profile0]"
},
"OP": "SET"
},
{
"BUFFER_QUEUE_TABLE: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": {
"profile" : "[BUFFER_PROFILE_TABLE:egress_lossless_profile1]"
},
"OP": "SET"
},
{
"BUFFER_QUEUE_TABLE: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": {
"profile" : "[BUFFER_PROFILE_TABLE:egress_lossy_profile]"
},
"OP": "SET"
}
]
98 changes: 98 additions & 0 deletions swssconfig/sample/td2.32ports.qos.1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
[
{
"TC_TO_PRIORITY_GROUP_MAP_TABLE:AZURE": {
"0": "0",
"1": "1",
"3": "3",
"4": "4"
},
"OP": "SET"
},
{
"MAP_PFC_PRIORITY_TO_QUEUE:AZURE": {
"0": "0",
"1": "1",
"3": "3",
"4": "4"
},
"OP": "SET"
},
{
"TC_TO_QUEUE_MAP_TABLE:AZURE": {
"0": "0",
"1": "1",
"3": "3",
"4": "4"
},
"OP": "SET"
},
{
"DSCP_TO_TC_MAP_TABLE: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"
},
"OP": "SET"
}
]
23 changes: 23 additions & 0 deletions swssconfig/sample/td2.32ports.qos.2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[
{
"SCHEDULER_TABLE:scheduler.0" : {
"type":"DWRR",
"weight": "25"
},
"OP": "SET"
},
{
"SCHEDULER_TABLE:scheduler.1" : {
"type":"DWRR",
"weight": "30"
},
"OP": "SET"
},
{
"SCHEDULER_TABLE:scheduler.2" : {
"type":"DWRR",
"weight": "20"
},
"OP": "SET"
}
]
12 changes: 12 additions & 0 deletions swssconfig/sample/td2.32ports.qos.3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[
{
"PORT_QOS_MAP_TABLE: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_TABLE:AZURE]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP_TABLE:AZURE]",
"tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP_TABLE:AZURE]",
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE:AZURE]",
"pfc_enable": "3,4"
},
"OP": "SET"
}
]
13 changes: 13 additions & 0 deletions swssconfig/sample/td2.32ports.qos.4.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[
{
"WRED_PROFILE_TABLE:AZURE" : {
"wred_green_enable":"true",
"wred_yellow_enable":"true",
"ecn":"ecn_all",
"red_max_threshold":"512000",
"yellow_max_threshold":"512000",
"green_max_threshold": "184320"
},
"OP": "SET"
}
]
8 changes: 8 additions & 0 deletions swssconfig/sample/td2.32ports.qos.5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[
{
"QUEUE_TABLE: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_TABLE:AZURE]"
},
"OP": "SET"
}
]
20 changes: 20 additions & 0 deletions swssconfig/sample/td2.32ports.qos.6.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[
{
"QUEUE_TABLE: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_TABLE:scheduler.0]"
},
"OP": "SET"
},
{
"QUEUE_TABLE: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_TABLE:scheduler.1]"
},
"OP": "SET"
},
{
"QUEUE_TABLE: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_TABLE:scheduler.2]"
},
"OP": "SET"
}
]
15 changes: 3 additions & 12 deletions swssconfig/sample/td2.32ports.qos.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,7 @@
"OP": "SET"
},
{
"PFC_PRIORITY_TO_PRIORITY_GROUP_MAP_TABLE:AZURE": {
"0": "0",
"1": "1",
"3": "3",
"4": "4"
},
"OP": "SET"
},
{
"SAI_QOS_MAP_PFC_PRIORITY_TO_QUEUE:AZURE": {
"MAP_PFC_PRIORITY_TO_QUEUE:AZURE": {
"0": "0",
"1": "1",
"3": "3",
Expand Down Expand Up @@ -130,8 +121,7 @@
"dscp_to_tc_map" : "[DSCP_TO_TC_MAP_TABLE:AZURE]",
"tc_to_queue_map" : "[TC_TO_QUEUE_MAP_TABLE:AZURE]",
"tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP_TABLE:AZURE]",
"pfc_to_pg_map" : "[PFC_PRIORITY_TO_PRIORITY_GROUP_MAP_TABLE:AZURE]",
"pfc_to_queue_map": "[SAI_QOS_MAP_PFC_PRIORITY_TO_QUEUE:AZURE]",
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE:AZURE]",
"pfc_enable": "3,4"
},
"OP": "SET"
Expand All @@ -141,6 +131,7 @@
"wred_green_enable":"true",
"wred_yellow_enable":"true",
"ecn":"ecn_all",
"red_max_threshold":"512000",
"yellow_max_threshold":"512000",
"green_max_threshold": "184320"
},
Expand Down

0 comments on commit 3733769

Please sign in to comment.