[PATCH v2 17/25] net/nfp: support IPv4 NVGRE encap flow action

[Chaoyong He <chaoyong.he@corigine.com>]

Add the offload support of encap action of IPv4 NVGRE tunnel.

Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
---
 doc/guides/nics/features/nfp.ini |  1 +
 drivers/net/nfp/nfp_flow.c       | 43 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini
index c017be1..f6b658b 100644
--- a/doc/guides/nics/features/nfp.ini
+++ b/doc/guides/nics/features/nfp.ini
@@ -41,6 +41,7 @@ vxlan                = Y
 [rte_flow actions]
 count                = Y
 drop                 = Y
+nvgre_encap          = Y
 of_pop_vlan          = Y
 of_push_vlan         = Y
 of_set_vlan_pcp      = Y
diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index c7daa14..00b4c6d 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -47,6 +47,10 @@ struct vxlan_data {
 				sizeof(struct rte_ipv6_hdr) + \
 				sizeof(struct rte_udp_hdr) + \
 				sizeof(struct rte_flow_item_geneve))
+#define NVGRE_V4_LEN     (sizeof(struct rte_ether_hdr) + \
+				sizeof(struct rte_ipv4_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 {
@@ -2828,6 +2832,41 @@ struct nfp_pre_tun_entry {
 }
 
 static int
+nfp_flow_action_nvgre_encap_v4(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)
+{
+	const struct rte_ether_hdr *eth;
+	const struct rte_flow_item_ipv4 *ipv4;
+	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;
+	ipv4 = (const struct rte_flow_item_ipv4 *)(eth + 1);
+	gre  = (const struct rte_flow_item_gre *)(ipv4 + 1);
+
+	pre_tun = (struct nfp_fl_act_pre_tun *)actions;
+	memset(pre_tun, 0, act_pre_size);
+	nfp_flow_pre_tun_v4_process(pre_tun, ipv4->hdr.dst_addr);
+
+	set_tun = (struct nfp_fl_act_set_tun *)(act_data + act_pre_size);
+	memset(set_tun, 0, act_set_size);
+	nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_GRE, 0,
+			ipv4->hdr.time_to_live, ipv4->hdr.type_of_service);
+	set_tun->tun_proto = gre->protocol;
+
+	/* Send the tunnel neighbor cmsg to fw */
+	return nfp_flower_add_tun_neigh_v4_encap(app_fw_flower, nfp_flow_meta,
+			tun, eth, ipv4);
+}
+
+static int
 nfp_flow_action_raw_encap(struct nfp_app_fw_flower *app_fw_flower,
 		char *act_data,
 		char *actions,
@@ -2865,6 +2904,10 @@ struct nfp_pre_tun_entry {
 		ret = nfp_flow_action_geneve_encap_v6(app_fw_flower, act_data,
 				actions, raw_encap, nfp_flow_meta, tun);
 		break;
+	case NVGRE_V4_LEN:
+		ret = nfp_flow_action_nvgre_encap_v4(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