[PATCH v3 19/26] net/nfp: support IPv6 NVGRE encap flow action

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

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

Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
---
 drivers/net/nfp/nfp_flow.c | 45 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index cc09ba45e2..06115cc954 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 {
@@ -2866,6 +2870,43 @@ nfp_flow_action_nvgre_encap_v4(struct nfp_app_fw_flower *app_fw_flower,
 			tun, eth, ipv4);
 }
 
+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,
@@ -2908,6 +2949,10 @@ nfp_flow_action_raw_encap(struct nfp_app_fw_flower *app_fw_flower,
 		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;
-- 
2.29.3