d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

examples/ip_pipeline: add DSCP table update command

Browse Source 
Add command to update the dscp table for traffic meter and traffic
manager.

Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
This commit is contained in:
Jasvinder Singh 2018-03-29 19:32:00 +01:00 committed by Cristian Dumitrescu
parent e92058d604
commit 2b82ef4861
3 changed files with 238 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
examples/ip_pipeline/cli.c
View File

@ -4031,6 +4031,152 @@ cmd_pipeline_table_rule_meter_read(char **tokens,
snprintf(out, out_size, MSG_CMD_UNIMPLEM, tokens[0]);
}
/**
* pipeline <pipeline_name> table <table_id> dscp <file_name>
*
* File <file_name>:
* - exactly 64 lines
* - line format: <tc_id> <tc_queue_id> <color>, with <color> as: g | y | r
*/
static int
load_dscp_table(struct rte_table_action_dscp_table *dscp_table,
const char *file_name,
uint32_t *line_number)
{
FILE *f = NULL;
uint32_t dscp, l;
/* Check input arguments */
if ((dscp_table == NULL) ||
(file_name == NULL) ||
(line_number == NULL)) {
if (line_number)
*line_number = 0;
return -EINVAL;
}
/* Open input file */
f = fopen(file_name, "r");
if (f == NULL) {
*line_number = 0;
return -EINVAL;
}
/* Read file */
for (dscp = 0, l = 1; ; l++) {
char line[64];
char *tokens[3];
enum rte_meter_color color;
uint32_t tc_id, tc_queue_id, n_tokens = RTE_DIM(tokens);
if (fgets(line, sizeof(line), f) == NULL)
break;
if (is_comment(line))
continue;
if (parse_tokenize_string(line, tokens, &n_tokens)) {
*line_number = l;
return -EINVAL;
}
if (n_tokens == 0)
continue;
if ((dscp >= RTE_DIM(dscp_table->entry)) ||
(n_tokens != RTE_DIM(tokens)) ||
parser_read_uint32(&tc_id, tokens[0]) ||
(tc_id >= RTE_TABLE_ACTION_TC_MAX) ||
parser_read_uint32(&tc_queue_id, tokens[1]) ||
(tc_queue_id >= RTE_TABLE_ACTION_TC_QUEUE_MAX) ||
(strlen(tokens[2]) != 1)) {
*line_number = l;
return -EINVAL;
}
switch (tokens[2][0]) {
case 'g':
case 'G':
color = e_RTE_METER_GREEN;
break;
case 'y':
case 'Y':
color = e_RTE_METER_YELLOW;
break;
case 'r':
case 'R':
color = e_RTE_METER_RED;
break;
default:
*line_number = l;
return -EINVAL;
}
dscp_table->entry[dscp].tc_id = tc_id;
dscp_table->entry[dscp].tc_queue_id = tc_queue_id;
dscp_table->entry[dscp].color = color;
dscp++;
}
/* Close file */
fclose(f);
return 0;
}
static void
cmd_pipeline_table_dscp(char **tokens,
uint32_t n_tokens,
char *out,
size_t out_size)
{
struct rte_table_action_dscp_table dscp_table;
char *pipeline_name, *file_name;
uint32_t table_id, line_number;
int status;
if (n_tokens != 6) {
snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
return;
}
pipeline_name = tokens[1];
if (strcmp(tokens[2], "table") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "port");
return;
}
if (parser_read_uint32(&table_id, tokens[3]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "table_id");
return;
}
if (strcmp(tokens[4], "dscp") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "dscp");
return;
}
file_name = tokens[5];
status = load_dscp_table(&dscp_table, file_name, &line_number);
if (status) {
snprintf(out, out_size, MSG_FILE_ERR, file_name, line_number);
return;
}
status = pipeline_table_dscp_table_update(pipeline_name,
table_id,
UINT64_MAX,
&dscp_table);
if (status) {
snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
return;
}
}
/**
* thread <thread_id> pipeline <pipeline_name> enable
*/
@ -4370,6 +4516,14 @@ cli_process(char *in, char *out, size_t out_size)
out, out_size);
return;
}
if ((n_tokens >= 5) &&
(strcmp(tokens[2], "table") == 0) &&
(strcmp(tokens[4], "dscp") == 0)) {
cmd_pipeline_table_dscp(tokens, n_tokens,
out, out_size);
return;
}
}
if (strcmp(tokens[0], "thread") == 0) {

6
examples/ip_pipeline/pipeline.h
View File

@ -351,4 +351,10 @@ pipeline_table_rule_mtr_read(const char *pipeline_name,
struct rte_table_action_mtr_counters *stats,
int clear);
int
pipeline_table_dscp_table_update(const char *pipeline_name,
uint32_t table_id,
uint64_t dscp_mask,
struct rte_table_action_dscp_table *dscp_table);
#endif /* _INCLUDE_PIPELINE_H_ */

78
examples/ip_pipeline/thread.c
View File

@ -497,6 +497,7 @@ enum pipeline_req_type {
PIPELINE_REQ_TABLE_MTR_PROFILE_ADD,
PIPELINE_REQ_TABLE_MTR_PROFILE_DELETE,
PIPELINE_REQ_TABLE_RULE_MTR_READ,
PIPELINE_REQ_TABLE_DSCP_TABLE_UPDATE,
PIPELINE_REQ_MAX
};
@ -552,6 +553,12 @@ struct pipeline_msg_req_table_rule_mtr_read {
uint32_t tc_mask;
int clear;
};
struct pipeline_msg_req_table_dscp_table_update {
uint64_t dscp_mask;
struct rte_table_action_dscp_table dscp_table;
};
struct pipeline_msg_req {
enum pipeline_req_type type;
uint32_t id; /* Port IN, port OUT or table ID */
@ -569,6 +576,7 @@ struct pipeline_msg_req {
struct pipeline_msg_req_table_mtr_profile_add table_mtr_profile_add;
struct pipeline_msg_req_table_mtr_profile_delete table_mtr_profile_delete;
struct pipeline_msg_req_table_rule_mtr_read table_rule_mtr_read;
struct pipeline_msg_req_table_dscp_table_update table_dscp_table_update;
};
};
@ -1502,6 +1510,54 @@ pipeline_table_rule_mtr_read(const char *pipeline_name,
return status;
}
int
pipeline_table_dscp_table_update(const char *pipeline_name,
uint32_t table_id,
uint64_t dscp_mask,
struct rte_table_action_dscp_table *dscp_table)
{
struct pipeline *p;
struct pipeline_msg_req *req;
struct pipeline_msg_rsp *rsp;
int status;
/* Check input params */
if ((pipeline_name == NULL) ||
(dscp_table == NULL))
return -1;
p = pipeline_find(pipeline_name);
if ((p == NULL) ||
(p->enabled == 0) ||
(table_id >= p->n_tables))
return -1;
/* Allocate request */
req = pipeline_msg_alloc();
if (req == NULL)
return -1;
/* Write request */
req->type = PIPELINE_REQ_TABLE_DSCP_TABLE_UPDATE;
req->id = table_id;
req->table_dscp_table_update.dscp_mask = dscp_mask;
memcpy(&req->table_dscp_table_update.dscp_table,
dscp_table, sizeof(*dscp_table));
/* Send request and wait for response */
rsp = pipeline_msg_send_recv(p, req);
if (rsp == NULL)
return -1;
/* Read response */
status = rsp->status;
/* Free response */
pipeline_msg_free(rsp);
return status;
}
/**
* Data plane threads: message handling
*/
@ -2356,6 +2412,24 @@ pipeline_msg_handle_table_rule_mtr_read(struct pipeline_data *p,
return rsp;
}
static struct pipeline_msg_rsp *
pipeline_msg_handle_table_dscp_table_update(struct pipeline_data *p,
struct pipeline_msg_req *req)
{
struct pipeline_msg_rsp *rsp = (struct pipeline_msg_rsp *) req;
uint32_t table_id = req->id;
uint64_t dscp_mask = req->table_dscp_table_update.dscp_mask;
struct rte_table_action_dscp_table *dscp_table =
&req->table_dscp_table_update.dscp_table;
struct rte_table_action *a = p->table_data[table_id].a;
rsp->status = rte_table_action_dscp_table_update(a,
dscp_mask,
dscp_table);
return rsp;
}
static void
pipeline_msg_handle(struct pipeline_data *p)
{
@ -2424,6 +2498,10 @@ pipeline_msg_handle(struct pipeline_data *p)
rsp = pipeline_msg_handle_table_rule_mtr_read(p, req);
break;
case PIPELINE_REQ_TABLE_DSCP_TABLE_UPDATE:
rsp = pipeline_msg_handle_table_dscp_table_update(p, req);
break;
default:
rsp = (struct pipeline_msg_rsp *) req;
rsp->status = -1;