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 v6 09/27] net/nfp: support VLAN flow item
Date: Fri, 21 Oct 2022 16:01:45 +0800	[thread overview]
Message-ID: <1666339323-24016-10-git-send-email-chaoyong.he@corigine.com> (raw)
In-Reply-To: <1666339323-24016-1-git-send-email-chaoyong.he@corigine.com>

Add the corresponding data structure and logics, to support
the offload of VLAN 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       | 46 ++++++++++++++++++++++++++++++++++++++++
 drivers/net/nfp/nfp_flow.h       |  2 ++
 3 files changed, 49 insertions(+)

diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini
index f91da82..b0af2a0 100644
--- a/doc/guides/nics/features/nfp.ini
+++ b/doc/guides/nics/features/nfp.ini
@@ -29,6 +29,7 @@ Usage doc            = Y
 [rte_flow items]
 eth                  = Y
 port_id              = Y
+vlan                 = Y
 
 [rte_flow actions]
 count                = Y
diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index 36b1221..802fa6a 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -518,6 +518,10 @@ struct nfp_mask_id_entry {
 					ethdev->data->dev_private;
 			key_ls->port = rte_cpu_to_be_32(representor->port_id);
 			break;
+		case RTE_FLOW_ITEM_TYPE_VLAN:
+			PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_VLAN detected");
+			key_ls->vlan = NFP_FLOWER_MASK_VLAN_CFI;
+			break;
 		default:
 			PMD_DRV_LOG(ERR, "Item type %d not supported.", item->type);
 			return -ENOTSUP;
@@ -623,12 +627,42 @@ struct nfp_mask_id_entry {
 	return 0;
 }
 
+static int
+nfp_flow_merge_vlan(struct rte_flow *nfp_flow,
+		__rte_unused char **mbuf_off,
+		const struct rte_flow_item *item,
+		const struct nfp_flow_item_proc *proc,
+		bool is_mask)
+{
+	struct nfp_flower_meta_tci *meta_tci;
+	const struct rte_flow_item_vlan *spec;
+	const struct rte_flow_item_vlan *mask;
+
+	spec = item->spec;
+	if (spec == NULL) {
+		PMD_DRV_LOG(DEBUG, "nfp flow merge vlan: no item->spec!");
+		return 0;
+	}
+
+	mask = item->mask ? item->mask : proc->mask_default;
+	if (is_mask) {
+		meta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.mask_data;
+		meta_tci->tci |= mask->tci;
+	} else {
+		meta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;
+		meta_tci->tci |= spec->tci;
+	}
+
+	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] = {
 		.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH),
 	},
 	[RTE_FLOW_ITEM_TYPE_ETH] = {
+		.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VLAN),
 		.mask_support = &(const struct rte_flow_item_eth){
 			.hdr = {
 				.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
@@ -641,6 +675,18 @@ struct nfp_mask_id_entry {
 		.mask_sz = sizeof(struct rte_flow_item_eth),
 		.merge = nfp_flow_merge_eth,
 	},
+	[RTE_FLOW_ITEM_TYPE_VLAN] = {
+		.mask_support = &(const struct rte_flow_item_vlan){
+			.hdr = {
+				.vlan_tci  = RTE_BE16(0xefff),
+				.eth_proto = RTE_BE16(0xffff),
+			},
+			.has_more_vlan = 1,
+		},
+		.mask_default = &rte_flow_item_vlan_mask,
+		.mask_sz = sizeof(struct rte_flow_item_vlan),
+		.merge = nfp_flow_merge_vlan,
+	},
 };
 
 static int
diff --git a/drivers/net/nfp/nfp_flow.h b/drivers/net/nfp/nfp_flow.h
index 2fdffa1..40cd062 100644
--- a/drivers/net/nfp/nfp_flow.h
+++ b/drivers/net/nfp/nfp_flow.h
@@ -26,6 +26,8 @@
 
 #define NFP_FL_META_FLAG_MANAGE_MASK    RTE_BIT32(7)
 
+#define NFP_FLOWER_MASK_VLAN_CFI        RTE_BIT32(12)
+
 #define NFP_MASK_TABLE_ENTRIES          1024
 
 /* The maximum action list size (in bytes) supported by the NFP. */
-- 
1.8.3.1


  parent reply	other threads:[~2022-10-21  8:03 UTC|newest]

Thread overview: 96+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-18 11:26 [PATCH v4 00/25] add the basic rte_flow offload support of nfp PMD Chaoyong He
2022-10-18 11:26 ` [PATCH v4 01/25] net/nfp: fix the requirement of cpp bridge service Chaoyong He
2022-10-18 12:39   ` Ferruh Yigit
2022-10-18 11:26 ` [PATCH v4 02/25] net/nfp: add the structures and functions for flow offload Chaoyong He
2022-10-18 11:26 ` [PATCH v4 03/25] net/nfp: add the stats process logic in ctrl VNIC service Chaoyong He
2022-10-18 11:26 ` [PATCH v4 04/25] net/nfp: add the flow APIs of nfp PMD Chaoyong He
2022-10-18 11:26 ` [PATCH v4 05/25] net/nfp: support basic flow items Chaoyong He
2022-10-18 11:26 ` [PATCH v4 06/25] net/nfp: support basic flow actions Chaoyong He
2022-10-18 11:26 ` [PATCH v4 07/25] net/nfp: support VLAN flow item Chaoyong He
2022-10-18 11:26 ` [PATCH v4 08/25] net/nfp: support IPv4 " Chaoyong He
2022-10-18 11:26 ` [PATCH v4 09/25] net/nfp: support IPv6 " Chaoyong He
2022-10-18 11:26 ` [PATCH v4 10/25] net/nfp: support TCP " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 11/25] net/nfp: support UDP " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 12/25] net/nfp: support SCTP " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 13/25] net/nfp: support SRC MAC flow action Chaoyong He
2022-10-18 11:27 ` [PATCH v4 14/25] net/nfp: support DST " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 15/25] net/nfp: support pop VLAN " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 16/25] net/nfp: support push " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 17/25] net/nfp: support SRC IPv4 " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 18/25] net/nfp: support DST " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 19/25] net/nfp: support SRC IPv6 " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 20/25] net/nfp: support DST " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 21/25] net/nfp: support TP SRC " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 22/25] net/nfp: support TP DST " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 23/25] net/nfp: support TTL " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 24/25] net/nfp: support IPv4 DSCP " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 25/25] net/nfp: support IPv6 " Chaoyong He
2022-10-18 12:27 ` [PATCH v4 00/25] add the basic rte_flow offload support of nfp PMD Ferruh Yigit
2022-10-20  2:19 ` [PATCH v5 " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 01/25] net/nfp: fix CPP bridge service requirement Chaoyong He
2022-10-20  2:19   ` [PATCH v5 02/25] net/nfp: add the structures and functions for flow offload Chaoyong He
2022-10-20  2:19   ` [PATCH v5 03/25] net/nfp: add the stats process logic in ctrl VNIC service Chaoyong He
2022-10-20  2:19   ` [PATCH v5 04/25] net/nfp: add the flow APIs of nfp PMD Chaoyong He
2022-10-20 11:09     ` Ferruh Yigit
2022-10-20 11:42       ` Chaoyong He
2022-10-20  2:19   ` [PATCH v5 05/25] net/nfp: support basic flow items Chaoyong He
2022-10-20 11:11     ` Ferruh Yigit
2022-10-20 11:43       ` Chaoyong He
2022-10-20  2:19   ` [PATCH v5 06/25] net/nfp: support basic flow actions Chaoyong He
2022-10-20 11:12     ` Ferruh Yigit
2022-10-20 11:41       ` Chaoyong He
2022-10-20  2:19   ` [PATCH v5 07/25] net/nfp: support VLAN flow item Chaoyong He
2022-10-20  2:19   ` [PATCH v5 08/25] net/nfp: support IPv4 " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 09/25] net/nfp: support IPv6 " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 10/25] net/nfp: support TCP " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 11/25] net/nfp: support UDP " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 12/25] net/nfp: support SCTP " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 13/25] net/nfp: support SRC MAC flow action Chaoyong He
2022-10-20 11:12     ` Ferruh Yigit
2022-10-20 11:48       ` Chaoyong He
2022-10-20 11:55         ` Ferruh Yigit
2022-10-20  2:19   ` [PATCH v5 14/25] net/nfp: support DST " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 15/25] net/nfp: support pop VLAN " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 16/25] net/nfp: support push " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 17/25] net/nfp: support SRC IPv4 " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 18/25] net/nfp: support DST " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 19/25] net/nfp: support SRC IPv6 " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 20/25] net/nfp: support DST " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 21/25] net/nfp: support TP SRC " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 22/25] net/nfp: support TP DST " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 23/25] net/nfp: support TTL " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 24/25] net/nfp: support IPv4 DSCP " Chaoyong He
2022-10-20  2:19   ` [PATCH v5 25/25] net/nfp: support IPv6 " Chaoyong He
2022-10-21  8:01   ` [PATCH v6 00/27] add the basic rte_flow offload support of nfp PMD Chaoyong He
2022-10-21  8:01     ` [PATCH v6 01/27] net/nfp: fix CPP bridge service requirement Chaoyong He
2022-10-21  8:01     ` [PATCH v6 02/27] net/nfp: fix the promiscuous mode control functions Chaoyong He
2022-10-21 13:03       ` Ferruh Yigit
2022-10-22  6:49         ` Chaoyong He
2022-10-22  8:11       ` [PATCH v7] net/nfp: fix the promiscuous mode functions Chaoyong He
2022-10-24 12:31         ` Ferruh Yigit
2022-10-21  8:01     ` [PATCH v6 03/27] net/nfp: fix the service stuck the app end Chaoyong He
2022-10-21  8:01     ` [PATCH v6 04/27] net/nfp: add the structures and functions for flow offload Chaoyong He
2022-10-21  8:01     ` [PATCH v6 05/27] net/nfp: add the stats process logic in ctrl VNIC service Chaoyong He
2022-10-21  8:01     ` [PATCH v6 06/27] net/nfp: add the flow APIs of nfp PMD Chaoyong He
2022-10-21  8:01     ` [PATCH v6 07/27] net/nfp: support basic flow items Chaoyong He
2022-10-21  8:01     ` [PATCH v6 08/27] net/nfp: support basic flow actions Chaoyong He
2022-10-21  8:01     ` Chaoyong He [this message]
2022-10-21  8:01     ` [PATCH v6 10/27] net/nfp: support IPv4 flow item Chaoyong He
2022-10-21  8:01     ` [PATCH v6 11/27] net/nfp: support IPv6 " Chaoyong He
2022-10-21  8:01     ` [PATCH v6 12/27] net/nfp: support TCP " Chaoyong He
2022-10-21  8:01     ` [PATCH v6 13/27] net/nfp: support UDP " Chaoyong He
2022-10-21  8:01     ` [PATCH v6 14/27] net/nfp: support SCTP " Chaoyong He
2022-10-21  8:01     ` [PATCH v6 15/27] net/nfp: support SRC MAC flow action Chaoyong He
2022-10-21  8:01     ` [PATCH v6 16/27] net/nfp: support DST " Chaoyong He
2022-10-21  8:01     ` [PATCH v6 17/27] net/nfp: support pop VLAN " Chaoyong He
2022-10-21  8:01     ` [PATCH v6 18/27] net/nfp: support push " Chaoyong He
2022-10-21  8:01     ` [PATCH v6 19/27] net/nfp: support SRC IPv4 " Chaoyong He
2022-10-21  8:01     ` [PATCH v6 20/27] net/nfp: support DST " Chaoyong He
2022-10-21  8:01     ` [PATCH v6 21/27] net/nfp: support SRC IPv6 " Chaoyong He
2022-10-21  8:01     ` [PATCH v6 22/27] net/nfp: support DST " Chaoyong He
2022-10-21  8:01     ` [PATCH v6 23/27] net/nfp: support TP SRC " Chaoyong He
2022-10-21  8:02     ` [PATCH v6 24/27] net/nfp: support TP DST " Chaoyong He
2022-10-21  8:02     ` [PATCH v6 25/27] net/nfp: support TTL " Chaoyong He
2022-10-21  8:02     ` [PATCH v6 26/27] net/nfp: support IPv4 DSCP " Chaoyong He
2022-10-21  8:02     ` [PATCH v6 27/27] net/nfp: support IPv6 " Chaoyong He
2022-10-21 13:04     ` [PATCH v6 00/27] add the basic rte_flow offload support of nfp PMD Ferruh Yigit

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=1666339323-24016-10-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).