FM10K/dpdk-fm10k
FM10K/dpdk-fm10k
1
0
Fork 0
Code Issues Pull requests Releases Activity

examples/ip_pipeline: add config flexibility to TM

Browse source 
Update ip pipeline sample app for configuration flexiblity of
pipe traffic classes and queues.

Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Signed-off-by: Abraham Tovar <abrahamx.tovar@intel.com>
Signed-off-by: Lukasz Krakowiak <lukaszx.krakowiak@intel.com>
This commit is contained in:
Jasvinder Singh 2019-07-22 12:01:46 +01:00 committed by Thomas Monjalon
parent 0569926caa
commit 3f2eaa4ce9
4 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
examples/ip_pipeline/cli.c
View file

@ -377,7 +377,9 @@ cmd_swq(char **tokens,
static const char cmd_tmgr_subport_profile_help[] =
"tmgr subport profile\n"
" <tb_rate> <tb_size>\n"
" <tc0_rate> <tc1_rate> <tc2_rate> <tc3_rate>\n"
" <tc0_rate> <tc1_rate> <tc2_rate> <tc3_rate> <tc4_rate>"
" <tc5_rate> <tc6_rate> <tc7_rate> <tc8_rate>"
" <tc9_rate> <tc10_rate> <tc11_rate> <tc12_rate>\n"
" <tc_period>\n";
static void
@ -389,7 +391,7 @@ cmd_tmgr_subport_profile(char **tokens,
struct rte_sched_subport_params p;
int status, i;
if (n_tokens != 10) {
if (n_tokens != 19) {
snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
return;
}
@ -410,7 +412,7 @@ cmd_tmgr_subport_profile(char **tokens,
return;
}
if (parser_read_uint32(&p.tc_period, tokens[9]) != 0) {
if (parser_read_uint32(&p.tc_period, tokens[18]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "tc_period");
return;
}
@ -425,10 +427,12 @@ cmd_tmgr_subport_profile(char **tokens,
static const char cmd_tmgr_pipe_profile_help[] =
"tmgr pipe profile\n"
" <tb_rate> <tb_size>\n"
" <tc0_rate> <tc1_rate> <tc2_rate> <tc3_rate>\n"
" <tc0_rate> <tc1_rate> <tc2_rate> <tc3_rate> <tc4_rate>"
" <tc5_rate> <tc6_rate> <tc7_rate> <tc8_rate>"
" <tc9_rate> <tc10_rate> <tc11_rate> <tc12_rate>\n"
" <tc_period>\n"
" <tc_ov_weight>\n"
" <wrr_weight0..15>\n";
" <wrr_weight0..3>\n";
static void
cmd_tmgr_pipe_profile(char **tokens,
@ -439,7 +443,7 @@ cmd_tmgr_pipe_profile(char **tokens,
struct rte_sched_pipe_params p;
int status, i;
if (n_tokens != 27) {
if (n_tokens != 24) {
snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
return;
}
@ -460,20 +464,20 @@ cmd_tmgr_pipe_profile(char **tokens,
return;
}
if (parser_read_uint32(&p.tc_period, tokens[9]) != 0) {
if (parser_read_uint32(&p.tc_period, tokens[18]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "tc_period");
return;
}
#ifdef RTE_SCHED_SUBPORT_TC_OV
if (parser_read_uint8(&p.tc_ov_weight, tokens[10]) != 0) {
if (parser_read_uint8(&p.tc_ov_weight, tokens[19]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "tc_ov_weight");
return;
}
#endif
for (i = 0; i < RTE_SCHED_QUEUES_PER_PIPE; i++)
if (parser_read_uint8(&p.wrr_weights[i], tokens[11 + i]) != 0) {
for (i = 0; i < RTE_SCHED_BE_QUEUES_PER_PIPE; i++)
if (parser_read_uint8(&p.wrr_weights[i], tokens[20 + i]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "wrr_weights");
return;
}
@ -490,7 +494,10 @@ static const char cmd_tmgr_help[] =
" rate <rate>\n"
" spp <n_subports_per_port>\n"
" pps <n_pipes_per_subport>\n"
" qsize <qsize_tc0> <qsize_tc1> <qsize_tc2> <qsize_tc3>\n"
" qsize <qsize_tc0> <qsize_tc1> <qsize_tc2>"
" <qsize_tc3> <qsize_tc4> <qsize_tc5> <qsize_tc6>"
" <qsize_tc7> <qsize_tc8> <qsize_tc9> <qsize_tc10>"
" <qsize_tc11> <qsize_tc12>\n"
" fo <frame_overhead>\n"
" mtu <mtu>\n"
" cpu <cpu_id>\n";
@ -506,7 +513,7 @@ cmd_tmgr(char **tokens,
struct tmgr_port *tmgr_port;
int i;
if (n_tokens != 19) {
if (n_tokens != 28) {
snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
return;
}
@ -554,32 +561,32 @@ cmd_tmgr(char **tokens,
return;
}
if (strcmp(tokens[13], "fo") != 0) {
if (strcmp(tokens[22], "fo") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "fo");
return;
}
if (parser_read_uint32(&p.frame_overhead, tokens[14]) != 0) {
if (parser_read_uint32(&p.frame_overhead, tokens[23]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "frame_overhead");
return;
}
if (strcmp(tokens[15], "mtu") != 0) {
if (strcmp(tokens[24], "mtu") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "mtu");
return;
}
if (parser_read_uint32(&p.mtu, tokens[16]) != 0) {
if (parser_read_uint32(&p.mtu, tokens[25]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "mtu");
return;
}
if (strcmp(tokens[17], "cpu") != 0) {
if (strcmp(tokens[26], "cpu") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "cpu");
return;
}
if (parser_read_uint32(&p.cpu_id, tokens[18]) != 0) {
if (parser_read_uint32(&p.cpu_id, tokens[27]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "cpu_id");
return;
}

4
examples/ip_pipeline/tmgr.h
View file

@ -39,11 +39,11 @@ tmgr_port_find(const char *name);
struct tmgr_port_params {
uint32_t rate;
uint32_t n_subports_per_port;
uint32_t n_pipes_per_subport;
uint16_t qsize[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];
uint32_t frame_overhead;
uint32_t mtu;
uint32_t cpu_id;
uint32_t n_pipes_per_subport;
uint16_t qsize[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE];
};
int

1
lib/librte_pipeline/rte_table_action.c
View file

@ -401,7 +401,6 @@ pkt_work_tm(struct rte_mbuf *mbuf,
{
struct dscp_table_entry_data *dscp_entry = &dscp_table->entry[dscp];
uint32_t queue_id = data->queue_id |
(dscp_entry->tc << 2) |
dscp_entry->tc_queue;
rte_mbuf_sched_set(mbuf, queue_id, dscp_entry->tc,
(uint8_t)dscp_entry->color);

4
lib/librte_pipeline/rte_table_action.h
View file

@ -181,10 +181,10 @@ struct rte_table_action_lb_params {
* RTE_TABLE_ACTION_MTR
*/
/** Max number of traffic classes (TCs). */
#define RTE_TABLE_ACTION_TC_MAX 4
#define RTE_TABLE_ACTION_TC_MAX 16
/** Max number of queues per traffic class. */
#define RTE_TABLE_ACTION_TC_QUEUE_MAX 4
#define RTE_TABLE_ACTION_TC_QUEUE_MAX 16
/** Differentiated Services Code Point (DSCP) translation table entry. */
struct rte_table_action_dscp_table_entry {