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

examples/ip_pipeline: add table entry delete command

Browse Source 
Add command to delete the pipeline table entry.

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:31:55 +01:00 committed by Cristian Dumitrescu
parent a3a95b7d58
commit f634e4c569
3 changed files with 296 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
examples/ip_pipeline/cli.c
View File

@ -3539,6 +3539,134 @@ cmd_pipeline_table_rule_add_default(char **tokens,
}
}
/**
* pipeline <pipeline_name> table <table_id> rule delete
* match <match>
*/
static void
cmd_pipeline_table_rule_delete(char **tokens,
uint32_t n_tokens,
char *out,
size_t out_size)
{
struct table_rule_match m;
char *pipeline_name;
uint32_t table_id, n_tokens_parsed, t0;
int status;
if (n_tokens < 8) {
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, "table");
return;
}
if (parser_read_uint32(&table_id, tokens[3]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "table_id");
return;
}
if (strcmp(tokens[4], "rule") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "rule");
return;
}
if (strcmp(tokens[5], "delete") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "delete");
return;
}
t0 = 6;
/* match */
n_tokens_parsed = parse_match(tokens + t0,
n_tokens - t0,
out,
out_size,
&m);
if (n_tokens_parsed == 0)
return;
t0 += n_tokens_parsed;
if (n_tokens != t0) {
snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
return;
}
status = pipeline_table_rule_delete(pipeline_name,
table_id,
&m);
if (status) {
snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
return;
}
}
/**
* pipeline <pipeline_name> table <table_id> rule delete
* match
* default
*/
static void
cmd_pipeline_table_rule_delete_default(char **tokens,
uint32_t n_tokens,
char *out,
size_t out_size)
{
char *pipeline_name;
uint32_t table_id;
int status;
if (n_tokens != 8) {
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, "table");
return;
}
if (parser_read_uint32(&table_id, tokens[3]) != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "table_id");
return;
}
if (strcmp(tokens[4], "rule") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "rule");
return;
}
if (strcmp(tokens[5], "delete") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "delete");
return;
}
if (strcmp(tokens[6], "match") != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "match");
return;
}
if (strcmp(tokens[7], "default") != 0) {
snprintf(out, out_size, MSG_ARG_INVALID, "default");
return;
}
status = pipeline_table_rule_delete_default(pipeline_name,
table_id);
if (status) {
snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
return;
}
}
/**
* thread <thread_id> pipeline <pipeline_name> enable
*/
@ -3811,6 +3939,23 @@ cli_process(char *in, char *out, size_t out_size)
out, out_size);
return;
}
if ((n_tokens >= 7) &&
(strcmp(tokens[2], "table") == 0) &&
(strcmp(tokens[4], "rule") == 0) &&
(strcmp(tokens[5], "delete") == 0) &&
(strcmp(tokens[6], "match") == 0)) {
if ((n_tokens >= 8) &&
(strcmp(tokens[7], "default") == 0)) {
cmd_pipeline_table_rule_delete_default(tokens,
n_tokens, out, out_size);
return;
}
cmd_pipeline_table_rule_delete(tokens, n_tokens,
out, out_size);
return;
}
}
if (strcmp(tokens[0], "thread") == 0) {

9
examples/ip_pipeline/pipeline.h
View File

@ -308,4 +308,13 @@ pipeline_table_rule_add_default(const char *pipeline_name,
struct table_rule_action *action,
void **data);
int
pipeline_table_rule_delete(const char *pipeline_name,
uint32_t table_id,
struct table_rule_match *match);
int
pipeline_table_rule_delete_default(const char *pipeline_name,
uint32_t table_id);
#endif /* _INCLUDE_PIPELINE_H_ */

142
examples/ip_pipeline/thread.c
View File

@ -490,6 +490,8 @@ enum pipeline_req_type {
PIPELINE_REQ_TABLE_STATS_READ,
PIPELINE_REQ_TABLE_RULE_ADD,
PIPELINE_REQ_TABLE_RULE_ADD_DEFAULT,
PIPELINE_REQ_TABLE_RULE_DELETE,
PIPELINE_REQ_TABLE_RULE_DELETE_DEFAULT,
PIPELINE_REQ_MAX
};
@ -515,6 +517,10 @@ struct pipeline_msg_req_table_rule_add_default {
struct table_rule_action action;
};
struct pipeline_msg_req_table_rule_delete {
struct table_rule_match match;
};
struct pipeline_msg_req {
enum pipeline_req_type type;
uint32_t id; /* Port IN, port OUT or table ID */
@ -526,6 +532,7 @@ struct pipeline_msg_req {
struct pipeline_msg_req_table_stats_read table_stats_read;
struct pipeline_msg_req_table_rule_add table_rule_add;
struct pipeline_msg_req_table_rule_add_default table_rule_add_default;
struct pipeline_msg_req_table_rule_delete table_rule_delete;
};
};
@ -1096,6 +1103,94 @@ pipeline_table_rule_add_default(const char *pipeline_name,
return status;
}
int
pipeline_table_rule_delete(const char *pipeline_name,
uint32_t table_id,
struct table_rule_match *match)
{
struct pipeline *p;
struct pipeline_msg_req *req;
struct pipeline_msg_rsp *rsp;
int status;
/* Check input params */
if ((pipeline_name == NULL) ||
(match == NULL))
return -1;
p = pipeline_find(pipeline_name);
if ((p == NULL) ||
(p->enabled == 0) ||
(table_id >= p->n_tables) ||
match_check(match, p, table_id))
return -1;
/* Allocate request */
req = pipeline_msg_alloc();
if (req == NULL)
return -1;
/* Write request */
req->type = PIPELINE_REQ_TABLE_RULE_DELETE;
req->id = table_id;
memcpy(&req->table_rule_delete.match, match, sizeof(*match));
/* 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;
}
int
pipeline_table_rule_delete_default(const char *pipeline_name,
uint32_t table_id)
{
struct pipeline *p;
struct pipeline_msg_req *req;
struct pipeline_msg_rsp *rsp;
int status;
/* Check input params */
if (pipeline_name == 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_RULE_DELETE_DEFAULT;
req->id = table_id;
/* 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
*/
@ -1652,6 +1747,45 @@ pipeline_msg_handle_table_rule_add_default(struct pipeline_data *p,
return rsp;
}
static struct pipeline_msg_rsp *
pipeline_msg_handle_table_rule_delete(struct pipeline_data *p,
struct pipeline_msg_req *req)
{
union table_rule_match_low_level match_ll;
struct pipeline_msg_rsp *rsp = (struct pipeline_msg_rsp *) req;
struct table_rule_match *match = &req->table_rule_delete.match;
uint32_t table_id = req->id;
int key_found, status;
status = match_convert(match, &match_ll, 0);
if (status) {
rsp->status = -1;
return rsp;
}
rsp->status = rte_pipeline_table_entry_delete(p->p,
table_id,
&match_ll,
&key_found,
NULL);
return rsp;
}
static struct pipeline_msg_rsp *
pipeline_msg_handle_table_rule_delete_default(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;
rsp->status = rte_pipeline_table_default_entry_delete(p->p,
table_id,
NULL);
return rsp;
}
static void
pipeline_msg_handle(struct pipeline_data *p)
{
@ -1692,6 +1826,14 @@ pipeline_msg_handle(struct pipeline_data *p)
rsp = pipeline_msg_handle_table_rule_add_default(p, req);
break;
case PIPELINE_REQ_TABLE_RULE_DELETE:
rsp = pipeline_msg_handle_table_rule_delete(p, req);
break;
case PIPELINE_REQ_TABLE_RULE_DELETE_DEFAULT:
rsp = pipeline_msg_handle_table_rule_delete_default(p, req);
break;
default:
rsp = (struct pipeline_msg_rsp *) req;
rsp->status = -1;