examples/ip_pipeline: add table entry stats command

Add command to read the pipeline table entry stats.

Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
This commit is contained in:
Jasvinder Singh 2018-03-29 19:31:57 +01:00 committed by Cristian Dumitrescu
parent 3186282f8e
commit c64b9121a9
3 changed files with 114 additions and 0 deletions

View File

@ -3795,6 +3795,18 @@ cmd_pipeline_table_rule_delete_default(char **tokens,
}
}
/**
* pipeline <pipeline_name> table <table_id> rule read stats [clear]
*/
static void
cmd_pipeline_table_rule_stats_read(char **tokens,
uint32_t n_tokens __rte_unused,
char *out,
size_t out_size)
{
snprintf(out, out_size, MSG_CMD_UNIMPLEM, tokens[0]);
}
/**
* thread <thread_id> pipeline <pipeline_name> enable
*/
@ -4094,6 +4106,16 @@ 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], "read") == 0) &&
(strcmp(tokens[6], "stats") == 0)) {
cmd_pipeline_table_rule_stats_read(tokens, n_tokens,
out, out_size);
return;
}
}
if (strcmp(tokens[0], "thread") == 0) {

View File

@ -325,4 +325,11 @@ int
pipeline_table_rule_delete_default(const char *pipeline_name,
uint32_t table_id);
int
pipeline_table_rule_stats_read(const char *pipeline_name,
uint32_t table_id,
void *data,
struct rte_table_action_stats_counters *stats,
int clear);
#endif /* _INCLUDE_PIPELINE_H_ */

View File

@ -493,6 +493,7 @@ enum pipeline_req_type {
PIPELINE_REQ_TABLE_RULE_ADD_BULK,
PIPELINE_REQ_TABLE_RULE_DELETE,
PIPELINE_REQ_TABLE_RULE_DELETE_DEFAULT,
PIPELINE_REQ_TABLE_RULE_STATS_READ,
PIPELINE_REQ_MAX
};
@ -529,6 +530,11 @@ struct pipeline_msg_req_table_rule_delete {
struct table_rule_match match;
};
struct pipeline_msg_req_table_rule_stats_read {
void *data;
int clear;
};
struct pipeline_msg_req {
enum pipeline_req_type type;
uint32_t id; /* Port IN, port OUT or table ID */
@ -542,6 +548,7 @@ struct pipeline_msg_req {
struct pipeline_msg_req_table_rule_add_default table_rule_add_default;
struct pipeline_msg_req_table_rule_add_bulk table_rule_add_bulk;
struct pipeline_msg_req_table_rule_delete table_rule_delete;
struct pipeline_msg_req_table_rule_stats_read table_rule_stats_read;
};
};
@ -569,6 +576,10 @@ struct pipeline_msg_rsp_table_rule_add_bulk {
uint32_t n_rules;
};
struct pipeline_msg_rsp_table_rule_stats_read {
struct rte_table_action_stats_counters stats;
};
struct pipeline_msg_rsp {
int status;
@ -580,6 +591,7 @@ struct pipeline_msg_rsp {
struct pipeline_msg_rsp_table_rule_add table_rule_add;
struct pipeline_msg_rsp_table_rule_add_default table_rule_add_default;
struct pipeline_msg_rsp_table_rule_add_bulk table_rule_add_bulk;
struct pipeline_msg_rsp_table_rule_stats_read table_rule_stats_read;
};
};
@ -1270,6 +1282,57 @@ pipeline_table_rule_delete_default(const char *pipeline_name,
return status;
}
int
pipeline_table_rule_stats_read(const char *pipeline_name,
uint32_t table_id,
void *data,
struct rte_table_action_stats_counters *stats,
int clear)
{
struct pipeline *p;
struct pipeline_msg_req *req;
struct pipeline_msg_rsp *rsp;
int status;
/* Check input params */
if ((pipeline_name == NULL) ||
(data == NULL) ||
(stats == 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_STATS_READ;
req->id = table_id;
req->table_rule_stats_read.data = data;
req->table_rule_stats_read.clear = clear;
/* Send request and wait for response */
rsp = pipeline_msg_send_recv(p, req);
if (rsp == NULL)
return -1;
/* Read response */
status = rsp->status;
if (status)
memcpy(stats, &rsp->table_rule_stats_read.stats, sizeof(*stats));
/* Free response */
pipeline_msg_free(rsp);
return status;
}
/**
* Data plane threads: message handling
*/
@ -2052,6 +2115,24 @@ pipeline_msg_handle_table_rule_delete_default(struct pipeline_data *p,
return rsp;
}
static struct pipeline_msg_rsp *
pipeline_msg_handle_table_rule_stats_read(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;
void *data = req->table_rule_stats_read.data;
int clear = req->table_rule_stats_read.clear;
struct rte_table_action *a = p->table_data[table_id].a;
rsp->status = rte_table_action_stats_read(a,
data,
&rsp->table_rule_stats_read.stats,
clear);
return rsp;
}
static void
pipeline_msg_handle(struct pipeline_data *p)
{
@ -2104,6 +2185,10 @@ pipeline_msg_handle(struct pipeline_data *p)
rsp = pipeline_msg_handle_table_rule_delete_default(p, req);
break;
case PIPELINE_REQ_TABLE_RULE_STATS_READ:
rsp = pipeline_msg_handle_table_rule_stats_read(p, req);
break;
default:
rsp = (struct pipeline_msg_rsp *) req;
rsp->status = -1;