net/softnic: add command for TTL action

Add cli commands for ttl action in softnic pipeline objects.

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

diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c b/drivers/net/softnic/rte_eth_softnic_cli.c
index c13f4d8..860d6a9 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -3820,6 +3820,19 @@ cmd_pipeline_table_dscp(struct pmd_internals *softnic,
        }
 }
 
+/**
+ * pipeline <pipeline_name> table <table_id> rule read ttl [clear]
+ */
+static void
+cmd_softnic_pipeline_table_rule_ttl_read(struct pmd_internals *softnic __rte_unused,
+       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
  */
@@ -4131,6 +4144,16 @@ softnic_cli_process(char *in, char *out, size_t out_size, void *arg)
                                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], "ttl") == 0)) {
+                       cmd_softnic_pipeline_table_rule_ttl_read(softnic, tokens, n_tokens,
+                               out, out_size);
+                       return;
+               }
        }
 
        if (strcmp(tokens[0], "thread") == 0) {

diff --git a/drivers/net/softnic/rte_eth_softnic_internals.h b/drivers/net/softnic/rte_eth_softnic_internals.h
index 8d83eeb..63e3ab8 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic_internals.h
+++ b/drivers/net/softnic/rte_eth_softnic_internals.h
@@ -867,6 +867,14 @@ softnic_pipeline_table_dscp_table_update(struct pmd_internals *p,
        uint64_t dscp_mask,
        struct rte_table_action_dscp_table *dscp_table);
 
+int
+softnic_pipeline_table_rule_ttl_read(struct pmd_internals *p,
+       const char *pipeline_name,
+       uint32_t table_id,
+       void *data,
+       struct rte_table_action_ttl_counters *stats,
+       int clear);
+
 /**
  * Thread
  */

diff --git a/drivers/net/softnic/rte_eth_softnic_thread.c b/drivers/net/softnic/rte_eth_softnic_thread.c
index c626b99..8a15090 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic_thread.c
+++ b/drivers/net/softnic/rte_eth_softnic_thread.c
@@ -526,6 +526,7 @@ enum pipeline_req_type {
        PIPELINE_REQ_TABLE_MTR_PROFILE_DELETE,
        PIPELINE_REQ_TABLE_RULE_MTR_READ,
        PIPELINE_REQ_TABLE_DSCP_TABLE_UPDATE,
+       PIPELINE_REQ_TABLE_RULE_TTL_READ,
        PIPELINE_REQ_MAX
 };
 
@@ -587,6 +588,11 @@ struct pipeline_msg_req_table_dscp_table_update {
        struct rte_table_action_dscp_table dscp_table;
 };
 
+struct pipeline_msg_req_table_rule_ttl_read {
+       void *data;
+       int clear;
+};
+
 struct pipeline_msg_req {
        enum pipeline_req_type type;
        uint32_t id; /* Port IN, port OUT or table ID */
@@ -605,6 +611,7 @@ struct pipeline_msg_req {
                struct pipeline_msg_req_table_mtr_profile_delete table_mtr_profile_delete;
                struct pipeline_msg_req_table_rule_mtr_read table_rule_mtr_read;
                struct pipeline_msg_req_table_dscp_table_update table_dscp_table_update;
+               struct pipeline_msg_req_table_rule_ttl_read table_rule_ttl_read;
        };
 };
 
@@ -640,6 +647,10 @@ struct pipeline_msg_rsp_table_rule_mtr_read {
        struct rte_table_action_mtr_counters stats;
 };
 
+struct pipeline_msg_rsp_table_rule_ttl_read {
+       struct rte_table_action_ttl_counters stats;
+};
+
 struct pipeline_msg_rsp {
        int status;
 
@@ -653,6 +664,7 @@ struct pipeline_msg_rsp {
                struct pipeline_msg_rsp_table_rule_add_bulk table_rule_add_bulk;
                struct pipeline_msg_rsp_table_rule_stats_read table_rule_stats_read;
                struct pipeline_msg_rsp_table_rule_mtr_read table_rule_mtr_read;
+               struct pipeline_msg_rsp_table_rule_ttl_read table_rule_ttl_read;
        };
 };
 
@@ -1891,6 +1903,68 @@ softnic_pipeline_table_dscp_table_update(struct pmd_internals *softnic,
        return status;
 }
 
+int
+softnic_pipeline_table_rule_ttl_read(struct pmd_internals *softnic,
+       const char *pipeline_name,
+       uint32_t table_id,
+       void *data,
+       struct rte_table_action_ttl_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 = softnic_pipeline_find(softnic, pipeline_name);
+       if (p == NULL ||
+               table_id >= p->n_tables)
+               return -1;
+
+       if (!pipeline_is_running(p)) {
+               struct rte_table_action *a = p->table[table_id].a;
+
+               status = rte_table_action_ttl_read(a,
+                               data,
+                               stats,
+                               clear);
+
+               return status;
+       }
+
+       /* Allocate request */
+       req = pipeline_msg_alloc();
+       if (req == NULL)
+               return -1;
+
+       /* Write request */
+       req->type = PIPELINE_REQ_TABLE_RULE_TTL_READ;
+       req->id = table_id;
+       req->table_rule_ttl_read.data = data;
+       req->table_rule_ttl_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_ttl_read.stats, sizeof(*stats));
+
+       /* Free response */
+       pipeline_msg_free(rsp);
+
+       return status;
+}
+
 /**
  * Data plane threads: message handling
  */
@@ -2682,6 +2756,24 @@ pipeline_msg_handle_table_dscp_table_update(struct pipeline_data *p,
        return rsp;
 }
 
+static struct pipeline_msg_rsp *
+pipeline_msg_handle_table_rule_ttl_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_ttl_read.data;
+       int clear = req->table_rule_ttl_read.clear;
+       struct rte_table_action *a = p->table_data[table_id].a;
+
+       rsp->status = rte_table_action_ttl_read(a,
+               data,
+               &rsp->table_rule_ttl_read.stats,
+               clear);
+
+       return rsp;
+}
+
 static void
 pipeline_msg_handle(struct pipeline_data *p)
 {
@@ -2754,6 +2846,10 @@ pipeline_msg_handle(struct pipeline_data *p)
                        rsp = pipeline_msg_handle_table_dscp_table_update(p, req);
                        break;
 
+               case PIPELINE_REQ_TABLE_RULE_TTL_READ:
+                       rsp = pipeline_msg_handle_table_rule_ttl_read(p, req);
+                       break;
+
                default:
                        rsp = (struct pipeline_msg_rsp *)req;
                        rsp->status = -1;