[PATCH v5 11/25] net/nfp: support UDP flow item

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

Add the corresponding logics to support the offload
of UDP item.

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       | 63 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini
index 670c12f..0af740a 100644
--- a/doc/guides/nics/features/nfp.ini
+++ b/doc/guides/nics/features/nfp.ini
@@ -32,6 +32,7 @@ ipv4                 = Y
 ipv6                 = Y
 port_id              = Y
 tcp                  = Y
+udp                  = Y
 vlan                 = Y
 
 [rte_flow actions]
diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index 2e89a22..5dcdbc6 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -537,6 +537,11 @@ struct nfp_mask_id_entry {
 			key_ls->key_layer |= NFP_FLOWER_LAYER_TP;
 			key_ls->key_size += sizeof(struct nfp_flower_tp_ports);
 			break;
+		case RTE_FLOW_ITEM_TYPE_UDP:
+			PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_UDP detected");
+			key_ls->key_layer |= NFP_FLOWER_LAYER_TP;
+			key_ls->key_size += sizeof(struct nfp_flower_tp_ports);
+			break;
 		default:
 			PMD_DRV_LOG(ERR, "Item type %d not supported.", item->type);
 			return -ENOTSUP;
@@ -838,6 +843,47 @@ struct nfp_mask_id_entry {
 	return 0;
 }
 
+static int
+nfp_flow_merge_udp(struct rte_flow *nfp_flow,
+		char **mbuf_off,
+		const struct rte_flow_item *item,
+		const struct nfp_flow_item_proc *proc,
+		bool is_mask)
+{
+	char *ports_off;
+	struct nfp_flower_tp_ports *ports;
+	const struct rte_flow_item_udp *spec;
+	const struct rte_flow_item_udp *mask;
+	struct nfp_flower_meta_tci *meta_tci;
+
+	spec = item->spec;
+	if (spec == NULL) {
+		PMD_DRV_LOG(DEBUG, "nfp flow merge udp: no item->spec!");
+		return 0;
+	}
+
+	meta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;
+	if (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4) {
+		ports_off = *mbuf_off - sizeof(struct nfp_flower_ipv4) -
+			sizeof(struct nfp_flower_tp_ports);
+	} else {/* IPv6 */
+		ports_off = *mbuf_off - sizeof(struct nfp_flower_ipv6) -
+			sizeof(struct nfp_flower_tp_ports);
+	}
+	ports = (struct nfp_flower_tp_ports *)ports_off;
+
+	mask = item->mask ? item->mask : proc->mask_default;
+	if (is_mask) {
+		ports->port_src = mask->hdr.src_port;
+		ports->port_dst = mask->hdr.dst_port;
+	} else {
+		ports->port_src = spec->hdr.src_port;
+		ports->port_dst = spec->hdr.dst_port;
+	}
+
+	return 0;
+}
+
 /* Graph of supported items and associated process function */
 static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = {
 	[RTE_FLOW_ITEM_TYPE_END] = {
@@ -874,7 +920,8 @@ struct nfp_mask_id_entry {
 		.merge = nfp_flow_merge_vlan,
 	},
 	[RTE_FLOW_ITEM_TYPE_IPV4] = {
-		.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP),
+		.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP,
+			RTE_FLOW_ITEM_TYPE_UDP),
 		.mask_support = &(const struct rte_flow_item_ipv4){
 			.hdr = {
 				.type_of_service = 0xff,
@@ -890,7 +937,8 @@ struct nfp_mask_id_entry {
 		.merge = nfp_flow_merge_ipv4,
 	},
 	[RTE_FLOW_ITEM_TYPE_IPV6] = {
-		.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP),
+		.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP,
+			RTE_FLOW_ITEM_TYPE_UDP),
 		.mask_support = &(const struct rte_flow_item_ipv6){
 			.hdr = {
 				.vtc_flow   = RTE_BE32(0x0ff00000),
@@ -919,6 +967,17 @@ struct nfp_mask_id_entry {
 		.mask_sz = sizeof(struct rte_flow_item_tcp),
 		.merge = nfp_flow_merge_tcp,
 	},
+	[RTE_FLOW_ITEM_TYPE_UDP] = {
+		.mask_support = &(const struct rte_flow_item_udp){
+			.hdr = {
+				.src_port = RTE_BE16(0xffff),
+				.dst_port = RTE_BE16(0xffff),
+			},
+		},
+		.mask_default = &rte_flow_item_udp_mask,
+		.mask_sz = sizeof(struct rte_flow_item_udp),
+		.merge = nfp_flow_merge_udp,
+	},
 };
 
 static int
-- 
1.8.3.1