Support table rule tracking on table rule add operation.
Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Signed-off-by: Hongjun Ni <hongjun.ni@intel.com>
struct table_rule_match m;
struct table_rule_action a;
char *pipeline_name;
struct table_rule_match m;
struct table_rule_action a;
char *pipeline_name;
uint32_t table_id, t0, n_tokens_parsed;
int status;
uint32_t table_id, t0, n_tokens_parsed;
int status;
- status = pipeline_table_rule_add(pipeline_name, table_id,
- &m, &a, &data);
+ status = pipeline_table_rule_add(pipeline_name, table_id, &m, &a);
if (status) {
snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
return;
if (status) {
snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
return;
pipeline_table_rule_add(const char *pipeline_name,
uint32_t table_id,
struct table_rule_match *match,
pipeline_table_rule_add(const char *pipeline_name,
uint32_t table_id,
struct table_rule_match *match,
- struct table_rule_action *action,
- void **data);
+ struct table_rule_action *action);
int
pipeline_table_rule_add_bulk(const char *pipeline_name,
int
pipeline_table_rule_add_bulk(const char *pipeline_name,
pipeline_table_rule_add(const char *pipeline_name,
uint32_t table_id,
struct table_rule_match *match,
pipeline_table_rule_add(const char *pipeline_name,
uint32_t table_id,
struct table_rule_match *match,
- struct table_rule_action *action,
- void **data)
+ struct table_rule_action *action)
struct pipeline_msg_req *req;
struct pipeline_msg_rsp *rsp;
struct pipeline_msg_req *req;
struct pipeline_msg_rsp *rsp;
+ struct table_rule *rule;
int status;
/* Check input params */
if ((pipeline_name == NULL) ||
(match == NULL) ||
int status;
/* Check input params */
if ((pipeline_name == NULL) ||
(match == NULL) ||
- (action == NULL) ||
- (data == NULL))
return -1;
p = pipeline_find(pipeline_name);
return -1;
p = pipeline_find(pipeline_name);
action_check(action, p, table_id))
return -1;
action_check(action, p, table_id))
return -1;
+ table = &p->table[table_id];
+
+ rule = calloc(1, sizeof(struct table_rule));
+ if (rule == NULL)
+ return -1;
+
+ memcpy(&rule->match, match, sizeof(*match));
+ memcpy(&rule->action, action, sizeof(*action));
+
if (!pipeline_is_running(p)) {
if (!pipeline_is_running(p)) {
- struct rte_table_action *a = p->table[table_id].a;
union table_rule_match_low_level match_ll;
struct rte_pipeline_table_entry *data_in, *data_out;
int key_found;
uint8_t *buffer;
buffer = calloc(TABLE_RULE_ACTION_SIZE_MAX, sizeof(uint8_t));
union table_rule_match_low_level match_ll;
struct rte_pipeline_table_entry *data_in, *data_out;
int key_found;
uint8_t *buffer;
buffer = calloc(TABLE_RULE_ACTION_SIZE_MAX, sizeof(uint8_t));
+ if (buffer == NULL) {
+ free(rule);
/* Table match-action rule conversion */
data_in = (struct rte_pipeline_table_entry *)buffer;
/* Table match-action rule conversion */
data_in = (struct rte_pipeline_table_entry *)buffer;
status = match_convert(match, &match_ll, 1);
if (status) {
free(buffer);
status = match_convert(match, &match_ll, 1);
if (status) {
free(buffer);
- status = action_convert(a, action, data_in);
+ status = action_convert(table->a, action, data_in);
if (status) {
free(buffer);
if (status) {
free(buffer);
&data_out);
if (status) {
free(buffer);
&data_out);
if (status) {
free(buffer);
return -1;
}
/* Write Response */
return -1;
}
/* Write Response */
+ rule->data = data_out;
+ table_rule_add(table, rule);
/* Allocate request */
req = pipeline_msg_alloc();
/* Allocate request */
req = pipeline_msg_alloc();
+ if (req == NULL) {
+ free(rule);
/* Write request */
req->type = PIPELINE_REQ_TABLE_RULE_ADD;
/* Write request */
req->type = PIPELINE_REQ_TABLE_RULE_ADD;
/* Send request and wait for response */
rsp = pipeline_msg_send_recv(p, req);
/* Send request and wait for response */
rsp = pipeline_msg_send_recv(p, req);
+ if (rsp == NULL) {
+ free(rule);
/* Read response */
status = rsp->status;
/* Read response */
status = rsp->status;
- if (status == 0)
- *data = rsp->table_rule_add.data;
+ if (status == 0) {
+ rule->data = rsp->table_rule_add.data;
+ table_rule_add(table, rule);
+ } else
+ free(rule);
/* Free response */
pipeline_msg_free(rsp);
/* Free response */
pipeline_msg_free(rsp);