net/softnic: support packet tag action

Add support for packet tag table action.

Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>

diff --git a/drivers/net/softnic/rte_eth_softnic_action.c b/drivers/net/softnic/rte_eth_softnic_action.c
index c542688..133dd06 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic_action.c
+++ b/drivers/net/softnic/rte_eth_softnic_action.c
@@ -364,6 +364,17 @@ softnic_table_action_profile_create(struct pmd_internals *p,
                }
        }
 
+       if (params->action_mask & (1LLU << RTE_TABLE_ACTION_TAG)) {
+               status = rte_table_action_profile_action_register(ap,
+                       RTE_TABLE_ACTION_TAG,
+                       NULL);
+
+               if (status) {
+                       rte_table_action_profile_free(ap);
+                       return NULL;
+               }
+       }
+
        status = rte_table_action_profile_freeze(ap);
        if (status) {
                rte_table_action_profile_free(ap);

diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c b/drivers/net/softnic/rte_eth_softnic_cli.c
index dc8ccdc..31c37da 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -1279,6 +1279,7 @@ cmd_port_in_action_profile(struct pmd_internals *softnic,
  *      stats none | pkts]
  *  [stats pkts | bytes | both]
  *  [time]
+ *  [tag]
  */
 static void
 cmd_table_action_profile(struct pmd_internals *softnic,
@@ -1610,6 +1611,12 @@ cmd_table_action_profile(struct pmd_internals *softnic,
                t0 += 1;
        } /* time */
 
+       if (t0 < n_tokens &&
+               (strcmp(tokens[t0], "tag") == 0)) {
+               p.action_mask |= 1LLU << RTE_TABLE_ACTION_TAG;
+               t0 += 1;
+       } /* tag */
+
        if (t0 < n_tokens) {
                snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
                return;
@@ -3176,6 +3183,7 @@ parse_match(char **tokens,
  *    [ttl dec | keep]
  *    [stats]
  *    [time]
+ *    [tag <tag>]
  *
  * where:
  *    <pa> ::= g | y | r | drop
@@ -3665,6 +3673,22 @@ parse_table_action_time(char **tokens,
        return 1;
 }
 
+static uint32_t
+parse_table_action_tag(char **tokens,
+       uint32_t n_tokens,
+       struct softnic_table_rule_action *a)
+{
+       if (n_tokens < 2 ||
+               strcmp(tokens[0], "tag"))
+               return 0;
+
+       if (softnic_parser_read_uint32(&a->tag.tag, tokens[1]))
+               return 0;
+
+       a->action_mask |= 1 << RTE_TABLE_ACTION_TAG;
+       return 2;
+}
+
 static uint32_t
 parse_table_action(char **tokens,
        uint32_t n_tokens,
@@ -3809,6 +3833,20 @@ parse_table_action(char **tokens,
                n_tokens -= n;
        }
 
+       if (n_tokens && (strcmp(tokens[0], "tag") == 0)) {
+               uint32_t n;
+
+               n = parse_table_action_tag(tokens, n_tokens, a);
+               if (n == 0) {
+                       snprintf(out, out_size, MSG_ARG_INVALID,
+                               "action tag");
+                       return 0;
+               }
+
+               tokens += n;
+               n_tokens -= n;
+       }
+
        if (n_tokens0 - n_tokens == 1) {
                snprintf(out, out_size, MSG_ARG_INVALID, "action");
                return 0;

diff --git a/drivers/net/softnic/rte_eth_softnic_internals.h b/drivers/net/softnic/rte_eth_softnic_internals.h
index 78864e7..1623ff8 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic_internals.h
+++ b/drivers/net/softnic/rte_eth_softnic_internals.h
@@ -897,6 +897,7 @@ struct softnic_table_rule_action {
        struct rte_table_action_ttl_params ttl;
        struct rte_table_action_stats_params stats;
        struct rte_table_action_time_params time;
+       struct rte_table_action_tag_params tag;
 };
 
 struct rte_flow {

diff --git a/drivers/net/softnic/rte_eth_softnic_thread.c b/drivers/net/softnic/rte_eth_softnic_thread.c
index 87b5592..e1d002e 100644 (file)
--- a/drivers/net/softnic/rte_eth_softnic_thread.c
+++ b/drivers/net/softnic/rte_eth_softnic_thread.c
@@ -2478,6 +2478,16 @@ action_convert(struct rte_table_action *a,
                        return status;
        }
 
+       if (action->action_mask & (1LLU << RTE_TABLE_ACTION_TAG)) {
+               status = rte_table_action_apply(a,
+                       data,
+                       RTE_TABLE_ACTION_TAG,
+                       &action->tag);
+
+               if (status)
+                       return status;
+       }
+
        return 0;
 }