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 12/27] net/nfp: support TCP flow item
Date: Fri, 21 Oct 2022 16:01:48 +0800 [thread overview]
Message-ID: <1666339323-24016-13-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 TCP 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 | 91 ++++++++++++++++++++++++++++++++++++++++
drivers/net/nfp/nfp_flow.h | 7 ++++
3 files changed, 99 insertions(+)
diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini
index 4869b45..670c12f 100644
--- a/doc/guides/nics/features/nfp.ini
+++ b/doc/guides/nics/features/nfp.ini
@@ -31,6 +31,7 @@ eth = Y
ipv4 = Y
ipv6 = Y
port_id = Y
+tcp = Y
vlan = Y
[rte_flow actions]
diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index 1da3c89..da6b31a 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -532,6 +532,11 @@ struct nfp_mask_id_entry {
key_ls->key_layer |= NFP_FLOWER_LAYER_IPV6;
key_ls->key_size += sizeof(struct nfp_flower_ipv6);
break;
+ case RTE_FLOW_ITEM_TYPE_TCP:
+ PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_TCP 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;
@@ -755,6 +760,78 @@ struct nfp_mask_id_entry {
return 0;
}
+static int
+nfp_flow_merge_tcp(struct rte_flow *nfp_flow,
+ char **mbuf_off,
+ const struct rte_flow_item *item,
+ const struct nfp_flow_item_proc *proc,
+ bool is_mask)
+{
+ uint8_t tcp_flags;
+ struct nfp_flower_tp_ports *ports;
+ struct nfp_flower_ipv4 *ipv4 = NULL;
+ struct nfp_flower_ipv6 *ipv6 = NULL;
+ const struct rte_flow_item_tcp *spec;
+ const struct rte_flow_item_tcp *mask;
+ struct nfp_flower_meta_tci *meta_tci;
+
+ spec = item->spec;
+ if (spec == NULL) {
+ PMD_DRV_LOG(DEBUG, "nfp flow merge tcp: 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) {
+ ipv4 = (struct nfp_flower_ipv4 *)
+ (*mbuf_off - sizeof(struct nfp_flower_ipv4));
+ ports = (struct nfp_flower_tp_ports *)
+ ((char *)ipv4 - sizeof(struct nfp_flower_tp_ports));
+ } else { /* IPv6 */
+ ipv6 = (struct nfp_flower_ipv6 *)
+ (*mbuf_off - sizeof(struct nfp_flower_ipv6));
+ ports = (struct nfp_flower_tp_ports *)
+ ((char *)ipv6 - sizeof(struct nfp_flower_tp_ports));
+ }
+
+ 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;
+ tcp_flags = mask->hdr.tcp_flags;
+ } else {
+ ports->port_src = spec->hdr.src_port;
+ ports->port_dst = spec->hdr.dst_port;
+ tcp_flags = spec->hdr.tcp_flags;
+ }
+
+ if (ipv4) {
+ if (tcp_flags & RTE_TCP_FIN_FLAG)
+ ipv4->ip_ext.flags |= NFP_FL_TCP_FLAG_FIN;
+ if (tcp_flags & RTE_TCP_SYN_FLAG)
+ ipv4->ip_ext.flags |= NFP_FL_TCP_FLAG_SYN;
+ if (tcp_flags & RTE_TCP_RST_FLAG)
+ ipv4->ip_ext.flags |= NFP_FL_TCP_FLAG_RST;
+ if (tcp_flags & RTE_TCP_PSH_FLAG)
+ ipv4->ip_ext.flags |= NFP_FL_TCP_FLAG_PSH;
+ if (tcp_flags & RTE_TCP_URG_FLAG)
+ ipv4->ip_ext.flags |= NFP_FL_TCP_FLAG_URG;
+ } else { /* IPv6 */
+ if (tcp_flags & RTE_TCP_FIN_FLAG)
+ ipv6->ip_ext.flags |= NFP_FL_TCP_FLAG_FIN;
+ if (tcp_flags & RTE_TCP_SYN_FLAG)
+ ipv6->ip_ext.flags |= NFP_FL_TCP_FLAG_SYN;
+ if (tcp_flags & RTE_TCP_RST_FLAG)
+ ipv6->ip_ext.flags |= NFP_FL_TCP_FLAG_RST;
+ if (tcp_flags & RTE_TCP_PSH_FLAG)
+ ipv6->ip_ext.flags |= NFP_FL_TCP_FLAG_PSH;
+ if (tcp_flags & RTE_TCP_URG_FLAG)
+ ipv6->ip_ext.flags |= NFP_FL_TCP_FLAG_URG;
+ }
+
+ 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] = {
@@ -791,6 +868,7 @@ struct nfp_mask_id_entry {
.merge = nfp_flow_merge_vlan,
},
[RTE_FLOW_ITEM_TYPE_IPV4] = {
+ .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP),
.mask_support = &(const struct rte_flow_item_ipv4){
.hdr = {
.type_of_service = 0xff,
@@ -806,6 +884,7 @@ struct nfp_mask_id_entry {
.merge = nfp_flow_merge_ipv4,
},
[RTE_FLOW_ITEM_TYPE_IPV6] = {
+ .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP),
.mask_support = &(const struct rte_flow_item_ipv6){
.hdr = {
.vtc_flow = RTE_BE32(0x0ff00000),
@@ -822,6 +901,18 @@ struct nfp_mask_id_entry {
.mask_sz = sizeof(struct rte_flow_item_ipv6),
.merge = nfp_flow_merge_ipv6,
},
+ [RTE_FLOW_ITEM_TYPE_TCP] = {
+ .mask_support = &(const struct rte_flow_item_tcp){
+ .hdr = {
+ .tcp_flags = 0xff,
+ .src_port = RTE_BE16(0xffff),
+ .dst_port = RTE_BE16(0xffff),
+ },
+ },
+ .mask_default = &rte_flow_item_tcp_mask,
+ .mask_sz = sizeof(struct rte_flow_item_tcp),
+ .merge = nfp_flow_merge_tcp,
+ },
};
static int
diff --git a/drivers/net/nfp/nfp_flow.h b/drivers/net/nfp/nfp_flow.h
index 40cd062..0ad89e5 100644
--- a/drivers/net/nfp/nfp_flow.h
+++ b/drivers/net/nfp/nfp_flow.h
@@ -24,6 +24,13 @@
#define NFP_FLOWER_LAYER2_GENEVE_OP RTE_BIT32(6)
#define NFP_FLOWER_LAYER2_TUN_IPV6 RTE_BIT32(7)
+/* Compressed HW representation of TCP Flags */
+#define NFP_FL_TCP_FLAG_FIN RTE_BIT32(0)
+#define NFP_FL_TCP_FLAG_SYN RTE_BIT32(1)
+#define NFP_FL_TCP_FLAG_RST RTE_BIT32(2)
+#define NFP_FL_TCP_FLAG_PSH RTE_BIT32(3)
+#define NFP_FL_TCP_FLAG_URG RTE_BIT32(4)
+
#define NFP_FL_META_FLAG_MANAGE_MASK RTE_BIT32(7)
#define NFP_FLOWER_MASK_VLAN_CFI RTE_BIT32(12)
--
1.8.3.1
next prev parent reply other threads:[~2022-10-21 8:04 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 ` [PATCH v6 09/27] net/nfp: support VLAN flow item Chaoyong He
2022-10-21 8:01 ` [PATCH v6 10/27] net/nfp: support IPv4 " Chaoyong He
2022-10-21 8:01 ` [PATCH v6 11/27] net/nfp: support IPv6 " Chaoyong He
2022-10-21 8:01 ` Chaoyong He [this message]
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-13-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).