summaryrefslogtreecommitdiff
path: root/drivers/net/softnic
diff options
context:
space:
mode:
authorCristian Dumitrescu <cristian.dumitrescu@intel.com>2018-10-10 15:12:05 +0100
committerCristian Dumitrescu <cristian.dumitrescu@intel.com>2018-10-12 19:33:39 +0200
commitb9bcbeeccbf56c8deff19a32b07e4bc1b8fa0411 (patch)
tree4557dad7b5ee1922efc888fd1f0f0495649c7644 /drivers/net/softnic
parentd5ed626f61b2577c63e5fb67526b531150d5105c (diff)
downloaddpdk-b9bcbeeccbf56c8deff19a32b07e4bc1b8fa0411.zip
dpdk-b9bcbeeccbf56c8deff19a32b07e4bc1b8fa0411.tar.gz
dpdk-b9bcbeeccbf56c8deff19a32b07e4bc1b8fa0411.tar.xz
net/softnic: support packet decap action
Add support for packet decap table action. Signed-off-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Diffstat (limited to 'drivers/net/softnic')
-rw-r--r--drivers/net/softnic/rte_eth_softnic_action.c11
-rw-r--r--drivers/net/softnic/rte_eth_softnic_cli.c38
-rw-r--r--drivers/net/softnic/rte_eth_softnic_internals.h1
-rw-r--r--drivers/net/softnic/rte_eth_softnic_thread.c10
4 files changed, 60 insertions, 0 deletions
diff --git a/drivers/net/softnic/rte_eth_softnic_action.c b/drivers/net/softnic/rte_eth_softnic_action.c
index 133dd06..2b74848 100644
--- a/drivers/net/softnic/rte_eth_softnic_action.c
+++ b/drivers/net/softnic/rte_eth_softnic_action.c
@@ -375,6 +375,17 @@ softnic_table_action_profile_create(struct pmd_internals *p,
}
}
+ if (params->action_mask & (1LLU << RTE_TABLE_ACTION_DECAP)) {
+ status = rte_table_action_profile_action_register(ap,
+ RTE_TABLE_ACTION_DECAP,
+ 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 31c37da..2ddd936 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -1280,6 +1280,7 @@ cmd_port_in_action_profile(struct pmd_internals *softnic,
* [stats pkts | bytes | both]
* [time]
* [tag]
+ * [decap]
*/
static void
cmd_table_action_profile(struct pmd_internals *softnic,
@@ -1617,6 +1618,12 @@ cmd_table_action_profile(struct pmd_internals *softnic,
t0 += 1;
} /* tag */
+ if (t0 < n_tokens &&
+ (strcmp(tokens[t0], "decap") == 0)) {
+ p.action_mask |= 1LLU << RTE_TABLE_ACTION_DECAP;
+ t0 += 1;
+ } /* decap */
+
if (t0 < n_tokens) {
snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
return;
@@ -3184,6 +3191,7 @@ parse_match(char **tokens,
* [stats]
* [time]
* [tag <tag>]
+ * [decap <n>]
*
* where:
* <pa> ::= g | y | r | drop
@@ -3690,6 +3698,22 @@ parse_table_action_tag(char **tokens,
}
static uint32_t
+parse_table_action_decap(char **tokens,
+ uint32_t n_tokens,
+ struct softnic_table_rule_action *a)
+{
+ if (n_tokens < 2 ||
+ strcmp(tokens[0], "decap"))
+ return 0;
+
+ if (softnic_parser_read_uint16(&a->decap.n, tokens[1]))
+ return 0;
+
+ a->action_mask |= 1 << RTE_TABLE_ACTION_DECAP;
+ return 2;
+}
+
+static uint32_t
parse_table_action(char **tokens,
uint32_t n_tokens,
char *out,
@@ -3847,6 +3871,20 @@ parse_table_action(char **tokens,
n_tokens -= n;
}
+ if (n_tokens && (strcmp(tokens[0], "decap") == 0)) {
+ uint32_t n;
+
+ n = parse_table_action_decap(tokens, n_tokens, a);
+ if (n == 0) {
+ snprintf(out, out_size, MSG_ARG_INVALID,
+ "action decap");
+ 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 1623ff8..9aa19a9 100644
--- a/drivers/net/softnic/rte_eth_softnic_internals.h
+++ b/drivers/net/softnic/rte_eth_softnic_internals.h
@@ -898,6 +898,7 @@ struct softnic_table_rule_action {
struct rte_table_action_stats_params stats;
struct rte_table_action_time_params time;
struct rte_table_action_tag_params tag;
+ struct rte_table_action_decap_params decap;
};
struct rte_flow {
diff --git a/drivers/net/softnic/rte_eth_softnic_thread.c b/drivers/net/softnic/rte_eth_softnic_thread.c
index e1d002e..c8a8d23 100644
--- a/drivers/net/softnic/rte_eth_softnic_thread.c
+++ b/drivers/net/softnic/rte_eth_softnic_thread.c
@@ -2488,6 +2488,16 @@ action_convert(struct rte_table_action *a,
return status;
}
+ if (action->action_mask & (1LLU << RTE_TABLE_ACTION_DECAP)) {
+ status = rte_table_action_apply(a,
+ data,
+ RTE_TABLE_ACTION_DECAP,
+ &action->decap);
+
+ if (status)
+ return status;
+ }
+
return 0;
}