examples/ip_pipeline: support meter stats read

Add support for the rule meter stats read operation.

Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>

diff --git a/examples/ip_pipeline/cli.c b/examples/ip_pipeline/cli.c
index e7ad93e..78539d1 100644 (file)
--- a/examples/ip_pipeline/cli.c
+++ b/examples/ip_pipeline/cli.c
@@ -5065,15 +5065,98 @@ cmd_pipeline_table_meter_profile_delete(char **tokens,
 
 
 static const char cmd_pipeline_table_rule_meter_read_help[] =
-"pipeline <pipeline_name> table <table_id> rule read meter [clear]\n";
+"pipeline <pipeline_name> table <table_id> rule read meter [clear]\n"
+"     match <match>\n";
 
 static void
 cmd_pipeline_table_rule_meter_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_mtr_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], "meter") != 0) {
+               snprintf(out, out_size, MSG_ARG_NOT_FOUND, "meter");
+               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 meter stats. */
+       status = pipeline_table_rule_mtr_read(pipeline_name,
+               table_id,
+               &m,
+               &stats,
+               clear);
+       if (status) {
+               snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
+               return;
+       }
+
+       /* Print stats. */
 }
 
 

diff --git a/examples/ip_pipeline/pipeline.h b/examples/ip_pipeline/pipeline.h
index 2c42e0d..57553bd 100644 (file)
--- a/examples/ip_pipeline/pipeline.h
+++ b/examples/ip_pipeline/pipeline.h
@@ -373,8 +373,7 @@ pipeline_table_mtr_profile_delete(const char *pipeline_name,
 int
 pipeline_table_rule_mtr_read(const char *pipeline_name,
        uint32_t table_id,
-       void *data,
-       uint32_t tc_mask,
+       struct table_rule_match *match,
        struct rte_table_action_mtr_counters *stats,
        int clear);
 

diff --git a/examples/ip_pipeline/thread.c b/examples/ip_pipeline/thread.c
index b172f91..0252db9 100644 (file)
--- a/examples/ip_pipeline/thread.c
+++ b/examples/ip_pipeline/thread.c
@@ -1971,32 +1971,40 @@ pipeline_table_mtr_profile_delete(const char *pipeline_name,
 int
 pipeline_table_rule_mtr_read(const char *pipeline_name,
        uint32_t table_id,
-       void *data,
-       uint32_t tc_mask,
+       struct table_rule_match *match,
        struct rte_table_action_mtr_counters *stats,
        int clear)
 {
        struct pipeline *p;
+       struct table *table;
        struct pipeline_msg_req *req;
        struct pipeline_msg_rsp *rsp;
+       struct table_rule *rule;
+       uint32_t tc_mask;
        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;
 
-       if (!pipeline_is_running(p)) {
-               struct rte_table_action *a = p->table[table_id].a;
+       table = &p->table[table_id];
+       tc_mask = (1 << table->ap->params.mtr.n_tc) - 1;
 
-               status = rte_table_action_meter_read(a,
-                               data,
+       rule = table_rule_find(table, match);
+       if (rule == NULL)
+               return -1;
+
+       if (!pipeline_is_running(p)) {
+               status = rte_table_action_meter_read(table->a,
+                               rule->data,
                                tc_mask,
                                stats,
                                clear);
@@ -2012,7 +2020,7 @@ pipeline_table_rule_mtr_read(const char *pipeline_name,
        /* Write request */
        req->type = PIPELINE_REQ_TABLE_RULE_MTR_READ;
        req->id = table_id;
-       req->table_rule_mtr_read.data = data;
+       req->table_rule_mtr_read.data = rule->data;
        req->table_rule_mtr_read.tc_mask = tc_mask;
        req->table_rule_mtr_read.clear = clear;
 
@@ -2023,7 +2031,7 @@ pipeline_table_rule_mtr_read(const char *pipeline_name,
 
        /* Read response */
        status = rsp->status;
-       if (status)
+       if (status == 0)
                memcpy(stats, &rsp->table_rule_mtr_read.stats, sizeof(*stats));
 
        /* Free response */