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 A0C0EA00BE; Fri, 1 Nov 2019 04:23:39 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 09E271D44A; Fri, 1 Nov 2019 04:23:39 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id E27E31D429 for ; Fri, 1 Nov 2019 04:23:36 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Oct 2019 20:23:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,253,1569308400"; d="scan'208";a="375454397" Received: from npg-dpdk-haiyue-1.sh.intel.com ([10.67.119.213]) by orsmga005.jf.intel.com with ESMTP; 31 Oct 2019 20:23:34 -0700 From: Haiyue Wang To: dev@dpdk.org, olivier.matz@6wind.com, xiaolong.ye@intel.com Cc: Haiyue Wang Date: Fri, 1 Nov 2019 11:17:38 +0800 Message-Id: <20191101031738.42978-1-haiyue.wang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191029073448.89373-1-haiyue.wang@intel.com> References: <20191029073448.89373-1-haiyue.wang@intel.com> Subject: [dpdk-dev] [PATCH v3] 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, a 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 --- v3: - Use the conventions name "rte_net__dynfield_" since it is defined in a in PMD. - Add helpers API for easiy access. v2: - disable the protocol extraction if failed to register some ol_flags - rewrite the commit message doc/api/doxy-api-index.md | 1 + doc/api/doxy-api.conf.in | 1 + doc/guides/nics/ice.rst | 14 +- drivers/net/ice/ice_ethdev.c | 70 ++++- drivers/net/ice/ice_ethdev.h | 9 + drivers/net/ice/ice_rxtx.c | 90 +++++-- drivers/net/ice/rte_pmd_ice.h | 328 +++++++++++++++--------- drivers/net/ice/rte_pmd_ice_version.map | 12 + 8 files changed, 373 insertions(+), 152 deletions(-) diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md index 28a5dd37e..dff496be0 100644 --- a/doc/api/doxy-api-index.md +++ b/doc/api/doxy-api-index.md @@ -42,6 +42,7 @@ The public API headers are grouped by topics: [KNI] (@ref rte_kni.h), [ixgbe] (@ref rte_pmd_ixgbe.h), [i40e] (@ref rte_pmd_i40e.h), + [ice] (@ref rte_pmd_ice.h), [bnxt] (@ref rte_pmd_bnxt.h), [dpaa] (@ref rte_pmd_dpaa.h), [dpaa2] (@ref rte_pmd_dpaa2.h), diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in index d8dafb289..faa3b1593 100644 --- a/doc/api/doxy-api.conf.in +++ b/doc/api/doxy-api.conf.in @@ -12,6 +12,7 @@ INPUT = @TOPDIR@/doc/api/doxy-api-index.md \ @TOPDIR@/drivers/net/dpaa \ @TOPDIR@/drivers/net/dpaa2 \ @TOPDIR@/drivers/net/i40e \ + @TOPDIR@/drivers/net/ice \ @TOPDIR@/drivers/net/ixgbe \ @TOPDIR@/drivers/net/softnic \ @TOPDIR@/drivers/raw/dpaa2_cmdif \ diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index 933f63480..e0eba5654 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,8 @@ 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, and the related dynamic mbuf flags is set. .. table:: Protocol extraction : ``vlan`` @@ -175,10 +176,11 @@ 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. + Use ``rte_net_ice_dynf_proto_xtr_metadata_get`` to access the protocol + extraction metadata, and use ``PKT_RX_DYNF_PROTO_XTR_OL_*`` to get the + metadata type of ``struct rte_mbuf::ol_flags``. - The ``dump_proto_xtr_flds(struct rte_mbuf *mb)`` routine shows how to + The ``rte_net_ice_dump_proto_xtr_metadata`` routine shows how to access the protocol extraction result in ``struct rte_mbuf``. Driver compilation and testing diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index d74675842..83d66887d 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -30,6 +30,29 @@ static const char * const ice_valid_args[] = { NULL }; +static const struct rte_mbuf_dynfield ice_proto_xtr_metadata_param = { + .name = RTE_STR(rte_net_ice_dynfield_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; +}; + +#define PROTO_XTR_OL_FLAG_DYNF_MAP(ol_flag) \ + { { RTE_STR(ol_flag), 0 }, &(ol_flag) } + +static const struct proto_xtr_ol_flag ice_proto_xtr_ol_flag_params[] = { + PROTO_XTR_OL_FLAG_DYNF_MAP(rte_net_ice_dynflag_proto_xtr_ol_vlan), + PROTO_XTR_OL_FLAG_DYNF_MAP(rte_net_ice_dynflag_proto_xtr_ol_ipv4), + PROTO_XTR_OL_FLAG_DYNF_MAP(rte_net_ice_dynflag_proto_xtr_ol_ipv6), + PROTO_XTR_OL_FLAG_DYNF_MAP(rte_net_ice_dynflag_proto_xtr_ol_ipv6_flow), + PROTO_XTR_OL_FLAG_DYNF_MAP(rte_net_ice_dynflag_proto_xtr_ol_tcp) +}; + #define ICE_DFLT_OUTER_TAG_TYPE ICE_AQ_VSI_OUTER_TAG_VLAN_9100 /* DDP package search path */ @@ -1385,6 +1408,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 +1424,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(&ice_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); + rte_net_ice_dynfield_proto_xtr_metadata = offset; + + for (i = 0; i < RTE_DIM(ice_proto_xtr_ol_flag_params); i++) { + ol_flag = &ice_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(ice_proto_xtr_ol_flag_params)) { + PMD_DRV_LOG(ERR, "Protocol extraction metadata is disabled"); + rte_net_ice_dynfield_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..c55713cc1 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -241,6 +241,15 @@ 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, +}; + 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 47a654a73..13fa08f8a 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -13,18 +13,39 @@ 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 rte_net_ice_dynfield_proto_xtr_metadata = -1; + +/* Mask of mbuf dynamic flags for protocol extraction type */ +uint64_t rte_net_ice_dynflag_proto_xtr_ol_vlan; +uint64_t rte_net_ice_dynflag_proto_xtr_ol_ipv4; +uint64_t rte_net_ice_dynflag_proto_xtr_ol_ipv6; +uint64_t rte_net_ice_dynflag_proto_xtr_ol_ipv6_flow; +uint64_t rte_net_ice_dynflag_proto_xtr_ol_tcp; + +#define MAP_RXDID_TO_FLAG(rxdid, flag) \ + [rxdid] = &(flag) + +static inline uint64_t +ice_rxdid_to_proto_xtr_ol_flag(uint8_t rxdid) +{ + static uint64_t *ol_flag_map[] = { + MAP_RXDID_TO_FLAG(ICE_RXDID_COMMS_AUX_VLAN, + rte_net_ice_dynflag_proto_xtr_ol_vlan), + MAP_RXDID_TO_FLAG(ICE_RXDID_COMMS_AUX_IPV4, + rte_net_ice_dynflag_proto_xtr_ol_ipv4), + MAP_RXDID_TO_FLAG(ICE_RXDID_COMMS_AUX_IPV6, + rte_net_ice_dynflag_proto_xtr_ol_ipv6), + MAP_RXDID_TO_FLAG(ICE_RXDID_COMMS_AUX_IPV6_FLOW, + rte_net_ice_dynflag_proto_xtr_ol_ipv6_flow), + MAP_RXDID_TO_FLAG(ICE_RXDID_COMMS_AUX_TCP, + rte_net_ice_dynflag_proto_xtr_ol_tcp), }; + uint64_t *ol_flag; + + ol_flag = rxdid < RTE_DIM(ol_flag_map) ? ol_flag_map[rxdid] : NULL; - return rxdid < RTE_DIM(xtr_map) ? xtr_map[rxdid] : PROTO_XTR_NONE; + return ol_flag != NULL ? *ol_flag : 0; } static inline uint8_t @@ -1325,10 +1346,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_NET_ICE_DYNF_PROTO_XTR_METADATA(mb) = metadata; +} +#endif + static inline void ice_rxd_to_pkt_fields(struct rte_mbuf *mb, volatile union ice_rx_flex_desc *rxdp) @@ -1344,28 +1393,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(rte_net_ice_dynf_proto_xtr_metadata_avail())) + ice_rxd_to_proto_xtr(mb, desc); #endif } diff --git a/drivers/net/ice/rte_pmd_ice.h b/drivers/net/ice/rte_pmd_ice.h index 719487e1e..33457a06b 100644 --- a/drivers/net/ice/rte_pmd_ice.h +++ b/drivers/net/ice/rte_pmd_ice.h @@ -5,144 +5,238 @@ #ifndef _RTE_PMD_ICE_H_ #define _RTE_PMD_ICE_H_ +/** + * @file rte_pmd_ice.h + * + * ice PMD specific functions. + * + * @b EXPERIMENTAL: this API may change, or be removed, without prior notice + * + */ + #include #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, +/** + * The supported network protocol extraction metadata format definition. + */ +union proto_xtr_metadata { + uint32_t metadata; + + 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; }; -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; -}; +/** + * The offset of mbuf dynamic field for protocol extraction metadata, it is + * registered when dev_args 'proto_xtr' is set. + */ +extern int rte_net_ice_dynfield_proto_xtr_metadata; -static inline void -init_proto_xtr_flds(struct rte_mbuf *mb) +/** + * The mask of mbuf dynamic flags for VLAN protocol extraction type. + */ +extern uint64_t rte_net_ice_dynflag_proto_xtr_ol_vlan; + +/** + * The mask of mbuf dynamic flags for IPv4 protocol extraction type. + */ +extern uint64_t rte_net_ice_dynflag_proto_xtr_ol_ipv4; + +/** + * The mask of mbuf dynamic flags for IPv6 protocol extraction type. + */ +extern uint64_t rte_net_ice_dynflag_proto_xtr_ol_ipv6; + +/** + * The mask of mbuf dynamic flags for IPv6 with flow protocol extraction type. + */ +extern uint64_t rte_net_ice_dynflag_proto_xtr_ol_ipv6_flow; + +/** + * The mask of mbuf dynamic flags for TCP protocol extraction type. + */ +extern uint64_t rte_net_ice_dynflag_proto_xtr_ol_tcp; + +/** + * The mbuf dynamic field pointer for protocol extraction metadata. + */ +#define RTE_NET_ICE_DYNF_PROTO_XTR_METADATA(m) \ + RTE_MBUF_DYNFIELD((m), \ + rte_net_ice_dynfield_proto_xtr_metadata, uint32_t *) + +/** + * The mbuf dynamic flag for VLAN protocol extraction metadata. + */ +#define PKT_RX_DYNF_PROTO_XTR_OL_VLAN \ + (rte_net_ice_dynflag_proto_xtr_ol_vlan) + +/** + * The mbuf dynamic flag for IPv4 protocol extraction metadata. + */ +#define PKT_RX_DYNF_PROTO_XTR_OL_IPV4 \ + (rte_net_ice_dynflag_proto_xtr_ol_ipv4) + +/** + * The mbuf dynamic flag for IPv6 protocol extraction metadata. + */ +#define PKT_RX_DYNF_PROTO_XTR_OL_IPV6 \ + (rte_net_ice_dynflag_proto_xtr_ol_ipv6) + +/** + * The mbuf dynamic flag for IPv6 with flow protocol extraction metadata. + */ +#define PKT_RX_DYNF_PROTO_XTR_OL_IPV6_FLOW \ + (rte_net_ice_dynflag_proto_xtr_ol_ipv6_flow) + +/** + * The mbuf dynamic flag for TCP protocol extraction metadata. + */ +#define PKT_RX_DYNF_PROTO_XTR_OL_TCP \ + (rte_net_ice_dynflag_proto_xtr_ol_tcp) + +/** + * Check if mbuf dynamic field for protocol extraction metadata is registered. + * + * @return + * True if registered, false otherwise. + */ +__rte_experimental +static inline int +rte_net_ice_dynf_proto_xtr_metadata_avail(void) { - mb->udata64 = 0; + return rte_net_ice_dynfield_proto_xtr_metadata != -1; } -static inline struct proto_xtr_flds * -get_proto_xtr_flds(struct rte_mbuf *mb) +/** + * Get the mbuf dynamic field for protocol extraction metadata. + * + * @param m + * The pointer to the mbuf. + * @return + * The saved protocol extraction metadata. + */ +__rte_experimental +static inline uint32_t +rte_net_ice_dynf_proto_xtr_metadata_get(struct rte_mbuf *m) { - RTE_BUILD_BUG_ON(sizeof(struct proto_xtr_flds) > sizeof(mb->udata64)); - - return (struct proto_xtr_flds *)&mb->udata64; + return *RTE_NET_ICE_DYNF_PROTO_XTR_METADATA(m); } +/** + * Dump the mbuf dynamic field for protocol extraction metadata. + * + * @param m + * The pointer to the mbuf. + */ +__rte_experimental static inline void -dump_proto_xtr_flds(struct rte_mbuf *mb) +rte_net_ice_dump_proto_xtr_metadata(struct rte_mbuf *m) { - struct proto_xtr_flds *xtr = get_proto_xtr_flds(mb); + union proto_xtr_metadata data; - if (xtr->magic != PROTO_XTR_MAGIC_ID || xtr->type == PROTO_XTR_NONE) + if (!rte_net_ice_dynf_proto_xtr_metadata_avail()) 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" : ""); + data.metadata = rte_net_ice_dynf_proto_xtr_metadata_get(m); + + if (m->ol_flags & PKT_RX_DYNF_PROTO_XTR_OL_VLAN) + printf(" - Protocol Extraction:[0x%04x:0x%04x],vlan,stag=%u:%u:%u,ctag=%u:%u:%u ", + data.raw.data0, data.raw.data1, + data.vlan.stag_pcp, + data.vlan.stag_dei, + data.vlan.stag_vid, + data.vlan.ctag_pcp, + data.vlan.ctag_dei, + data.vlan.ctag_vid); + else if (m->ol_flags & PKT_RX_DYNF_PROTO_XTR_OL_IPV4) + printf(" - Protocol Extraction:[0x%04x:0x%04x],ipv4,ver=%u,hdrlen=%u,tos=%u,ttl=%u,proto=%u ", + data.raw.data0, data.raw.data1, + data.ipv4.version, + data.ipv4.ihl, + data.ipv4.tos, + data.ipv4.ttl, + data.ipv4.protocol); + else if (m->ol_flags & PKT_RX_DYNF_PROTO_XTR_OL_IPV6) + printf(" - Protocol Extraction:[0x%04x:0x%04x],ipv6,ver=%u,tc=%u,flow_hi4=0x%x,nexthdr=%u,hoplimit=%u ", + data.raw.data0, data.raw.data1, + data.ipv6.version, + data.ipv6.tc, + data.ipv6.flowhi4, + data.ipv6.nexthdr, + data.ipv6.hoplimit); + else if (m->ol_flags & PKT_RX_DYNF_PROTO_XTR_OL_IPV6_FLOW) + printf(" - Protocol Extraction:[0x%04x:0x%04x],ipv6_flow,ver=%u,tc=%u,flow=0x%x%04x ", + data.raw.data0, data.raw.data1, + data.ipv6_flow.version, + data.ipv6_flow.tc, + data.ipv6_flow.flowhi4, + data.ipv6_flow.flowlo16); + else if (m->ol_flags & PKT_RX_DYNF_PROTO_XTR_OL_TCP) + printf(" - Protocol Extraction:[0x%04x:0x%04x],tcp,doff=%u,flags=%s%s%s%s%s%s%s%s ", + data.raw.data0, data.raw.data1, + data.tcp.doff, + data.tcp.cwr ? "C" : "", + data.tcp.ece ? "E" : "", + data.tcp.urg ? "U" : "", + data.tcp.ack ? "A" : "", + data.tcp.psh ? "P" : "", + data.tcp.rst ? "R" : "", + data.tcp.syn ? "S" : "", + data.tcp.fin ? "F" : ""); } #ifdef __cplusplus diff --git a/drivers/net/ice/rte_pmd_ice_version.map b/drivers/net/ice/rte_pmd_ice_version.map index 7b23b609d..ba59cbcbd 100644 --- a/drivers/net/ice/rte_pmd_ice_version.map +++ b/drivers/net/ice/rte_pmd_ice_version.map @@ -2,3 +2,15 @@ DPDK_19.02 { local: *; }; + +EXPERIMENTAL { + global: + + # added in 19.11 + rte_net_ice_dynfield_proto_xtr_metadata; + rte_net_ice_dynflag_proto_xtr_ol_vlan; + rte_net_ice_dynflag_proto_xtr_ol_ipv4; + rte_net_ice_dynflag_proto_xtr_ol_ipv6; + rte_net_ice_dynflag_proto_xtr_ol_ipv6_flow; + rte_net_ice_dynflag_proto_xtr_ol_tcp; +}; -- 2.17.1