Skip to content

Commit

Permalink
[qosorch] Update QoS scheduler params for shaping features (sonic-net…
Browse files Browse the repository at this point in the history 
…#1296)

* Add shaping meter_type field to SCHEDULER_TABLE
* Add scheduler reference field to PORT_QOS_MAP table for port level shaping
* Refer to corresponding design document for more details: sonic-net/SONiC#535

Signed-off-by: Michael Li <michael.li@broadcom.com>
  • Loading branch information
@michaelli10
michaelli10 committed Jul 1, 2020
1 parent 86b5e99 commit 9b01844
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 19 deletions.
51 changes: 38 additions & 13 deletions doc/swss-schema.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,23 +256,48 @@ and reflects the LAG ports into the redis under: `LAG_TABLE:<team0>:port`
### SCHEDULER_TABLE
; Scheduler table
; SAI mapping - saicheduler.h
key = "SCHEDULER_TABLE":name
; field value
type = "DWRR"/"WRR"/"PRIORITY"
weight = 1*DIGIT
priority = 1*DIGIT
key = "SCHEDULER_TABLE":name
; field value
type = "DWRR"/"WRR"/"STRICT"
weight = 2*DIGIT
priority = 1*DIGIT
meter_type = "packets"/"bytes"
cir = 1*11 DIGIT ; guaranteed rate in pps or bytes/sec
cbs = 1*11 DIGIT ; guaranteed burst size in packets or bytes
pir = 1*11 DIGIT ; max rate in pps or bytes/sec
pbs = 1*11 DIGIT ; max burst size in packets or bytes

Example:
127.0.0.1:6379> hgetall SCHEDULER_TABLE:BEST_EFFORT
1) "type"
2) "PRIORITY"
3) "priority"
4) "7"
1) "type"
2) "PRIORITY"
3) "priority"
4) "7"
5) "meter_type"
6) "bytes"
7) "cir"
8) "1000000000"
9) "cbs"
10) "8192"
11) "pir"
12) "1250000000"
13) "pbs"
14) "8192"
127.0.0.1:6379> hgetall SCHEDULER_TABLE:SCAVENGER
1) "type"
2) "DWRR"
3) "weight"
4) "35"
1) "type"
2) "DWRR"
3) "weight"
4) "35"
5) "meter_type"
6) "bytes"
7) "cir"
8) "1000000000"
9) "cbs"
10) "8192"
11) "pir"
12) "1250000000"
13) "pbs"
14) "8192"

---------------------------------------------
### WRED\_PROFILE\_TABLE
Expand Down
23 changes: 18 additions & 5 deletions orchagent/qosorch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,13 @@ map<string, sai_port_attr_t> qos_to_attr_map = {
{tc_to_queue_field_name, SAI_PORT_ATTR_QOS_TC_TO_QUEUE_MAP},
{tc_to_pg_map_field_name, SAI_PORT_ATTR_QOS_TC_TO_PRIORITY_GROUP_MAP},
{pfc_to_pg_map_name, SAI_PORT_ATTR_QOS_PFC_PRIORITY_TO_PRIORITY_GROUP_MAP},
{pfc_to_queue_map_name, SAI_PORT_ATTR_QOS_PFC_PRIORITY_TO_QUEUE_MAP}
{pfc_to_queue_map_name, SAI_PORT_ATTR_QOS_PFC_PRIORITY_TO_QUEUE_MAP},
{scheduler_field_name, SAI_PORT_ATTR_QOS_SCHEDULER_PROFILE_ID}
};

map<string, sai_meter_type_t> scheduler_meter_map = {
{"packets", SAI_METER_TYPE_PACKETS},
{"bytes", SAI_METER_TYPE_BYTES}
};

type_map QosOrch::m_qos_maps = {
Expand Down Expand Up @@ -813,28 +819,35 @@ task_process_status QosOrch::handleSchedulerTable(Consumer& consumer)
// TODO: The meaning is to be able to adjus priority of the given scheduler group.
// However currently SAI model does not provide such ability.
}
else if (fvField(*i) == scheduler_meter_type_field_name)
{
sai_meter_type_t meter_value = scheduler_meter_map.at(fvValue(*i));
attr.id = SAI_SCHEDULER_ATTR_METER_TYPE;
attr.value.s32 = meter_value;
sai_attr_list.push_back(attr);
}
else if (fvField(*i) == scheduler_min_bandwidth_rate_field_name)
{
attr.id = SAI_SCHEDULER_ATTR_MIN_BANDWIDTH_RATE;
attr.value.u64 = stoul(fvValue(*i));
attr.value.u64 = stoull(fvValue(*i));
sai_attr_list.push_back(attr);
}
else if (fvField(*i) == scheduler_min_bandwidth_burst_rate_field_name)
{
attr.id = SAI_SCHEDULER_ATTR_MIN_BANDWIDTH_BURST_RATE;
attr.value.u64 = stoul(fvValue(*i));
attr.value.u64 = stoull(fvValue(*i));
sai_attr_list.push_back(attr);
}
else if (fvField(*i) == scheduler_max_bandwidth_rate_field_name)
{
attr.id = SAI_SCHEDULER_ATTR_MAX_BANDWIDTH_RATE;
attr.value.u64 = stoul(fvValue(*i));
attr.value.u64 = stoull(fvValue(*i));
sai_attr_list.push_back(attr);
}
else if (fvField(*i) == scheduler_max_bandwidth_burst_rate_field_name)
{
attr.id = SAI_SCHEDULER_ATTR_MAX_BANDWIDTH_BURST_RATE;
attr.value.u64 = stoul(fvValue(*i));
attr.value.u64 = stoull(fvValue(*i));
sai_attr_list.push_back(attr);
}
else {
Expand Down
2 changes: 1 addition & 1 deletion orchagent/qosorch.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const string scheduler_algo_WRR = "WRR";
const string scheduler_algo_STRICT = "STRICT";
const string scheduler_weight_field_name = "weight";
const string scheduler_priority_field_name = "priority";

const string scheduler_meter_type_field_name = "meter_type";
const string scheduler_min_bandwidth_rate_field_name = "cir";//Committed Information Rate
const string scheduler_min_bandwidth_burst_rate_field_name = "cbs";//Committed Burst Size
const string scheduler_max_bandwidth_rate_field_name = "pir";//Peak Information Rate
Expand Down

0 comments on commit 9b01844

Please sign in to comment.