From: Jasvinder Singh <jasvinder.si...@intel.com>
Update qos sched sample app to allow configuration flexibility for
pipe traffic classes and queues, and subport level configuration
of the pipe parameters.
Signed-off-by: Jasvinder Singh <jasvinder.si...@intel.com>
Signed-off-by: Abraham Tovar <abrahamx.to...@intel.com>
Signed-off-by: Lukasz Krakowiak <lukaszx.krakow...@intel.com>
---
examples/qos_sched/app_thread.c | 11 +-
examples/qos_sched/cfg_file.c | 282 +++++++++++++++++-------------
examples/qos_sched/init.c | 108 +++++++-----
examples/qos_sched/main.h | 6 +-
examples/qos_sched/profile.cfg | 59 +++++--
examples/qos_sched/profile_ov.cfg | 47 ++++-
examples/qos_sched/stats.c | 175 +++++++++++-------
7 files changed, 432 insertions(+), 256 deletions(-)
diff --git a/examples/qos_sched/app_thread.c b/examples/qos_sched/app_thread.c
index e14b275e3..25a8d42a0 100644
--- a/examples/qos_sched/app_thread.c
+++ b/examples/qos_sched/app_thread.c
@@ -20,13 +20,11 @@
* QoS parameters are encoded as follows:
* Outer VLAN ID defines subport
* Inner VLAN ID defines pipe
- * Destination IP 0.0.XXX.0 defines traffic class
* Destination IP host (0.0.0.XXX) defines queue
* Values below define offset to each field from start of frame
*/
#define SUBPORT_OFFSET 7
#define PIPE_OFFSET 9
-#define TC_OFFSET 20
#define QUEUE_OFFSET 20
#define COLOR_OFFSET 19
@@ -39,11 +37,10 @@ get_pkt_sched(struct rte_mbuf *m, uint32_t *subport,
uint32_t *pipe,
*subport = (rte_be_to_cpu_16(pdata[SUBPORT_OFFSET]) & 0x0FFF) &
(port_params.n_subports_per_port - 1); /* Outer VLAN
ID*/
*pipe = (rte_be_to_cpu_16(pdata[PIPE_OFFSET]) & 0x0FFF) &
- (port_params.n_pipes_per_subport - 1); /* Inner VLAN ID
*/
- *traffic_class = (pdata[QUEUE_OFFSET] & 0x0F) &
- (RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE - 1); /*
Destination IP */
- *queue = ((pdata[QUEUE_OFFSET] >> 8) & 0x0F) &
- (RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS - 1) ; /*
Destination IP */
+ (subport_params[*subport].n_subport_pipes - 1); /*
Inner VLAN ID */
+ *queue = active_queues[(pdata[QUEUE_OFFSET] >> 8) % n_active_queues];
+ *traffic_class = (*queue > (RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE - 1) ?
+ (RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE - 1) : *queue); /*
Destination IP */
*color = pdata[COLOR_OFFSET] & 0x03; /* Destination IP */
return 0;
diff --git a/examples/qos_sched/cfg_file.c b/examples/qos_sched/cfg_file.c
index 76ffffc4b..6d3674e53 100644
--- a/examples/qos_sched/cfg_file.c
+++ b/examples/qos_sched/cfg_file.c
@@ -24,7 +24,6 @@ int
cfg_load_port(struct rte_cfgfile *cfg, struct rte_sched_port_params
*port_params)
{
const char *entry;
- int j;
if (!cfg || !port_params)
return -1;
@@ -37,93 +36,6 @@ cfg_load_port(struct rte_cfgfile *cfg, struct
rte_sched_port_params *port_params
if (entry)
port_params->n_subports_per_port = (uint32_t)atoi(entry);
- entry = rte_cfgfile_get_entry(cfg, "port", "number of pipes per
subport");
- if (entry)
- port_params->n_pipes_per_subport = (uint32_t)atoi(entry);
-
- entry = rte_cfgfile_get_entry(cfg, "port", "queue sizes");
- if (entry) {
- char *next;
-
- for(j = 0; j < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; j++) {
- port_params->qsize[j] = (uint16_t)strtol(entry, &next,
10);
- if (next == NULL)
- break;
- entry = next;
- }
- }
-
-#ifdef RTE_SCHED_RED
- for (j = 0; j < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; j++) {
- char str[32];
-
- /* Parse WRED min thresholds */
- snprintf(str, sizeof(str), "tc %d wred min", j);
- entry = rte_cfgfile_get_entry(cfg, "red", str);
- if (entry) {
- char *next;
- int k;
- /* for each packet colour (green, yellow, red) */
- for (k = 0; k < RTE_COLORS; k++) {
- port_params->red_params[j][k].min_th
- = (uint16_t)strtol(entry, &next, 10);
- if (next == NULL)
- break;
- entry = next;
- }
- }
-
- /* Parse WRED max thresholds */
- snprintf(str, sizeof(str), "tc %d wred max", j);
- entry = rte_cfgfile_get_entry(cfg, "red", str);
- if (entry) {
- char *next;
- int k;
- /* for each packet colour (green, yellow, red) */
- for (k = 0; k < RTE_COLORS; k++) {
- port_params->red_params[j][k].max_th
- = (uint16_t)strtol(entry, &next, 10);
- if (next == NULL)
- break;
- entry = next;
- }
- }
-
- /* Parse WRED inverse mark probabilities */
- snprintf(str, sizeof(str), "tc %d wred inv prob", j);
- entry = rte_cfgfile_get_entry(cfg, "red", str);
- if (entry) {
- char *next;
- int k;
- /* for each packet colour (green, yellow, red) */
- for (k = 0; k < RTE_COLORS; k++) {
- port_params->red_params[j][k].maxp_inv
- = (uint8_t)strtol(entry, &next, 10);
-
- if (next == NULL)
- break;
- entry = next;
- }
- }
-
- /* Parse WRED EWMA filter weights */
- snprintf(str, sizeof(str), "tc %d wred weight", j);
- entry = rte_cfgfile_get_entry(cfg, "red", str);
- if (entry) {
- char *next;
- int k;
- /* for each packet colour (green, yellow, red) */
- for (k = 0; k < RTE_COLORS; k++) {
- port_params->red_params[j][k].wq_log2
- = (uint8_t)strtol(entry, &next, 10);
- if (next == NULL)
- break;
- entry = next;
- }
- }
- }
-#endif /* RTE_SCHED_RED */
-
return 0;
}
@@ -139,7 +51,7 @@ cfg_load_pipe(struct rte_cfgfile *cfg, struct
rte_sched_pipe_params *pipe_params
return -1;
profiles = rte_cfgfile_num_sections(cfg, "pipe profile", sizeof("pipe
profile") - 1);
- port_params.n_pipe_profiles = profiles;
+ subport_params[0].n_pipe_profiles = profiles;
for (j = 0; j < profiles; j++) {
char pipe_name[32];
@@ -173,46 +85,36 @@ cfg_load_pipe(struct rte_cfgfile *cfg, struct
rte_sched_pipe_params *pipe_params
if (entry)
pipe_params[j].tc_rate[3] = (uint32_t)atoi(entry);
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 4 rate");
+ if (entry)
+ pipe_params[j].tc_rate[4] = (uint32_t)atoi(entry);
+
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 5 rate");
+ if (entry)
+ pipe_params[j].tc_rate[5] = (uint32_t)atoi(entry);
+
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 6 rate");
+ if (entry)
+ pipe_params[j].tc_rate[6] = (uint32_t)atoi(entry);
+
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 7 rate");
+ if (entry)
+ pipe_params[j].tc_rate[7] = (uint32_t)atoi(entry);
+
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 8 rate");
+ if (entry)
+ pipe_params[j].tc_rate[8] = (uint32_t)atoi(entry);
+
#ifdef RTE_SCHED_SUBPORT_TC_OV
- entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 3
oversubscription weight");
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 8
oversubscription weight");
if (entry)
pipe_params[j].tc_ov_weight = (uint8_t)atoi(entry);
#endif
- entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 0 wrr
weights");
- if (entry) {
- for(i = 0; i < RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS; i++)
{
-
pipe_params[j].wrr_weights[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE*0 + i] =
- (uint8_t)strtol(entry, &next, 10);
- if (next == NULL)
- break;
- entry = next;
- }
- }
- entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 1 wrr
weights");
- if (entry) {
- for(i = 0; i < RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS; i++)
{
-
pipe_params[j].wrr_weights[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE*1 + i] =
- (uint8_t)strtol(entry, &next, 10);
- if (next == NULL)
- break;
- entry = next;
- }
- }
- entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 2 wrr
weights");
- if (entry) {
- for(i = 0; i < RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS; i++)
{
-
pipe_params[j].wrr_weights[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE*2 + i] =
- (uint8_t)strtol(entry, &next, 10);
- if (next == NULL)
- break;
- entry = next;
- }
- }
- entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 3 wrr
weights");
+ entry = rte_cfgfile_get_entry(cfg, pipe_name, "tc 8 wrr
weights");
if (entry) {
- for(i = 0; i < RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS; i++)
{
-
pipe_params[j].wrr_weights[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE*3 + i] =
+ for (i = 0; i < RTE_SCHED_WRR_QUEUES_PER_PIPE; i++) {
+ pipe_params[j].wrr_weights[i] =
(uint8_t)strtol(entry, &next, 10);
if (next == NULL)
break;
@@ -233,12 +135,111 @@ cfg_load_subport(struct rte_cfgfile *cfg, struct
rte_sched_subport_params *subpo
return -1;
memset(app_pipe_to_profile, -1, sizeof(app_pipe_to_profile));
+ memset(active_queues, 0, sizeof(active_queues));
+ n_active_queues = 0;
+
+#ifdef RTE_SCHED_RED
+ char sec_name[CFG_NAME_LEN];
+ snprintf(sec_name, sizeof(sec_name), "red");
+
+ if (rte_cfgfile_has_section(cfg, sec_name)) {
+ struct rte_red_params
red_params[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE][RTE_COLORS];
+
+ for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) {
+ char str[32];
+
+ /* Parse WRED min thresholds */
+ snprintf(str, sizeof(str), "tc %d wred min", i);
+ entry = rte_cfgfile_get_entry(cfg, sec_name, str);
+ if (entry) {
+ char *next;
+ /* for each packet colour (green, yellow, red)
*/
+ for (j = 0; j < RTE_COLORS; j++) {
+ red_params[i][j].min_th
+ = (uint16_t)strtol(entry,
&next, 10);
+ if (next == NULL)
+ break;
+ entry = next;
+ }
+ }
+
+ /* Parse WRED max thresholds */
+ snprintf(str, sizeof(str), "tc %d wred max", i);
+ entry = rte_cfgfile_get_entry(cfg, "red", str);
+ if (entry) {
+ char *next;
+ /* for each packet colour (green, yellow, red)
*/
+ for (j = 0; j < RTE_COLORS; j++) {
+ red_params[i][j].max_th
+ = (uint16_t)strtol(entry,
&next, 10);
+ if (next == NULL)
+ break;
+ entry = next;
+ }
+ }
+
+ /* Parse WRED inverse mark probabilities */
+ snprintf(str, sizeof(str), "tc %d wred inv prob", i);
+ entry = rte_cfgfile_get_entry(cfg, "red", str);
+ if (entry) {
+ char *next;
+ /* for each packet colour (green, yellow, red)
*/
+ for (j = 0; j < RTE_COLORS; j++) {
+ red_params[i][j].maxp_inv
+ = (uint8_t)strtol(entry, &next,
10);
+
+ if (next == NULL)
+ break;
+ entry = next;
+ }
+ }
+
+ /* Parse WRED EWMA filter weights */
+ snprintf(str, sizeof(str), "tc %d wred weight", i);
+ entry = rte_cfgfile_get_entry(cfg, "red", str);
+ if (entry) {
+ char *next;
+ /* for each packet colour (green, yellow, red)
*/
+ for (j = 0; j < RTE_COLORS; j++) {
+ red_params[i][j].wq_log2
+ = (uint8_t)strtol(entry, &next,
10);
+ if (next == NULL)
+ break;
+ entry = next;
+ }
+ }
+ }
+ }
+#endif /* RTE_SCHED_RED */
for (i = 0; i < MAX_SCHED_SUBPORTS; i++) {
char sec_name[CFG_NAME_LEN];
snprintf(sec_name, sizeof(sec_name), "subport %d", i);
if (rte_cfgfile_has_section(cfg, sec_name)) {
+ entry = rte_cfgfile_get_entry(cfg, sec_name,
+ "number of pipes per subport");
+ if (entry)
+ subport_params[i].n_subport_pipes =
(uint32_t)atoi(entry);
+
+ entry = rte_cfgfile_get_entry(cfg, sec_name, "queue
sizes");
+ if (entry) {
+ char *next;
+
+ for (j = 0; j < RTE_SCHED_QUEUES_PER_PIPE; j++)
{
+ subport_params[i].qsize[j] =
+ (uint16_t)strtol(entry, &next, 10);
+ if (subport_params[i].qsize[j] != 0) {
+ active_queues[n_active_queues] = j;
+ n_active_queues++;
+ }
+
+ if (next == NULL)
+ break;
+ entry = next;
+ }
+ }
+
entry = rte_cfgfile_get_entry(cfg, sec_name, "tb rate");
if (entry)
subport_params[i].tb_rate =
(uint32_t)atoi(entry);
@@ -267,6 +268,26 @@ cfg_load_subport(struct rte_cfgfile *cfg, struct
rte_sched_subport_params *subpo
if (entry)
subport_params[i].tc_rate[3] =
(uint32_t)atoi(entry);
+ entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 4
rate");
+ if (entry)
+ subport_params[i].tc_rate[4] =
(uint32_t)atoi(entry);
+
+ entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 5
rate");
+ if (entry)
+ subport_params[i].tc_rate[5] =
(uint32_t)atoi(entry);
+
+ entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 6
rate");
+ if (entry)
+ subport_params[i].tc_rate[6] =
(uint32_t)atoi(entry);
+
+ entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 7
rate");
+ if (entry)
+ subport_params[i].tc_rate[7] =
(uint32_t)atoi(entry);
+
+ entry = rte_cfgfile_get_entry(cfg, sec_name, "tc 8
rate");
+ if (entry)
+ subport_params[i].tc_rate[8] =
(uint32_t)atoi(entry);
+
int n_entries = rte_cfgfile_section_num_entries(cfg,
sec_name);
struct rte_cfgfile_entry entries[n_entries];
@@ -306,6 +327,21 @@ cfg_load_subport(struct rte_cfgfile *cfg, struct
rte_sched_subport_params *subpo
}
}
}
+
+#ifdef RTE_SCHED_RED
+ for (j = 0; j < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE;
j++) {
+ for (k = 0; k < RTE_COLORS; k++) {
+
subport_params[i].red_params[j][k].min_th =
+ red_params[j][k].min_th;
+
subport_params[i].red_params[j][k].max_th =
+ red_params[j][k].max_th;
+
subport_params[i].red_params[j][k].maxp_inv =
+ red_params[j][k].maxp_inv;
+
subport_params[i].red_params[j][k].wq_log2 =
+ red_params[j][k].wq_log2;
+ }
+ }
+#endif
}
}
diff --git a/examples/qos_sched/init.c b/examples/qos_sched/init.c
index f44a07cd6..fce90de24 100644
--- a/examples/qos_sched/init.c
+++ b/examples/qos_sched/init.c
@@ -165,22 +165,12 @@ app_init_port(uint16_t portid, struct rte_mempool *mp)
return 0;
}
-static struct rte_sched_subport_params subport_params[MAX_SCHED_SUBPORTS] = {
- {
- .tb_rate = 1250000000,
- .tb_size = 1000000,
-
- .tc_rate = {1250000000, 1250000000, 1250000000, 1250000000},
- .tc_period = 10,
- },
-};
-
-static struct rte_sched_pipe_params
pipe_profiles[RTE_SCHED_PIPE_PROFILES_PER_PORT] = {
+static struct rte_sched_pipe_params
pipe_profiles[RTE_SCHED_PIPE_PROFILES_PER_SUBPORT] = {
{ /* Profile #0 */
.tb_rate = 305175,
.tb_size = 1000000,
- .tc_rate = {305175, 305175, 305175, 305175},
+ .tc_rate = {305175, 305175, 305175, 305175, 305175, 305175,
305175, 305175, 305175},
.tc_period = 40,
#ifdef RTE_SCHED_SUBPORT_TC_OV
.tc_ov_weight = 1,
@@ -190,6 +180,69 @@ static struct rte_sched_pipe_params
pipe_profiles[RTE_SCHED_PIPE_PROFILES_PER_PO
},
};
+struct rte_sched_subport_params subport_params[MAX_SCHED_SUBPORTS] = {
+ {
+ .tb_rate = 1250000000,
+ .tb_size = 1000000,
+
+ .tc_rate = {1250000000, 1250000000, 1250000000, 1250000000,
1250000000, 1250000000, 1250000000, 1250000000, 1250000000},
+ .tc_period = 10,
+ .n_subport_pipes = 4096,
+ .qsize = {64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
64, 64, 64},
+ .pipe_profiles = pipe_profiles,
+ .n_pipe_profiles = sizeof(pipe_profiles) / sizeof(struct
rte_sched_pipe_params),
+
+#ifdef RTE_SCHED_RED
+ .red_params = {
+ /* Traffic Class 0 Colors Green / Yellow / Red */
+ [0][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [0][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [0][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+
+ /* Traffic Class 1 - Colors Green / Yellow / Red */
+ [1][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [1][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [1][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+
+ /* Traffic Class 2 - Colors Green / Yellow / Red */
+ [2][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [2][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [2][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+
+ /* Traffic Class 3 - Colors Green / Yellow / Red */
+ [3][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [3][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [3][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9}
+
+ /* Traffic Class 4 - Colors Green / Yellow / Red */
+ [4][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [4][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [4][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9}
+
+ /* Traffic Class 5 - Colors Green / Yellow / Red */
+ [5][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [5][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [5][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9}
+
+ /* Traffic Class 6 - Colors Green / Yellow / Red */
+ [6][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [6][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [6][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9}
+
+ /* Traffic Class 7 - Colors Green / Yellow / Red */
+ [7][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [7][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [7][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9}
+
+ /* Traffic Class 8 - Colors Green / Yellow / Red */
+ [8][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [8][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9},
+ [8][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10,
.wq_log2 = 9}
+ },
+#endif /* RTE_SCHED_RED */
+ },
+};
+
struct rte_sched_port_params port_params = {
.name = "port_scheduler_0",
.socket = 0, /* computed */
@@ -197,34 +250,6 @@ struct rte_sched_port_params port_params = {
.mtu = 6 + 6 + 4 + 4 + 2 + 1500,
.frame_overhead = RTE_SCHED_FRAME_OVERHEAD_DEFAULT,
.n_subports_per_port = 1,
- .n_pipes_per_subport = 4096,
- .qsize = {64, 64, 64, 64},
- .pipe_profiles = pipe_profiles,
- .n_pipe_profiles = sizeof(pipe_profiles) / sizeof(struct
rte_sched_pipe_params),
-
-#ifdef RTE_SCHED_RED
- .red_params = {
- /* Traffic Class 0 Colors Green / Yellow / Red */
- [0][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2
= 9},
- [0][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2
= 9},
- [0][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2
= 9},
-
- /* Traffic Class 1 - Colors Green / Yellow / Red */
- [1][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2
= 9},
- [1][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2
= 9},
- [1][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2
= 9},
-
- /* Traffic Class 2 - Colors Green / Yellow / Red */
- [2][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2
= 9},
- [2][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2
= 9},
- [2][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2
= 9},
-
- /* Traffic Class 3 - Colors Green / Yellow / Red */
- [3][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2
= 9},
- [3][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2
= 9},
- [3][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2
= 9}
- }
-#endif /* RTE_SCHED_RED */
};
static struct rte_sched_port *
@@ -255,7 +280,8 @@ app_init_sched_port(uint32_t portid, uint32_t socketid)
subport, err);
}
- for (pipe = 0; pipe < port_params.n_pipes_per_subport; pipe ++)
{
+ uint32_t n_subport_pipes =
subport_params[subport].n_subport_pipes;
+ for (pipe = 0; pipe < n_subport_pipes; pipe++) {
if (app_pipe_to_profile[subport][pipe] != -1) {
err = rte_sched_pipe_config(port, subport, pipe,
app_pipe_to_profile[subport][pipe]);
diff --git a/examples/qos_sched/main.h b/examples/qos_sched/main.h
index 8a2741c58..22a9bcb57 100644
--- a/examples/qos_sched/main.h
+++ b/examples/qos_sched/main.h
@@ -26,7 +26,7 @@ extern "C" {
#define MAX_PKT_RX_BURST 64
#define PKT_ENQUEUE 64
-#define PKT_DEQUEUE 32
+#define PKT_DEQUEUE 60
#define MAX_PKT_TX_BURST 64
#define RX_PTHRESH 8 /**< Default values of RX prefetch threshold reg. */
@@ -147,7 +147,11 @@ extern struct burst_conf burst_conf;
extern struct ring_thresh rx_thresh;
extern struct ring_thresh tx_thresh;
+uint32_t active_queues[RTE_SCHED_QUEUES_PER_PIPE];
+uint32_t n_active_queues;
+
extern struct rte_sched_port_params port_params;
+extern struct rte_sched_subport_params subport_params[MAX_SCHED_SUBPORTS];
int app_parse_args(int argc, char **argv);
int app_init(void);
diff --git a/examples/qos_sched/profile.cfg b/examples/qos_sched/profile.cfg
index f5b704cc6..02fd8a00e 100644
--- a/examples/qos_sched/profile.cfg
+++ b/examples/qos_sched/profile.cfg
@@ -1,6 +1,6 @@
; BSD LICENSE
;
-; Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+; Copyright(c) 2010-2019 Intel Corporation. All rights reserved.
; All rights reserved.
;
; Redistribution and use in source and binary forms, with or without
@@ -33,12 +33,12 @@
; 10GbE output port:
; * Single subport (subport 0):
; - Subport rate set to 100% of port rate
-; - Each of the 4 traffic classes has rate set to 100% of port
rate
+; - Each of the 9 traffic classes has rate set to 100% of port
rate
; * 4K pipes per subport 0 (pipes 0 .. 4095) with identical configuration:
; - Pipe rate set to 1/4K of port rate
-; - Each of the 4 traffic classes has rate set to 100% of pipe
rate
-; - Within each traffic class, the byte-level WRR weights for the
4 queues
-; are set to 1:1:1:1
+; - Each of the 9 traffic classes has rate set to 100% of pipe
rate
+; - Within lowest priority traffic class (best-effort), the
byte-level
+; WRR weights for the 8 queues are set to 1:1:1:1:1:1:1:1
;
; For more details, please refer to chapter "Quality of Service (QoS)
Framework"
; of Data Plane Development Kit (DPDK) Programmer's Guide.
@@ -47,11 +47,12 @@
[port]
frame overhead = 24
number of subports per port = 1
-number of pipes per subport = 4096
-queue sizes = 64 64 64 64
; Subport configuration
[subport 0]
+number of pipes per subport = 4096
+queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64
+
tb rate = 1250000000 ; Bytes per second
tb size = 1000000 ; Bytes
@@ -59,6 +60,11 @@ tc 0 rate = 1250000000 ; Bytes per second
tc 1 rate = 1250000000 ; Bytes per second
tc 2 rate = 1250000000 ; Bytes per second
tc 3 rate = 1250000000 ; Bytes per second
+tc 4 rate = 1250000000 ; Bytes per second
+tc 5 rate = 1250000000 ; Bytes per second
+tc 6 rate = 1250000000 ; Bytes per second
+tc 7 rate = 1250000000 ; Bytes per second
+tc 8 rate = 1250000000 ; Bytes per second
tc period = 10 ; Milliseconds
pipe 0-4095 = 0 ; These pipes are configured with pipe profile 0
@@ -72,14 +78,16 @@ tc 0 rate = 305175 ; Bytes per second
tc 1 rate = 305175 ; Bytes per second
tc 2 rate = 305175 ; Bytes per second
tc 3 rate = 305175 ; Bytes per second
-tc period = 40 ; Milliseconds
+tc 4 rate = 305175 ; Bytes per second
+tc 5 rate = 305175 ; Bytes per second
+tc 6 rate = 305175 ; Bytes per second
+tc 7 rate = 305175 ; Bytes per second
+tc 8 rate = 305175 ; Bytes per second
+tc period = 160 ; Milliseconds
-tc 3 oversubscription weight = 1
+tc 8 oversubscription weight = 1
-tc 0 wrr weights = 1 1 1 1
-tc 1 wrr weights = 1 1 1 1
-tc 2 wrr weights = 1 1 1 1
-tc 3 wrr weights = 1 1 1 1
+tc 8 wrr weights = 1 1 1 1 1 1 1 1
; RED params per traffic class and color (Green / Yellow / Red)
[red]
@@ -102,3 +110,28 @@ tc 3 wred min = 48 40 32
tc 3 wred max = 64 64 64
tc 3 wred inv prob = 10 10 10
tc 3 wred weight = 9 9 9
+
+tc 4 wred min = 48 40 32
+tc 4 wred max = 64 64 64
+tc 4 wred inv prob = 10 10 10
+tc 4 wred weight = 9 9 9
+
+tc 5 wred min = 48 40 32
+tc 5 wred max = 64 64 64
+tc 5 wred inv prob = 10 10 10
+tc 5 wred weight = 9 9 9
+
+tc 6 wred min = 48 40 32
+tc 6 wred max = 64 64 64
+tc 6 wred inv prob = 10 10 10
+tc 6 wred weight = 9 9 9
+
+tc 7 wred min = 48 40 32
+tc 7 wred max = 64 64 64
+tc 7 wred inv prob = 10 10 10
+tc 7 wred weight = 9 9 9
+
+tc 8 wred min = 48 40 32
+tc 8 wred max = 64 64 64
+tc 8 wred inv prob = 10 10 10
+tc 8 wred weight = 9 9 9
diff --git a/examples/qos_sched/profile_ov.cfg
b/examples/qos_sched/profile_ov.cfg
index 33000df9e..450001d2b 100644
--- a/examples/qos_sched/profile_ov.cfg
+++ b/examples/qos_sched/profile_ov.cfg
@@ -1,6 +1,6 @@
; BSD LICENSE
;
-; Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+; Copyright(c) 2010-2019 Intel Corporation. All rights reserved.
; All rights reserved.
;
; Redistribution and use in source and binary forms, with or without
@@ -33,11 +33,12 @@
[port]
frame overhead = 24
number of subports per port = 1
-number of pipes per subport = 32
-queue sizes = 64 64 64 64
; Subport configuration
[subport 0]
+number of pipes per subport = 32
+queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64 64
+
tb rate = 8400000 ; Bytes per second
tb size = 100000 ; Bytes
@@ -45,6 +46,11 @@ tc 0 rate = 8400000 ; Bytes per second
tc 1 rate = 8400000 ; Bytes per second
tc 2 rate = 8400000 ; Bytes per second
tc 3 rate = 8400000 ; Bytes per second
+tc 4 rate = 8400000 ; Bytes per second
+tc 5 rate = 8400000 ; Bytes per second
+tc 6 rate = 8400000 ; Bytes per second
+tc 7 rate = 8400000 ; Bytes per second
+tc 8 rate = 8400000 ; Bytes per second
tc period = 10 ; Milliseconds
pipe 0-31 = 0 ; These pipes are configured with pipe profile 0
@@ -58,14 +64,16 @@ tc 0 rate = 16800000 ; Bytes per second
tc 1 rate = 16800000 ; Bytes per second
tc 2 rate = 16800000 ; Bytes per second
tc 3 rate = 16800000 ; Bytes per second
+tc 4 rate = 16800000 ; Bytes per second
+tc 5 rate = 16800000 ; Bytes per second
+tc 6 rate = 16800000 ; Bytes per second
+tc 7 rate = 16800000 ; Bytes per second
+tc 8 rate = 16800000 ; Bytes per second
tc period = 28 ; Milliseconds
tc 3 oversubscription weight = 1
-tc 0 wrr weights = 1 1 1 1
-tc 1 wrr weights = 1 1 1 1
-tc 2 wrr weights = 1 1 1 1
-tc 3 wrr weights = 1 1 1 1
+tc 8 wrr weights = 1 1 1 1 1 1 1 1
; RED params per traffic class and color (Green / Yellow / Red)
[red]
@@ -88,3 +96,28 @@ tc 3 wred min = 48 40 32
tc 3 wred max = 64 64 64
tc 3 wred inv prob = 10 10 10
tc 3 wred weight = 9 9 9
+
+tc 4 wred min = 48 40 32
+tc 4 wred max = 64 64 64
+tc 4 wred inv prob = 10 10 10
+tc 4 wred weight = 9 9 9
+
+tc 5 wred min = 48 40 32
+tc 5 wred max = 64 64 64
+tc 5 wred inv prob = 10 10 10
+tc 5 wred weight = 9 9 9
+
+tc 6 wred min = 48 40 32
+tc 6 wred max = 64 64 64
+tc 6 wred inv prob = 10 10 10
+tc 6 wred weight = 9 9 9
+
+tc 7 wred min = 48 40 32
+tc 7 wred max = 64 64 64
+tc 7 wred inv prob = 10 10 10
+tc 7 wred weight = 9 9 9
+
+tc 8 wred min = 48 40 32
+tc 8 wred max = 64 64 64
+tc 8 wred inv prob = 10 10 10
+tc 8 wred weight = 9 9 9
diff --git a/examples/qos_sched/stats.c b/examples/qos_sched/stats.c
index 8193d964c..d5e6e65b0 100644
--- a/examples/qos_sched/stats.c
+++ b/examples/qos_sched/stats.c
@@ -14,24 +14,30 @@ qavg_q(uint16_t port_id, uint32_t subport_id, uint32_t
pipe_id, uint8_t tc,
struct rte_sched_queue_stats stats;
struct rte_sched_port *port;
uint16_t qlen;
- uint32_t queue_id, count, i;
+ uint32_t count, i, queue_id = 0;
uint32_t average;
for (i = 0; i < nb_pfc; i++) {
if (qos_conf[i].tx_port == port_id)
break;
}
- if (i == nb_pfc || subport_id >= port_params.n_subports_per_port ||
pipe_id >= port_params.n_pipes_per_subport
- || tc >= RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE || q >=
RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS)
- return -1;
+ if (i == nb_pfc || subport_id >= port_params.n_subports_per_port ||
+ pipe_id >= subport_params[subport_id].n_subport_pipes ||
+ tc >= RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE ||
+ q >= RTE_SCHED_WRR_QUEUES_PER_PIPE ||
+ (tc < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE - 1 && q > 0))
+ return -1;
port = qos_conf[i].sched_port;
-
- queue_id = RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE *
RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS * (subport_id *
port_params.n_pipes_per_subport + pipe_id);
- queue_id = queue_id + (tc * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + q);
+ for (i = 0; i < subport_id; i++)
+ queue_id += subport_params[i].n_subport_pipes *
+ RTE_SCHED_QUEUES_PER_PIPE;
+ if (tc < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE - 1)
+ queue_id += pipe_id * RTE_SCHED_QUEUES_PER_PIPE + tc;
+ else
+ queue_id += pipe_id * RTE_SCHED_QUEUES_PER_PIPE + tc + q;
average = 0;
-
for (count = 0; count < qavg_ntimes; count++) {
rte_sched_queue_read_stats(port, queue_id, &stats, &qlen);
average += qlen;
@@ -52,32 +58,42 @@ qavg_tcpipe(uint16_t port_id, uint32_t subport_id, uint32_t
pipe_id,
struct rte_sched_queue_stats stats;
struct rte_sched_port *port;
uint16_t qlen;
- uint32_t queue_id, count, i;
+ uint32_t count, i, queue_id = 0;
uint32_t average, part_average;
for (i = 0; i < nb_pfc; i++) {
if (qos_conf[i].tx_port == port_id)
break;
}
- if (i == nb_pfc || subport_id >= port_params.n_subports_per_port ||
pipe_id >= port_params.n_pipes_per_subport
- || tc >= RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE)
- return -1;
+ if (i == nb_pfc || subport_id >= port_params.n_subports_per_port ||
+ pipe_id >= subport_params[subport_id].n_subport_pipes ||
+ tc >= RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE)
+ return -1;
port = qos_conf[i].sched_port;
- queue_id = RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE *
RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS * (subport_id *
port_params.n_pipes_per_subport + pipe_id);
+ for (i = 0; i < subport_id; i++)
+ queue_id += subport_params[i].n_subport_pipes *
RTE_SCHED_QUEUES_PER_PIPE;
+
+ queue_id += pipe_id * RTE_SCHED_QUEUES_PER_PIPE + tc;
average = 0;
for (count = 0; count < qavg_ntimes; count++) {
part_average = 0;
- for (i = 0; i < RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS; i++) {
- rte_sched_queue_read_stats(port, queue_id + (tc *
RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + i), &stats, &qlen);
- part_average += qlen;
- }
- average += part_average / RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS;
- usleep(qavg_period);
- }
+
+ if (tc < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE - 1) {
+ rte_sched_queue_read_stats(port, queue_id, &stats,
&qlen);
+ part_average += qlen;
+ } else {
+ for (i = 0; i < RTE_SCHED_WRR_QUEUES_PER_PIPE; i++) {
+ rte_sched_queue_read_stats(port, queue_id + i,
&stats, &qlen);
+ part_average += qlen;
+ }
+ average += part_average / RTE_SCHED_WRR_QUEUES_PER_PIPE;
+ }
+ usleep(qavg_period);
+ }
average /= qavg_ntimes;
@@ -92,30 +108,36 @@ qavg_pipe(uint16_t port_id, uint32_t subport_id, uint32_t
pipe_id)
struct rte_sched_queue_stats stats;
struct rte_sched_port *port;
uint16_t qlen;
- uint32_t queue_id, count, i;
+ uint32_t count, i, queue_id = 0;
uint32_t average, part_average;
for (i = 0; i < nb_pfc; i++) {
if (qos_conf[i].tx_port == port_id)
break;
}
- if (i == nb_pfc || subport_id >= port_params.n_subports_per_port ||
pipe_id >= port_params.n_pipes_per_subport)
- return -1;
+ if (i == nb_pfc ||
+ subport_id >= port_params.n_subports_per_port ||
+ pipe_id >= subport_params[subport_id].n_subport_pipes)
+ return -1;
port = qos_conf[i].sched_port;
- queue_id = RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE *
RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS * (subport_id *
port_params.n_pipes_per_subport + pipe_id);
+ for (i = 0; i < subport_id; i++)
+ queue_id += subport_params[i].n_subport_pipes *
+ RTE_SCHED_QUEUES_PER_PIPE;
+
+ queue_id += pipe_id * RTE_SCHED_QUEUES_PER_PIPE;
average = 0;
for (count = 0; count < qavg_ntimes; count++) {
- part_average = 0;
- for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE *
RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS; i++) {
- rte_sched_queue_read_stats(port, queue_id + i, &stats,
&qlen);
- part_average += qlen;
- }
- average += part_average / (RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE
* RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS);
- usleep(qavg_period);
+ part_average = 0;
+ for (i = 0; i < RTE_SCHED_QUEUES_PER_PIPE; i++) {
+ rte_sched_queue_read_stats(port, queue_id + i, &stats,
&qlen);
+ part_average += qlen;
+ }
+ average += part_average / RTE_SCHED_QUEUES_PER_PIPE;
+ usleep(qavg_period);
}
average /= qavg_ntimes;
@@ -131,32 +153,47 @@ qavg_tcsubport(uint16_t port_id, uint32_t subport_id,
uint8_t tc)
struct rte_sched_queue_stats stats;
struct rte_sched_port *port;
uint16_t qlen;
- uint32_t queue_id, count, i, j;
+ uint32_t queue_id, count, i, j, subport_queue_id = 0;
uint32_t average, part_average;
for (i = 0; i < nb_pfc; i++) {
if (qos_conf[i].tx_port == port_id)
break;
}
- if (i == nb_pfc || subport_id >= port_params.n_subports_per_port || tc
>= RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE)
- return -1;
+ if (i == nb_pfc ||
+ subport_id >= port_params.n_subports_per_port ||
+ tc >= RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE)
+ return -1;
port = qos_conf[i].sched_port;
+ for (i = 0; i < subport_id; i++)
+ subport_queue_id += subport_params[i].n_subport_pipes *
RTE_SCHED_QUEUES_PER_PIPE;
+
average = 0;
for (count = 0; count < qavg_ntimes; count++) {
part_average = 0;
- for (i = 0; i < port_params.n_pipes_per_subport; i++) {
- queue_id = RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE *
RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS * (subport_id *
port_params.n_pipes_per_subport + i);
+ for (i = 0; i < subport_params[subport_id].n_subport_pipes;
i++) {
+ if (tc < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE - 1) {
+ queue_id = subport_queue_id + i *
RTE_SCHED_QUEUES_PER_PIPE + tc;
+ rte_sched_queue_read_stats(port, queue_id,
&stats, &qlen);
+ part_average += qlen;
+ } else {
+ for (j = 0; j < RTE_SCHED_WRR_QUEUES_PER_PIPE;
j++) {
+ queue_id = subport_queue_id +
+ i *
RTE_SCHED_QUEUES_PER_PIPE + tc + j;
+ rte_sched_queue_read_stats(port,
queue_id, &stats, &qlen);
+ part_average += qlen;
+ }
+ }
+ }
+
+ if (tc < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE - 1)
+ average += part_average /
(subport_params[subport_id].n_subport_pipes);
+ else
+ average += part_average /
(subport_params[subport_id].n_subport_pipes) * RTE_SCHED_WRR_QUEUES_PER_PIPE;
- for (j = 0; j < RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS;
j++) {
- rte_sched_queue_read_stats(port, queue_id +
(tc * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + j), &stats, &qlen);
- part_average += qlen;
- }
- }
-
- average += part_average / (port_params.n_pipes_per_subport *
RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS);
usleep(qavg_period);
}
@@ -173,32 +210,36 @@ qavg_subport(uint16_t port_id, uint32_t subport_id)
struct rte_sched_queue_stats stats;
struct rte_sched_port *port;
uint16_t qlen;
- uint32_t queue_id, count, i, j;
+ uint32_t queue_id, count, i, j, subport_queue_id = 0;
uint32_t average, part_average;
for (i = 0; i < nb_pfc; i++) {
if (qos_conf[i].tx_port == port_id)
break;
}
- if (i == nb_pfc || subport_id >= port_params.n_subports_per_port)
- return -1;
+ if (i == nb_pfc ||
+ subport_id >= port_params.n_subports_per_port)
+ return -1;
port = qos_conf[i].sched_port;
+ for (i = 0; i < subport_id; i++)
+ subport_queue_id += subport_params[i].n_subport_pipes *
RTE_SCHED_QUEUES_PER_PIPE;
+
average = 0;
for (count = 0; count < qavg_ntimes; count++) {
part_average = 0;
- for (i = 0; i < port_params.n_pipes_per_subport; i++) {
- queue_id = RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE *
RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS * (subport_id *
port_params.n_pipes_per_subport + i);
+ for (i = 0; i < subport_params[subport_id].n_subport_pipes;
i++) {
+ queue_id = subport_queue_id + i *
RTE_SCHED_QUEUES_PER_PIPE;
- for (j = 0; j < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE *
RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS; j++) {
+ for (j = 0; j < RTE_SCHED_QUEUES_PER_PIPE; j++) {
rte_sched_queue_read_stats(port, queue_id + j,
&stats, &qlen);
part_average += qlen;
}
}
- average += part_average / (port_params.n_pipes_per_subport *
RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE * RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS);
+ average += part_average /
(subport_params[subport_id].n_subport_pipes * RTE_SCHED_QUEUES_PER_PIPE);
usleep(qavg_period);
}
@@ -252,35 +293,41 @@ pipe_stat(uint16_t port_id, uint32_t subport_id, uint32_t
pipe_id)
struct rte_sched_port *port;
uint16_t qlen;
uint8_t i, j;
- uint32_t queue_id;
+ uint32_t queue_id = 0;
for (i = 0; i < nb_pfc; i++) {
if (qos_conf[i].tx_port == port_id)
break;
}
- if (i == nb_pfc || subport_id >= port_params.n_subports_per_port ||
pipe_id >= port_params.n_pipes_per_subport)
+ if (i == nb_pfc ||
+ subport_id >= port_params.n_subports_per_port ||
+ pipe_id >= subport_params[subport_id].n_subport_pipes)
return -1;
port = qos_conf[i].sched_port;
-
- queue_id = RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE *
RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS * (subport_id *
port_params.n_pipes_per_subport + pipe_id);
+ for (i = 0; i < subport_id; i++)
+ queue_id += subport_params[i].n_subport_pipes *
RTE_SCHED_QUEUES_PER_PIPE;
+ queue_id += pipe_id * RTE_SCHED_QUEUES_PER_PIPE;
printf("\n");
printf("+----+-------+-------------+-------------+-------------+-------------+-------------+\n");
printf("| TC | Queue | Pkts OK |Pkts Dropped | Bytes OK |Bytes
Dropped| Length |\n");
printf("+----+-------+-------------+-------------+-------------+-------------+-------------+\n");
- for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) {
- for (j = 0; j < RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS; j++) {
-
- rte_sched_queue_read_stats(port, queue_id + (i *
RTE_SCHED_QUEUES_PER_TRAFFIC_CLASS + j), &stats, &qlen);
-
- printf("| %d | %d | %11" PRIu32 " | %11" PRIu32 "
| %11" PRIu32 " | %11" PRIu32 " | %11i |\n", i, j,
- stats.n_pkts, stats.n_pkts_dropped,
stats.n_bytes, stats.n_bytes_dropped, qlen);
-
printf("+----+-------+-------------+-------------+-------------+-------------+-------------+\n");
+ for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) {
+ if (i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE - 1) {
+ rte_sched_queue_read_stats(port, queue_id + i, &stats,
&qlen);
+ printf("| %d | %d | %11" PRIu32 " | %11" PRIu32 "
| %11" PRIu32 " | %11" PRIu32 " | %11i |\n", i, j,
+ stats.n_pkts, stats.n_pkts_dropped,
stats.n_bytes, stats.n_bytes_dropped, qlen);
+
printf("+----+-------+-------------+-------------+-------------+-------------+-------------+\n");
+ } else {
+ for (j = 0; j < RTE_SCHED_WRR_QUEUES_PER_PIPE; j++) {
+ rte_sched_queue_read_stats(port, queue_id + i +
j, &stats, &qlen);
+ printf("| %d | %d | %11" PRIu32 " | %11"
PRIu32 " | %11" PRIu32 " | %11" PRIu32 " | %11i |\n", i, j,
+ stats.n_pkts, stats.n_pkts_dropped,
stats.n_bytes, stats.n_bytes_dropped, qlen);
+
printf("+----+-------+-------------+-------------+-------------+-------------+-------------+\n");
+ }
}
- if (i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE - 1)
-
printf("+----+-------+-------------+-------------+-------------+-------------+-------------+\n");
}
printf("\n");
--
2.20.1
