Add the offload support of encap action of IPv6 NVGRE tunnel.
Signed-off-by: Chaoyong He <chaoyong...@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderl...@corigine.com>
---
doc/guides/rel_notes/release_22_11.rst | 1 +
drivers/net/nfp/nfp_flow.c | 45 ++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+)
diff --git a/doc/guides/rel_notes/release_22_11.rst
b/doc/guides/rel_notes/release_22_11.rst
index 4adad3c..e2f7295 100644
--- a/doc/guides/rel_notes/release_22_11.rst
+++ b/doc/guides/rel_notes/release_22_11.rst
@@ -186,6 +186,7 @@ New Features
* Set the DSCP of IPv4 and IPv6
* Encap and decap of VXLAN tunnel
* Encap and decap of GENEVE tunnel
+ * Encap of NVGRE tunnel
* **Updated NXP dpaa2 driver.**
diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index 823b02a..adba6c3 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -51,6 +51,10 @@ struct vxlan_data {
sizeof(struct rte_ipv4_hdr) + \
sizeof(struct rte_flow_item_gre) + \
sizeof(rte_be32_t)) /* gre key */
+#define NVGRE_V6_LEN (sizeof(struct rte_ether_hdr) + \
+ sizeof(struct rte_ipv6_hdr) + \
+ sizeof(struct rte_flow_item_gre) + \
+ sizeof(rte_be32_t)) /* gre key */
/* Process structure associated with a flow item */
struct nfp_flow_item_proc {
@@ -2885,6 +2889,43 @@ struct nfp_pre_tun_entry {
}
static int
+nfp_flow_action_nvgre_encap_v6(struct nfp_app_fw_flower *app_fw_flower,
+ char *act_data,
+ char *actions,
+ const struct rte_flow_action_raw_encap *raw_encap,
+ struct nfp_fl_rule_metadata *nfp_flow_meta,
+ struct nfp_fl_tun *tun)
+{
+ uint8_t tos;
+ const struct rte_ether_hdr *eth;
+ const struct rte_flow_item_ipv6 *ipv6;
+ const struct rte_flow_item_gre *gre;
+ struct nfp_fl_act_pre_tun *pre_tun;
+ struct nfp_fl_act_set_tun *set_tun;
+ size_t act_pre_size = sizeof(struct nfp_fl_act_pre_tun);
+ size_t act_set_size = sizeof(struct nfp_fl_act_set_tun);
+
+ eth = (const struct rte_ether_hdr *)raw_encap->data;
+ ipv6 = (const struct rte_flow_item_ipv6 *)(eth + 1);
+ gre = (const struct rte_flow_item_gre *)(ipv6 + 1);
+
+ pre_tun = (struct nfp_fl_act_pre_tun *)actions;
+ memset(pre_tun, 0, act_pre_size);
+ nfp_flow_pre_tun_v6_process(pre_tun, ipv6->hdr.dst_addr);
+
+ set_tun = (struct nfp_fl_act_set_tun *)(act_data + act_pre_size);
+ memset(set_tun, 0, act_set_size);
+ tos = (ipv6->hdr.vtc_flow >> RTE_IPV6_HDR_TC_SHIFT) & 0xff;
+ nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_GRE, 0,
+ ipv6->hdr.hop_limits, tos);
+ set_tun->tun_proto = gre->protocol;
+
+ /* Send the tunnel neighbor cmsg to fw */
+ return nfp_flower_add_tun_neigh_v6_encap(app_fw_flower, nfp_flow_meta,
+ tun, eth, ipv6);
+}
+
+static int
nfp_flow_action_raw_encap(struct nfp_app_fw_flower *app_fw_flower,
char *act_data,
char *actions,
@@ -2926,6 +2967,10 @@ struct nfp_pre_tun_entry {
ret = nfp_flow_action_nvgre_encap_v4(app_fw_flower, act_data,
actions, raw_encap, nfp_flow_meta, tun);
break;
+ case NVGRE_V6_LEN:
+ ret = nfp_flow_action_nvgre_encap_v6(app_fw_flower, act_data,
+ actions, raw_encap, nfp_flow_meta, tun);
+ break;
default:
PMD_DRV_LOG(ERR, "Not an valid raw encap action conf.");
ret = -EINVAL;
--
1.8.3.1
