Skip to contentSkip to conversation

net/ice: add support for Auxiliary IP Offset Rx descriptor

PATCH Applied Junfeng Guo 3 participants 3 messages Aug 26, 2020 – Aug 31, 2020 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/ice: add support for Auxiliary IP Offset Rx descriptor

Add RXDID #25 to support Auxiliary IP Offset Rx descriptor, including
FlexiMD.4: Outer/Single IPv4 Header offset FlexiMD.5: Outer/Single IPv6 Header offset
And parse the valid IP Offset into mbuf by flexible descriptor section via devargs "proto_xtr" with "proto_xtr=ip_offset".

This patch depends on:
commit e0c8ed904083 (net/ice: optimize the FlexiMD hardware check)

---
 doc/guides/nics/ice.rst                 | 14 ++++-
 drivers/net/ice/base/ice_lan_tx_rx.h    |  1 +
 drivers/net/ice/ice_ethdev.c            | 10 +++-
 drivers/net/ice/ice_ethdev.h            |  1 +
 drivers/net/ice/ice_rxtx.c              | 77 +++++++++++++++++--------
 drivers/net/ice/rte_pmd_ice.h           | 13 +++++
 drivers/net/ice/rte_pmd_ice_version.map |  1 +
 7 files changed, 90 insertions(+), 27 deletions(-)
doc/guides/nics/ice.rst +13 -1
index 9a9f4a6bb..ffaaad4e4 100644
@@ -102,7 +102,7 @@ Runtime Config Options
   The grouping ``()`` can be omitted for single element group. If no queues are
   specified, PMD will use this protocol extraction type for all queues.
 
-  Protocol is : ``vlan, ipv4, ipv6, ipv6_flow, tcp``.
+  Protocol is : ``vlan, ipv4, ipv6, ipv6_flow, tcp, ip_offset``.
 
   .. code-block:: console
 
@@ -183,6 +183,18 @@ Runtime Config Options
 
   TCPHDR2 - Reserved
 
+  .. table:: Protocol extraction : ``ip_offset``
+
+   +----------------------------+----------------------------+
+   |           IPHDR2           |           IPHDR1           |
+   +============================+============================+
+   |       IPv6 HDR Offset      |       IPv4 HDR Offset      |
+   +----------------------------+----------------------------+
+
+  IPHDR1 - Outer/Single IPv4 Header offset.
+
+  IPHDR2 - Outer/Single IPv6 Header offset.
+
   Use ``rte_net_ice_dynf_proto_xtr_metadata_get`` to access the protocol
   extraction metadata, and use ``RTE_PKT_RX_DYNF_PROTO_XTR_*`` to get the
   metadata type of ``struct rte_mbuf::ol_flags``.
drivers/net/ice/base/ice_lan_tx_rx.h +1 -0
index c47114d16..ec0c9f3ab 100644
@@ -715,6 +715,7 @@ enum ice_rxdid {
 	ICE_RXDID_COMMS_AUX_IPV6	= 19,
 	ICE_RXDID_COMMS_AUX_IPV6_FLOW	= 20,
 	ICE_RXDID_COMMS_AUX_TCP		= 21,
+	ICE_RXDID_COMMS_AUX_IP_OFFSET   = 25,
 	ICE_RXDID_LAST			= 63,
 };
 
drivers/net/ice/ice_ethdev.c +9 -1
index d67390f29..4a161ae8a 100644
@@ -65,6 +65,9 @@ static struct proto_xtr_ol_flag ice_proto_xtr_ol_flag_params[] = {
 	[PROTO_XTR_TCP] = {
 		.param = { .name = "ice_dynflag_proto_xtr_tcp" },
 		.ol_flag = &rte_net_ice_dynflag_proto_xtr_tcp_mask },
+	[PROTO_XTR_IP_OFFSET] = {
+		.param = { .name = "ice_dynflag_proto_xtr_ip_offset" },
+		.ol_flag = &rte_net_ice_dynflag_proto_xtr_ip_offset_mask },
 };
 
 #define ICE_DFLT_OUTER_TAG_TYPE ICE_AQ_VSI_OUTER_TAG_VLAN_9100
@@ -323,6 +326,7 @@ lookup_proto_xtr_type(const char *xtr_name)
 		{ "ipv6",      PROTO_XTR_IPV6      },
 		{ "ipv6_flow", PROTO_XTR_IPV6_FLOW },
 		{ "tcp",       PROTO_XTR_TCP       },
+		{ "ip_offset", PROTO_XTR_IP_OFFSET },
 	};
 	uint32_t i;
 
@@ -568,6 +572,10 @@ ice_check_proto_xtr_support(struct ice_hw *hw)
 		[PROTO_XTR_TCP] = { ICE_RXDID_COMMS_AUX_TCP,
 				    ICE_RX_OPC_EXTRACT,
 				    ICE_PROT_TCP_IL, ICE_PROT_ID_INVAL },
+		[PROTO_XTR_IP_OFFSET] = { ICE_RXDID_COMMS_AUX_IP_OFFSET,
+					  ICE_RX_OPC_PROTID,
+					  ICE_PROT_IPV4_OF_OR_S,
+					  ICE_PROT_IPV6_OF_OR_S },
 	};
 	uint32_t i;
 
@@ -5145,7 +5153,7 @@ RTE_PMD_REGISTER_PCI(net_ice, rte_ice_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_ice, pci_id_ice_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_ice, "* igb_uio | uio_pci_generic | vfio-pci");
 RTE_PMD_REGISTER_PARAM_STRING(net_ice,
-			      ICE_PROTO_XTR_ARG "=[queue:]<vlan|ipv4|ipv6|ipv6_flow|tcp>"
+			      ICE_PROTO_XTR_ARG "=[queue:]<vlan|ipv4|ipv6|ipv6_flow|tcp|ip_offset>"
 			      ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>"
 			      ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>"
 			      ICE_FLOW_MARK_SUPPORT_ARG "=<0|1>");
drivers/net/ice/ice_ethdev.h +1 -0
index 06b9b8683..758caa8b4 100644
@@ -262,6 +262,7 @@ enum proto_xtr_type {
 	PROTO_XTR_IPV6,
 	PROTO_XTR_IPV6_FLOW,
 	PROTO_XTR_TCP,
+	PROTO_XTR_IP_OFFSET,
 	PROTO_XTR_MAX /* The last one */
 };
 
drivers/net/ice/ice_rxtx.c +52 -25

108 lines not on this page · raw message

drivers/net/ice/rte_pmd_ice.h +13 -0
index e254db053..9a436a140 100644
@@ -78,6 +78,8 @@ union rte_net_ice_proto_xtr_metadata {
 			 doff:4;
 		uint16_t rsvd;
 	} tcp;
+
+	uint32_t ip_ofs;
 };
 
 /* Offset of mbuf dynamic field for protocol extraction data */
@@ -89,6 +91,7 @@ extern uint64_t rte_net_ice_dynflag_proto_xtr_ipv4_mask;
 extern uint64_t rte_net_ice_dynflag_proto_xtr_ipv6_mask;
 extern uint64_t rte_net_ice_dynflag_proto_xtr_ipv6_flow_mask;
 extern uint64_t rte_net_ice_dynflag_proto_xtr_tcp_mask;
+extern uint64_t rte_net_ice_dynflag_proto_xtr_ip_offset_mask;
 
 /**
  * The mbuf dynamic field pointer for protocol extraction metadata.
@@ -133,6 +136,13 @@ extern uint64_t rte_net_ice_dynflag_proto_xtr_tcp_mask;
 #define RTE_PKT_RX_DYNF_PROTO_XTR_TCP \
 	(rte_net_ice_dynflag_proto_xtr_tcp_mask)
 
+/**
+ * The mbuf dynamic flag for IP_OFFSET extraction metadata, it is valid
+ * when dev_args 'proto_xtr' has 'ip_offset' specified.
+ */
+#define RTE_PKT_RX_DYNF_PROTO_XTR_IP_OFFSET \
+	(rte_net_ice_dynflag_proto_xtr_ip_offset_mask)
+
 /**
  * Check if mbuf dynamic field for protocol extraction metadata is registered.
  *
@@ -222,6 +232,9 @@ rte_net_ice_dump_proto_xtr_metadata(struct rte_mbuf *m)
 		       data.tcp.rst ? "R" : "",
 		       data.tcp.syn ? "S" : "",
 		       data.tcp.fin ? "F" : "");
+	else if (m->ol_flags & RTE_PKT_RX_DYNF_PROTO_XTR_IP_OFFSET)
+		printf(" - Protocol Offset:ip_offset=%u",
+		       data.ip_ofs);
 }
 
 #ifdef __cplusplus
drivers/net/ice/rte_pmd_ice_version.map +1 -0
index 91f40225e..632a296a0 100644
@@ -12,4 +12,5 @@ EXPERIMENTAL {
 	rte_net_ice_dynflag_proto_xtr_ipv6_mask;
 	rte_net_ice_dynflag_proto_xtr_ipv6_flow_mask;
 	rte_net_ice_dynflag_proto_xtr_tcp_mask;
+	rte_net_ice_dynflag_proto_xtr_ip_offset_mask;
 };
Signature · 1 line
2.25.1
Acked-by on v1 1/1
#1 lore raw
Quoted 28 lines

-----Original Message-----
From: Guo, Junfeng <[email protected]>
Sent: Wednesday, August 26, 2020 11:22
To: Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>; Xing, Beilei <[email protected]>
Cc: [email protected]; Wang, Haiyue <[email protected]>; Guo, Junfeng <[email protected]>
Subject: [PATCH] net/ice: add support for Auxiliary IP Offset Rx descriptor

Add RXDID #25 to support Auxiliary IP Offset Rx descriptor, including
FlexiMD.4: Outer/Single IPv4 Header offset FlexiMD.5: Outer/Single IPv6 Header offset
And parse the valid IP Offset into mbuf by flexible descriptor section via devargs "proto_xtr" with "proto_xtr=ip_offset".

This patch depends on:
commit e0c8ed904083 (net/ice: optimize the FlexiMD hardware check)

---
 doc/guides/nics/ice.rst                 | 14 ++++-
 drivers/net/ice/base/ice_lan_tx_rx.h    |  1 +
 drivers/net/ice/ice_ethdev.c            | 10 +++-
 drivers/net/ice/ice_ethdev.h            |  1 +
 drivers/net/ice/ice_rxtx.c              | 77 +++++++++++++++++--------
 drivers/net/ice/rte_pmd_ice.h           | 13 +++++
 drivers/net/ice/rte_pmd_ice_version.map |  1 +
 7 files changed, 90 insertions(+), 27 deletions(-)

[...]

drivers/net/ice/ice_rxtx.c ice_rxd_to_proto_xtr(struct rte_mbuf *mb, · line 1348

Quoted 4 lines
drivers/net/ice/ice_rxtx.c +4 -0
+		/**
+		 * No need to check XTR_MD.#_VLD bit in Status/Error fields for
+		 * Protocol Offset according to CPK HAS 7.9.8.
+		 */

These comments are no need, since HAS doc session is internal information, and the code is clean enough: if (chk_valid) ... else...

drivers/net/ice/ice_rxtx.c ice_rxd_to_proto_xtr(struct rte_mbuf *mb, · line 1352

Quoted 4 lines
drivers/net/ice/ice_rxtx.c +4 -0
+		if (rte_le_to_cpu_16(desc->flex_ts.flex.aux0) != 0xFFFF)
+			metadata = rte_le_to_cpu_16(desc->flex_ts.flex.aux0);
+		else if (rte_le_to_cpu_16(desc->flex_ts.flex.aux1) != 0xFFFF)
+			metadata = rte_le_to_cpu_16(desc->flex_ts.flex.aux1);

Others,

Quoted 1 line

2.25.1

Applied
#2 lore raw
Quoted 52 lines

-----Original Message-----
From: Wang, Haiyue <[email protected]>
Sent: Monday, August 31, 2020 1:34 PM
To: Guo, Junfeng <[email protected]>; Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>; Xing, Beilei <[email protected]>
Cc: [email protected]
Subject: RE: [PATCH] net/ice: add support for Auxiliary IP Offset Rx descriptor

Quoted 30 lines

-----Original Message-----
From: Guo, Junfeng <[email protected]>
Sent: Wednesday, August 26, 2020 11:22
To: Zhang, Qi Z <[email protected]>; Wu, Jingjing <[email protected]>; Xing, Beilei <[email protected]>
Cc: [email protected]; Wang, Haiyue <[email protected]>; Guo, Junfeng <[email protected]>
Subject: [PATCH] net/ice: add support for Auxiliary IP Offset Rx descriptor

Add RXDID #25 to support Auxiliary IP Offset Rx descriptor, including FlexiMD.4: Outer/Single IPv4 Header offset
FlexiMD.5: Outer/Single IPv6 Header offset And parse the valid IP Offset into mbuf by flexible descriptor section via devargs "proto_xtr" with "proto_xtr=ip_offset".

This patch depends on:
commit e0c8ed904083 (net/ice: optimize the FlexiMD hardware check)

---
 doc/guides/nics/ice.rst                 | 14 ++++-
 drivers/net/ice/base/ice_lan_tx_rx.h    |  1 +
 drivers/net/ice/ice_ethdev.c            | 10 +++-
 drivers/net/ice/ice_ethdev.h            |  1 +
 drivers/net/ice/ice_rxtx.c              | 77 +++++++++++++++++--------
 drivers/net/ice/rte_pmd_ice.h           | 13 +++++
 drivers/net/ice/rte_pmd_ice_version.map |  1 +
 7 files changed, 90 insertions(+), 27 deletions(-)

[...]

Quoted 4 lines

+/**
+ * No need to check XTR_MD.#_VLD bit in Status/Error fields for
+ * Protocol Offset according to CPK HAS 7.9.8.
+ */

These comments are no need, since HAS doc session is internal information, and the code is clean enough: if (chk_valid) ... else...

Quoted 8 lines

drivers/net/ice/ice_rxtx.c ice_rxd_to_proto_xtr(struct rte_mbuf *mb, · line 1352

Quoted 4 lines
drivers/net/ice/ice_rxtx.c +4 -0
+if (rte_le_to_cpu_16(desc->flex_ts.flex.aux0) != 0xFFFF) metadata =
+rte_le_to_cpu_16(desc->flex_ts.flex.aux0);
+else if (rte_le_to_cpu_16(desc->flex_ts.flex.aux1) != 0xFFFF)
+metadata = rte_le_to_cpu_16(desc->flex_ts.flex.aux1);

Others,

Applied to dpdk-next-net-intel after remove unnecessary comment.

Thanks
Qi

Quoted 1 line