DPDK patches and discussions
 help / color / mirror / Atom feed
From: Chaoyong He <chaoyong.he@corigine.com>
To: dev@dpdk.org
Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com,
	Chaoyong He <chaoyong.he@corigine.com>
Subject: [PATCH v2 10/24] net/nfp: add the offload support of UDP item
Date: Mon, 10 Oct 2022 14:08:48 +0800	[thread overview]
Message-ID: <1665382142-21684-11-git-send-email-chaoyong.he@corigine.com> (raw)
In-Reply-To: <1665382142-21684-1-git-send-email-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 +
 doc/guides/rel_notes/release_22_11.rst |  1 +
 drivers/net/nfp/nfp_flow.c             | 63 ++++++++++++++++++++++++++++++++--
 3 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini
index 66ee03c..f6ba2eb 100644
--- a/doc/guides/nics/features/nfp.ini
+++ b/doc/guides/nics/features/nfp.ini
@@ -33,6 +33,7 @@ ipv6                 = Y
 ipv6_frag_ext        = Y
 port_id              = Y
 tcp                  = Y
+udp                  = Y
 vlan                 = Y
 
 [rte_flow actions]
diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst
index 95e5ed2..2c4afa8 100644
--- a/doc/guides/rel_notes/release_22_11.rst
+++ b/doc/guides/rel_notes/release_22_11.rst
@@ -158,6 +158,7 @@ New Features
     * IPv4
     * IPv6
     * TCP
+    * UDP
 
   Add the support of rte_flow actions as follow:
 
diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index f1d1bba..b20a341 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -549,6 +549,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;
@@ -850,6 +855,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] = {
@@ -886,7 +932,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,
@@ -902,7 +949,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),
@@ -931,6 +979,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


  parent reply	other threads:[~2022-10-10  6:10 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-10  6:08 [PATCH v2 00/24] add the basic rte_flow offload support of nfp PMD Chaoyong He
2022-10-10  6:08 ` [PATCH v2 01/24] net/nfp: add the stats process logic in ctrl VNIC service Chaoyong He
2022-10-10 14:48   ` Ferruh Yigit
2022-10-10  6:08 ` [PATCH v2 02/24] net/nfp: add the structures and functions for flow offload Chaoyong He
2022-10-10 14:49   ` Ferruh Yigit
2022-10-19  2:50     ` Chaoyong He
2022-10-19 10:48       ` Ferruh Yigit
2022-10-10  6:08 ` [PATCH v2 03/24] net/nfp: add the flow APIs of nfp PMD Chaoyong He
2022-10-10 14:51   ` Ferruh Yigit
2022-10-19  3:00     ` Chaoyong He
2022-10-19 11:11       ` Ferruh Yigit
2022-10-19 11:30         ` Chaoyong He
2022-10-19 11:38           ` Ferruh Yigit
2022-10-10  6:08 ` [PATCH v2 04/24] net/nfp: add the offload support of basic items Chaoyong He
2022-10-10  6:08 ` [PATCH v2 05/24] net/nfp: add the offload support of basic actions Chaoyong He
2022-10-10 14:52   ` Ferruh Yigit
2022-10-19 11:32     ` Chaoyong He
2022-10-10  6:08 ` [PATCH v2 06/24] net/nfp: add the offload support of VLAN item Chaoyong He
2022-10-10  6:08 ` [PATCH v2 07/24] net/nfp: add the offload support of IPv4 item Chaoyong He
2022-10-10  6:08 ` [PATCH v2 08/24] net/nfp: add the offload support of IPv6 item Chaoyong He
2022-10-10 14:53   ` Ferruh Yigit
2022-10-19 11:33     ` Chaoyong He
2022-10-10  6:08 ` [PATCH v2 09/24] net/nfp: add the offload support of TCP item Chaoyong He
2022-10-10  6:08 ` Chaoyong He [this message]
2022-10-10  6:08 ` [PATCH v2 11/24] net/nfp: add the offload support of SCTP item Chaoyong He
2022-10-10  6:08 ` [PATCH v2 12/24] net/nfp: add the offload support of set SRC MAC action Chaoyong He
2022-10-10  6:08 ` [PATCH v2 13/24] net/nfp: add the offload support of set DST " Chaoyong He
2022-10-10  6:08 ` [PATCH v2 14/24] net/nfp: add the offload support of pop VLAN action Chaoyong He
2022-10-10  6:08 ` [PATCH v2 15/24] net/nfp: add the offload support of push " Chaoyong He
2022-10-10  6:08 ` [PATCH v2 16/24] net/nfp: add the offload support of set SRC IPv4 action Chaoyong He
2022-10-10  6:08 ` [PATCH v2 17/24] net/nfp: add the offload support of set DST " Chaoyong He
2022-10-10  6:08 ` [PATCH v2 18/24] net/nfp: add the offload support of set SRC IPv6 action Chaoyong He
2022-10-10  6:08 ` [PATCH v2 19/24] net/nfp: add the offload support of set DST " Chaoyong He
2022-10-10  6:08 ` [PATCH v2 20/24] net/nfp: add the offload support of set TP SRC port action Chaoyong He
2022-10-10  6:08 ` [PATCH v2 21/24] net/nfp: add the offload support of set TP DST " Chaoyong He
2022-10-10  6:09 ` [PATCH v2 22/24] net/nfp: add the offload support of set TTL action Chaoyong He
2022-10-10  6:09 ` [PATCH v2 23/24] net/nfp: add the offload support of set IPv4 DSCP action Chaoyong He
2022-10-10  6:09 ` [PATCH v2 24/24] net/nfp: add the offload support of set IPv6 " Chaoyong He

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1665382142-21684-11-git-send-email-chaoyong.he@corigine.com \
    --to=chaoyong.he@corigine.com \
    --cc=dev@dpdk.org \
    --cc=niklas.soderlund@corigine.com \
    --cc=oss-drivers@corigine.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).