d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/ice: support auxiliary IP offset Rx descriptor

Browse Source 
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".

Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
Acked-by: Haiyue Wang <haiyue.wang@intel.com>
This commit is contained in:
Junfeng Guo 2020-08-26 11:21:41 +08:00 committed by Ferruh Yigit
parent a622f2d441
commit 6982f1848f
7 changed files with 86 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/guides/nics/ice.rst
View File

@ -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``.

1
drivers/net/ice/base/ice_lan_tx_rx.h
View File

@ -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,
};

10
drivers/net/ice/ice_ethdev.c
View File

@ -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>");

1
drivers/net/ice/ice_ethdev.h
View File

@ -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 */
};

73
drivers/net/ice/ice_rxtx.c
View File

@ -23,27 +23,40 @@ uint64_t rte_net_ice_dynflag_proto_xtr_ipv4_mask;
uint64_t rte_net_ice_dynflag_proto_xtr_ipv6_mask;
uint64_t rte_net_ice_dynflag_proto_xtr_ipv6_flow_mask;
uint64_t rte_net_ice_dynflag_proto_xtr_tcp_mask;
uint64_t rte_net_ice_dynflag_proto_xtr_ip_offset_mask;
static inline uint64_t
ice_rxdid_to_proto_xtr_ol_flag(uint8_t rxdid)
ice_rxdid_to_proto_xtr_ol_flag(uint8_t rxdid, bool *chk_valid)
{
static uint64_t *ol_flag_map[] = {
[ICE_RXDID_COMMS_AUX_VLAN] =
&rte_net_ice_dynflag_proto_xtr_vlan_mask,
[ICE_RXDID_COMMS_AUX_IPV4] =
&rte_net_ice_dynflag_proto_xtr_ipv4_mask,
[ICE_RXDID_COMMS_AUX_IPV6] =
&rte_net_ice_dynflag_proto_xtr_ipv6_mask,
[ICE_RXDID_COMMS_AUX_IPV6_FLOW] =
&rte_net_ice_dynflag_proto_xtr_ipv6_flow_mask,
[ICE_RXDID_COMMS_AUX_TCP] =
&rte_net_ice_dynflag_proto_xtr_tcp_mask,
static struct {
uint64_t *ol_flag;
bool chk_valid;
} ol_flag_map[] = {
[ICE_RXDID_COMMS_AUX_VLAN] = {
&rte_net_ice_dynflag_proto_xtr_vlan_mask, true },
[ICE_RXDID_COMMS_AUX_IPV4] = {
&rte_net_ice_dynflag_proto_xtr_ipv4_mask, true },
[ICE_RXDID_COMMS_AUX_IPV6] = {
&rte_net_ice_dynflag_proto_xtr_ipv6_mask, true },
[ICE_RXDID_COMMS_AUX_IPV6_FLOW] = {
&rte_net_ice_dynflag_proto_xtr_ipv6_flow_mask, true },
[ICE_RXDID_COMMS_AUX_TCP] = {
&rte_net_ice_dynflag_proto_xtr_tcp_mask, true },
[ICE_RXDID_COMMS_AUX_IP_OFFSET] = {
&rte_net_ice_dynflag_proto_xtr_ip_offset_mask, false },
};
uint64_t *ol_flag;
ol_flag = rxdid < RTE_DIM(ol_flag_map) ? ol_flag_map[rxdid] : NULL;
if (rxdid < RTE_DIM(ol_flag_map)) {
ol_flag = ol_flag_map[rxdid].ol_flag;
if (!ol_flag)
return 0ULL;
return ol_flag != NULL ? *ol_flag : 0ULL;
*chk_valid = ol_flag_map[rxdid].chk_valid;
return *ol_flag;
}
return 0ULL;
}
static inline uint8_t
@ -56,6 +69,7 @@ ice_proto_xtr_type_to_rxdid(uint8_t xtr_type)
[PROTO_XTR_IPV6] = ICE_RXDID_COMMS_AUX_IPV6,
[PROTO_XTR_IPV6_FLOW] = ICE_RXDID_COMMS_AUX_IPV6_FLOW,
[PROTO_XTR_TCP] = ICE_RXDID_COMMS_AUX_TCP,
[PROTO_XTR_IP_OFFSET] = ICE_RXDID_COMMS_AUX_IP_OFFSET,
};
return xtr_type < RTE_DIM(rxdid_map) ?
@ -1312,24 +1326,33 @@ ice_rxd_to_proto_xtr(struct rte_mbuf *mb,
volatile struct ice_32b_rx_flex_desc_comms *desc)
{
uint16_t stat_err = rte_le_to_cpu_16(desc->status_error1);
uint32_t metadata;
uint32_t metadata = 0;
uint64_t ol_flag;
bool chk_valid;
if (unlikely(!(stat_err & ICE_RX_PROTO_XTR_VALID)))
return;
ol_flag = ice_rxdid_to_proto_xtr_ol_flag(desc->rxdid);
ol_flag = ice_rxdid_to_proto_xtr_ol_flag(desc->rxdid, &chk_valid);
if (unlikely(!ol_flag))
return;
if (chk_valid) {
if (stat_err & (1 << ICE_RX_FLEX_DESC_STATUS1_XTRMD4_VALID_S))
metadata = rte_le_to_cpu_16(desc->flex_ts.flex.aux0);
if (stat_err & (1 << ICE_RX_FLEX_DESC_STATUS1_XTRMD5_VALID_S))
metadata |=
rte_le_to_cpu_16(desc->flex_ts.flex.aux1) << 16;
} else {
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);
}
if (!metadata)
return;
mb->ol_flags |= ol_flag;
metadata = stat_err & (1 << ICE_RX_FLEX_DESC_STATUS1_XTRMD4_VALID_S) ?
rte_le_to_cpu_16(desc->flex_ts.flex.aux0) : 0;
if (likely(stat_err & (1 << ICE_RX_FLEX_DESC_STATUS1_XTRMD5_VALID_S)))
metadata |= rte_le_to_cpu_16(desc->flex_ts.flex.aux1) << 16;
*RTE_NET_ICE_DYNF_PROTO_XTR_METADATA(mb) = metadata;
}
#endif

13
drivers/net/ice/rte_pmd_ice.h
View File

@ -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

1
drivers/net/ice/rte_pmd_ice_version.map
View File

@ -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;
};