From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0BB40A00BE; Tue, 29 Oct 2019 08:40:56 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C50C61BED3; Tue, 29 Oct 2019 08:40:55 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 611E81BECB for ; Tue, 29 Oct 2019 08:40:54 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Oct 2019 00:40:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,243,1569308400"; d="scan'208";a="229968384" Received: from npg-dpdk-haiyue-1.sh.intel.com ([10.67.119.153]) by fmsmga002.fm.intel.com with ESMTP; 29 Oct 2019 00:40:52 -0700 From: Haiyue Wang To: dev@dpdk.org Cc: Haiyue Wang Date: Tue, 29 Oct 2019 15:34:48 +0800 Message-Id: <20191029073448.89373-1-haiyue.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191026174448.88589-1-haiyue.wang@intel.com> References: <20191026174448.88589-1-haiyue.wang@intel.com> Subject: [dpdk-dev] [PATCH v2] net/ice: optimize protocol extraction by dynamic mbuf API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The original design is to use rte_mbuf::udata64 to save the metadata of protocol extraction which has network protocol data fields and type, an private API is used to decode this metadata. It is not so generic. Use the new dynamic mbuf field and flags to handle protocol extraction. Then the metadata is very clean, only network protocol fields extracted by defined offset, and its type will be indicated by related ol_flags. Signed-off-by: Haiyue Wang --- v2: - disable the protocol extraction if failed to register some ol_flags - rewrite the commit message doc/guides/nics/ice.rst | 22 +++-- drivers/net/ice/Makefile | 3 - drivers/net/ice/ice_ethdev.c | 67 ++++++++++++++- drivers/net/ice/ice_ethdev.h | 18 ++++ drivers/net/ice/ice_rxtx.c | 82 +++++++++++------- drivers/net/ice/ice_rxtx.h | 1 - drivers/net/ice/meson.build | 2 - drivers/net/ice/rte_pmd_ice.h | 152 ---------------------------------- 8 files changed, 152 insertions(+), 195 deletions(-) delete mode 100644 drivers/net/ice/rte_pmd_ice.h diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index 933f63480..f460d1cfd 100644 --- a/doc/guides/nics/ice.rst +++ b/doc/guides/nics/ice.rst @@ -82,8 +82,8 @@ Runtime Config Options - ``Protocol extraction for per queue`` - Configure the RX queues to do protocol extraction into ``rte_mbuf::udata64`` - for protocol handling acceleration, like checking the TCP SYN packets quickly. + Configure the RX queues to do protocol extraction into mbuf for protocol + handling acceleration, like checking the TCP SYN packets quickly. The argument format is:: @@ -111,7 +111,9 @@ Runtime Config Options This setting means queues 1, 2-3, 8-9 are TCP extraction, queues 10-23 are IPv6 extraction, other queues use the default VLAN extraction. - The extraction will be copied into the lower 32 bit of ``rte_mbuf::udata64``. + The extraction metadata will be copied into the registered dynamic mbuf field + with name: "proto-xtr-metadata", size: 4B, align: __alignof__(uint32_t), and + the related dynamic mbuf flags in ``rte_mbuf::ol_flags`` will be set. .. table:: Protocol extraction : ``vlan`` @@ -125,6 +127,8 @@ Runtime Config Options VLAN2 - C-VLAN (second for QinQ). + Dynamic mbuf flag : "proto-xtr-ol-vlan" + .. table:: Protocol extraction : ``ipv4`` +----------------------------+----------------------------+ @@ -137,6 +141,8 @@ Runtime Config Options IPHDR2 - IPv4 header word 0, "Ver", "Hdr Len" and "Type of Service" fields. + Dynamic mbuf flag : "proto-xtr-ol-ipv4" + .. table:: Protocol extraction : ``ipv6`` +----------------------------+----------------------------+ @@ -150,6 +156,8 @@ Runtime Config Options IPHDR2 - IPv6 header word 0, "Ver", "Traffic class" and high 4 bits of "Flow Label" fields. + Dynamic mbuf flag : "proto-xtr-ol-ipv6" + .. table:: Protocol extraction : ``ipv6_flow`` +----------------------------+----------------------------+ @@ -163,6 +171,8 @@ Runtime Config Options IPHDR2 - IPv6 header word 0, "Ver", "Traffic class" and high 4 bits of "Flow Label" fields. + Dynamic mbuf flag : "proto-xtr-ol-ipv6-flow" + .. table:: Protocol extraction : ``tcp`` +----------------------------+----------------------------+ @@ -175,11 +185,7 @@ Runtime Config Options TCPHDR2 - Reserved - Use ``get_proto_xtr_flds(struct rte_mbuf *mb)`` to access the protocol - extraction, do not use ``rte_mbuf::udata64`` directly. - - The ``dump_proto_xtr_flds(struct rte_mbuf *mb)`` routine shows how to - access the protocol extraction result in ``struct rte_mbuf``. + Dynamic mbuf flag : "proto-xtr-ol-tcp" Driver compilation and testing ------------------------------ diff --git a/drivers/net/ice/Makefile b/drivers/net/ice/Makefile index 7c3b6a7ff..a1817e14c 100644 --- a/drivers/net/ice/Makefile +++ b/drivers/net/ice/Makefile @@ -84,7 +84,4 @@ ifeq ($(CC_AVX2_SUPPORT), 1) endif SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_generic_flow.c -# install this header file -SYMLINK-$(CONFIG_RTE_LIBRTE_ICE_PMD)-include := rte_pmd_ice.h - include $(RTE_SDK)/mk/rte.lib.mk diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index d74675842..c68acdef0 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -30,6 +30,26 @@ static const char * const ice_valid_args[] = { NULL }; +static const struct rte_mbuf_dynfield proto_xtr_metadata_param = { + .name = "proto-xtr-metadata", + .size = sizeof(uint32_t), + .align = __alignof__(uint32_t), + .flags = 0, +}; + +struct proto_xtr_ol_flag { + const struct rte_mbuf_dynflag param; + uint64_t *flag; +}; + +static const struct proto_xtr_ol_flag proto_xtr_ol_flag_params[] = { + { { "proto-xtr-ol-vlan", 0 }, &proto_xtr_ol_vlan }, + { { "proto-xtr-ol-ipv4", 0 }, &proto_xtr_ol_ipv4 }, + { { "proto-xtr-ol-ipv6", 0 }, &proto_xtr_ol_ipv6 }, + { { "proto-xtr-ol-ipv6-flow", 0 }, &proto_xtr_ol_ipv6_flow }, + { { "proto-xtr-ol-tcp", 0 }, &proto_xtr_ol_tcp }, +}; + #define ICE_DFLT_OUTER_TAG_TYPE ICE_AQ_VSI_OUTER_TAG_VLAN_9100 /* DDP package search path */ @@ -1385,6 +1405,9 @@ ice_init_proto_xtr(struct rte_eth_dev *dev) ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private); struct ice_hw *hw = ICE_PF_TO_HW(pf); + const struct proto_xtr_ol_flag *ol_flag; + bool proto_xtr_enable = false; + int offset; uint16_t i; if (!ice_proto_xtr_support(hw)) { @@ -1398,10 +1421,52 @@ ice_init_proto_xtr(struct rte_eth_dev *dev) return; } - for (i = 0; i < pf->lan_nb_qps; i++) + for (i = 0; i < pf->lan_nb_qps; i++) { pf->proto_xtr[i] = ad->devargs.proto_xtr[i] != PROTO_XTR_NONE ? ad->devargs.proto_xtr[i] : ad->devargs.proto_xtr_dflt; + + if (pf->proto_xtr[i] != PROTO_XTR_NONE && !proto_xtr_enable) + proto_xtr_enable = true; + } + + if (likely(!proto_xtr_enable)) + return; + + offset = rte_mbuf_dynfield_register(&proto_xtr_metadata_param); + if (unlikely(offset == -1)) { + PMD_DRV_LOG(ERR, + "Protocol extraction metadata is disabled in mbuf with error %d", + -rte_errno); + return; + } + + PMD_DRV_LOG(DEBUG, + "Protocol extraction metadata offset in mbuf is : %d", + offset); + proto_xtr_metadata = offset; + + for (i = 0; i < RTE_DIM(proto_xtr_ol_flag_params); i++) { + ol_flag = &proto_xtr_ol_flag_params[i]; + + offset = rte_mbuf_dynflag_register(&ol_flag->param); + if (unlikely(offset == -1)) { + PMD_DRV_LOG(ERR, + "Protocol extraction offload '%s' failed to register with error %d", + ol_flag->param.name, -rte_errno); + break; + } + + PMD_DRV_LOG(DEBUG, + "Protocol extraction offload '%s' offset in mbuf is : %d", + ol_flag->param.name, offset); + *ol_flag->flag = 1ULL << offset; + } + + if (i != RTE_DIM(proto_xtr_ol_flag_params)) { + PMD_DRV_LOG(ERR, "Protocol extraction metadata is disabled"); + proto_xtr_metadata = -1; + } } /* Initialize SW parameters of PF */ diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index de67e5934..1ca00bda4 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -8,6 +8,7 @@ #include #include +#include #include "base/ice_common.h" #include "base/ice_adminq_cmd.h" @@ -241,6 +242,23 @@ struct ice_vsi { bool offset_loaded; }; +enum proto_xtr_type { + PROTO_XTR_NONE, + PROTO_XTR_VLAN, + PROTO_XTR_IPV4, + PROTO_XTR_IPV6, + PROTO_XTR_IPV6_FLOW, + PROTO_XTR_TCP, +}; + +extern int proto_xtr_metadata; + +extern uint64_t proto_xtr_ol_vlan; +extern uint64_t proto_xtr_ol_ipv4; +extern uint64_t proto_xtr_ol_ipv6; +extern uint64_t proto_xtr_ol_ipv6_flow; +extern uint64_t proto_xtr_ol_tcp; + enum ice_fdir_tunnel_type { ICE_FDIR_TUNNEL_TYPE_NONE = 0, ICE_FDIR_TUNNEL_TYPE_VXLAN, diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 8d4820d3c..6493aa700 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -13,18 +13,31 @@ PKT_TX_TCP_SEG | \ PKT_TX_OUTER_IP_CKSUM) -static inline uint8_t -ice_rxdid_to_proto_xtr_type(uint8_t rxdid) -{ - static uint8_t xtr_map[] = { - [ICE_RXDID_COMMS_AUX_VLAN] = PROTO_XTR_VLAN, - [ICE_RXDID_COMMS_AUX_IPV4] = PROTO_XTR_IPV4, - [ICE_RXDID_COMMS_AUX_IPV6] = PROTO_XTR_IPV6, - [ICE_RXDID_COMMS_AUX_IPV6_FLOW] = PROTO_XTR_IPV6_FLOW, - [ICE_RXDID_COMMS_AUX_TCP] = PROTO_XTR_TCP, +/* Offset of mbuf dynamic field for protocol extraction data */ +int proto_xtr_metadata = -1; + +/* Mask of mbuf dynamic flags for protocol extraction type */ +uint64_t proto_xtr_ol_vlan; +uint64_t proto_xtr_ol_ipv4; +uint64_t proto_xtr_ol_ipv6; +uint64_t proto_xtr_ol_ipv6_flow; +uint64_t proto_xtr_ol_tcp; + +static inline uint64_t +ice_rxdid_to_proto_xtr_ol_flag(uint8_t rxdid) +{ + static uint64_t *ol_flag_map[] = { + [ICE_RXDID_COMMS_AUX_VLAN] = &proto_xtr_ol_vlan, + [ICE_RXDID_COMMS_AUX_IPV4] = &proto_xtr_ol_ipv4, + [ICE_RXDID_COMMS_AUX_IPV6] = &proto_xtr_ol_ipv6, + [ICE_RXDID_COMMS_AUX_IPV6_FLOW] = &proto_xtr_ol_ipv6_flow, + [ICE_RXDID_COMMS_AUX_TCP] = &proto_xtr_ol_tcp, }; + uint64_t *ol_flag; - return rxdid < RTE_DIM(xtr_map) ? xtr_map[rxdid] : PROTO_XTR_NONE; + ol_flag = rxdid < RTE_DIM(ol_flag_map) ? ol_flag_map[rxdid] : NULL; + + return ol_flag != NULL ? *ol_flag : 0; } static inline uint8_t @@ -1325,10 +1338,38 @@ ice_rxd_to_vlan_tci(struct rte_mbuf *mb, volatile union ice_rx_flex_desc *rxdp) mb->vlan_tci, mb->vlan_tci_outer); } +#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC #define ICE_RX_PROTO_XTR_VALID \ ((1 << ICE_RX_FLEX_DESC_STATUS1_XTRMD4_VALID_S) | \ (1 << ICE_RX_FLEX_DESC_STATUS1_XTRMD5_VALID_S)) +static void +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; + uint64_t ol_flag; + + if (unlikely(!(stat_err & ICE_RX_PROTO_XTR_VALID))) + return; + + ol_flag = ice_rxdid_to_proto_xtr_ol_flag(desc->rxdid); + if (unlikely(!ol_flag)) + 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_MBUF_DYNFIELD(mb, proto_xtr_metadata, uint32_t *) = metadata; +} +#endif + static inline void ice_rxd_to_pkt_fields(struct rte_mbuf *mb, volatile union ice_rx_flex_desc *rxdp) @@ -1344,28 +1385,13 @@ ice_rxd_to_pkt_fields(struct rte_mbuf *mb, } #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC - init_proto_xtr_flds(mb); - - stat_err = rte_le_to_cpu_16(desc->status_error1); - if (stat_err & ICE_RX_PROTO_XTR_VALID) { - struct proto_xtr_flds *xtr = get_proto_xtr_flds(mb); - - if (stat_err & (1 << ICE_RX_FLEX_DESC_STATUS1_XTRMD4_VALID_S)) - xtr->u.raw.data0 = - rte_le_to_cpu_16(desc->flex_ts.flex.aux0); - - if (stat_err & (1 << ICE_RX_FLEX_DESC_STATUS1_XTRMD5_VALID_S)) - xtr->u.raw.data1 = - rte_le_to_cpu_16(desc->flex_ts.flex.aux1); - - xtr->type = ice_rxdid_to_proto_xtr_type(desc->rxdid); - xtr->magic = PROTO_XTR_MAGIC_ID; - } - if (desc->flow_id != 0xFFFFFFFF) { mb->ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID; mb->hash.fdir.hi = rte_le_to_cpu_32(desc->flow_id); } + + if (unlikely(proto_xtr_metadata != -1)) + ice_rxd_to_proto_xtr(mb, desc); #endif } diff --git a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h index 5de618976..9e3d2cd07 100644 --- a/drivers/net/ice/ice_rxtx.h +++ b/drivers/net/ice/ice_rxtx.h @@ -5,7 +5,6 @@ #ifndef _ICE_RXTX_H_ #define _ICE_RXTX_H_ -#include "rte_pmd_ice.h" #include "ice_ethdev.h" #define ICE_ALIGN_RING_DESC 32 diff --git a/drivers/net/ice/meson.build b/drivers/net/ice/meson.build index f9e897bbc..45e760063 100644 --- a/drivers/net/ice/meson.build +++ b/drivers/net/ice/meson.build @@ -36,5 +36,3 @@ if arch_subdir == 'x86' objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c') endif endif - -install_headers('rte_pmd_ice.h') diff --git a/drivers/net/ice/rte_pmd_ice.h b/drivers/net/ice/rte_pmd_ice.h deleted file mode 100644 index 719487e1e..000000000 --- a/drivers/net/ice/rte_pmd_ice.h +++ /dev/null @@ -1,152 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2019 Intel Corporation - */ - -#ifndef _RTE_PMD_ICE_H_ -#define _RTE_PMD_ICE_H_ - -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -enum proto_xtr_type { - PROTO_XTR_NONE, - PROTO_XTR_VLAN, - PROTO_XTR_IPV4, - PROTO_XTR_IPV6, - PROTO_XTR_IPV6_FLOW, - PROTO_XTR_TCP, -}; - -struct proto_xtr_flds { - union { - struct { - uint16_t data0; - uint16_t data1; - } raw; - struct { - uint16_t stag_vid:12, - stag_dei:1, - stag_pcp:3; - uint16_t ctag_vid:12, - ctag_dei:1, - ctag_pcp:3; - } vlan; - struct { - uint16_t protocol:8, - ttl:8; - uint16_t tos:8, - ihl:4, - version:4; - } ipv4; - struct { - uint16_t hoplimit:8, - nexthdr:8; - uint16_t flowhi4:4, - tc:8, - version:4; - } ipv6; - struct { - uint16_t flowlo16; - uint16_t flowhi4:4, - tc:8, - version:4; - } ipv6_flow; - struct { - uint16_t fin:1, - syn:1, - rst:1, - psh:1, - ack:1, - urg:1, - ece:1, - cwr:1, - res1:4, - doff:4; - uint16_t rsvd; - } tcp; - } u; - - uint16_t rsvd; - - uint8_t type; - -#define PROTO_XTR_MAGIC_ID 0xCE - uint8_t magic; -}; - -static inline void -init_proto_xtr_flds(struct rte_mbuf *mb) -{ - mb->udata64 = 0; -} - -static inline struct proto_xtr_flds * -get_proto_xtr_flds(struct rte_mbuf *mb) -{ - RTE_BUILD_BUG_ON(sizeof(struct proto_xtr_flds) > sizeof(mb->udata64)); - - return (struct proto_xtr_flds *)&mb->udata64; -} - -static inline void -dump_proto_xtr_flds(struct rte_mbuf *mb) -{ - struct proto_xtr_flds *xtr = get_proto_xtr_flds(mb); - - if (xtr->magic != PROTO_XTR_MAGIC_ID || xtr->type == PROTO_XTR_NONE) - return; - - printf(" - Protocol Extraction:[0x%04x:0x%04x],", - xtr->u.raw.data0, xtr->u.raw.data1); - - if (xtr->type == PROTO_XTR_VLAN) - printf("vlan,stag=%u:%u:%u,ctag=%u:%u:%u ", - xtr->u.vlan.stag_pcp, - xtr->u.vlan.stag_dei, - xtr->u.vlan.stag_vid, - xtr->u.vlan.ctag_pcp, - xtr->u.vlan.ctag_dei, - xtr->u.vlan.ctag_vid); - else if (xtr->type == PROTO_XTR_IPV4) - printf("ipv4,ver=%u,hdrlen=%u,tos=%u,ttl=%u,proto=%u ", - xtr->u.ipv4.version, - xtr->u.ipv4.ihl, - xtr->u.ipv4.tos, - xtr->u.ipv4.ttl, - xtr->u.ipv4.protocol); - else if (xtr->type == PROTO_XTR_IPV6) - printf("ipv6,ver=%u,tc=%u,flow_hi4=0x%x,nexthdr=%u,hoplimit=%u ", - xtr->u.ipv6.version, - xtr->u.ipv6.tc, - xtr->u.ipv6.flowhi4, - xtr->u.ipv6.nexthdr, - xtr->u.ipv6.hoplimit); - else if (xtr->type == PROTO_XTR_IPV6_FLOW) - printf("ipv6_flow,ver=%u,tc=%u,flow=0x%x%04x ", - xtr->u.ipv6_flow.version, - xtr->u.ipv6_flow.tc, - xtr->u.ipv6_flow.flowhi4, - xtr->u.ipv6_flow.flowlo16); - else if (xtr->type == PROTO_XTR_TCP) - printf("tcp,doff=%u,flags=%s%s%s%s%s%s%s%s ", - xtr->u.tcp.doff, - xtr->u.tcp.cwr ? "C" : "", - xtr->u.tcp.ece ? "E" : "", - xtr->u.tcp.urg ? "U" : "", - xtr->u.tcp.ack ? "A" : "", - xtr->u.tcp.psh ? "P" : "", - xtr->u.tcp.rst ? "R" : "", - xtr->u.tcp.syn ? "S" : "", - xtr->u.tcp.fin ? "F" : ""); -} - -#ifdef __cplusplus -} -#endif - -#endif /* _RTE_PMD_ICE_H_ */ -- 2.17.1