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

examples/ip_pipeline: support rule stats read

Browse Source 
Add support for rule stats read operation.

Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
This commit is contained in:
Cristian Dumitrescu 2018-10-30 18:21:37 +00:00
parent f6df5f5399
commit 87b36dcd2b
3 changed files with 117 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
examples/ip_pipeline/cli.c
View File

@ -4741,17 +4741,114 @@ cmd_pipeline_table_rule_delete_default(char **tokens,
static const char cmd_pipeline_table_rule_stats_read_help[] =
"pipeline <pipeline_name> table <table_id> rule read stats [clear]\n";
"pipeline <pipeline_name> table <table_id> rule read stats [clear]\n"
" match <match>\n";
static void
cmd_pipeline_table_rule_stats_read(char **tokens,
uint32_t n_tokens __rte_unused,
uint32_t n_tokens,
char *out,
size_t out_size)
{
snprintf(out, out_size, MSG_CMD_UNIMPLEM, tokens[0]);
}
struct table_rule_match m;
struct rte_table_action_stats_counters stats;
char *pipeline_name;
uint32_t table_id, n_tokens_parsed;
int clear = 0, status;
if (n_tokens < 7) {
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], "read") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "read");
return;
}
if (strcmp(tokens[6], "stats") != 0) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "stats");
return;
}
n_tokens -= 7;
tokens += 7;
/* clear */
if (n_tokens && (strcmp(tokens[0], "clear") == 0)) {
clear = 1;
n_tokens--;
tokens++;
}
/* match */
if ((n_tokens == 0) || strcmp(tokens[0], "match")) {
snprintf(out, out_size, MSG_ARG_NOT_FOUND, "match");
return;
}
n_tokens_parsed = parse_match(tokens,
n_tokens,
out,
out_size,
&m);
if (n_tokens_parsed == 0)
return;
n_tokens -= n_tokens_parsed;
tokens += n_tokens_parsed;
/* end */
if (n_tokens) {
snprintf(out, out_size, MSG_ARG_INVALID, tokens[0]);
return;
}
/* Read table rule stats. */
status = pipeline_table_rule_stats_read(pipeline_name,
table_id,
&m,
&stats,
clear);
if (status) {
snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
return;
}
/* Print stats. */
if (stats.n_packets_valid && stats.n_bytes_valid)
snprintf(out, out_size, "Packets: %" PRIu64 "; Bytes: %" PRIu64 "\n",
stats.n_packets,
stats.n_bytes);
if (stats.n_packets_valid && !stats.n_bytes_valid)
snprintf(out, out_size, "Packets: %" PRIu64 "; Bytes: N/A\n",
stats.n_packets);
if (!stats.n_packets_valid && stats.n_bytes_valid)
snprintf(out, out_size, "Packets: N/A; Bytes: %" PRIu64 "\n",
stats.n_bytes);
if (!stats.n_packets_valid && !stats.n_bytes_valid)
snprintf(out, out_size, "Packets: N/A ; Bytes: N/A\n");
}
static const char cmd_pipeline_table_meter_profile_add_help[] =
"pipeline <pipeline_name> table <table_id> meter profile <meter_profile_id>\n"

2
examples/ip_pipeline/pipeline.h
View File

@ -355,7 +355,7 @@ pipeline_table_rule_delete_default(const char *pipeline_name,
int
pipeline_table_rule_stats_read(const char *pipeline_name,
uint32_t table_id,
void *data,
struct table_rule_match *match,
struct rte_table_action_stats_counters *stats,
int clear);

24
examples/ip_pipeline/thread.c
View File

@ -1796,31 +1796,37 @@ pipeline_table_rule_delete_default(const char *pipeline_name,
int
pipeline_table_rule_stats_read(const char *pipeline_name,
uint32_t table_id,
void *data,
struct table_rule_match *match,
struct rte_table_action_stats_counters *stats,
int clear)
{
struct pipeline *p;
struct table *table;
struct pipeline_msg_req *req;
struct pipeline_msg_rsp *rsp;
struct table_rule *rule;
int status;
/* Check input params */
if ((pipeline_name == NULL) ||
(data == NULL) ||
(match == NULL) ||
(stats == NULL))
return -1;
p = pipeline_find(pipeline_name);
if ((p == NULL) ||
(table_id >= p->n_tables))
(table_id >= p->n_tables) ||
match_check(match, p, table_id))
return -1;
table = &p->table[table_id];
rule = table_rule_find(table, match);
if (rule == NULL)
return -1;
if (!pipeline_is_running(p)) {
struct rte_table_action *a = p->table[table_id].a;
status = rte_table_action_stats_read(a,
data,
status = rte_table_action_stats_read(table->a,
rule->data,
stats,
clear);
@ -1835,7 +1841,7 @@ pipeline_table_rule_stats_read(const char *pipeline_name,
/* 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.data = rule->data;
req->table_rule_stats_read.clear = clear;
/* Send request and wait for response */
@ -1845,7 +1851,7 @@ pipeline_table_rule_stats_read(const char *pipeline_name,
/* Read response */
status = rsp->status;
if (status)
if (status == 0)
memcpy(stats, &rsp->table_rule_stats_read.stats, sizeof(*stats));
/* Free response */