From patchwork Fri Dec 22 10:44:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mingjin Ye X-Patchwork-Id: 135498 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D8E5A4375E; Fri, 22 Dec 2023 12:00:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 902B94025D; Fri, 22 Dec 2023 12:00:37 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) by mails.dpdk.org (Postfix) with ESMTP id E26C74003C for ; Fri, 22 Dec 2023 12:00:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703242836; x=1734778836; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8JiM+1qCw8EwHqXL7Y+1/lo/TpbfuBYWKCbfUWk7f5s=; b=fWswj15r4EATvNFucx95Wileqyd7G2Xo33fz/QGKvsCZuQgEgXCaUNfo Bz5X/6eknSRE/oL/UL9Z2CUdGpX82RDTVLJeyCUxH83gqLthPAKB2gOG5 9UrORMCmiwczbWC5vK7Ga9bPffjCThylwztZS4NmQE/fLjO3MN8KM0KQS TPwI4y2TSCVmGfZu+O5p+53uA7VXLAeLft6/163PuJIYyIycaY7N7arj6 vZHwCUoEUdoReqePJPZeK2jMOCBRyovglwpJeBhBZfpCiJaakla3al+Cn I6HSHcCtFLyyLq6EPmv8fBncRUslO67lzOI0jFbZbsqm+NUy/TxrVGTRQ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10931"; a="3347816" X-IronPort-AV: E=Sophos;i="6.04,296,1695711600"; d="scan'208";a="3347816" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2023 03:00:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,296,1695711600"; d="scan'208";a="18997846" Received: from unknown (HELO localhost.localdomain) ([10.239.252.253]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2023 03:00:32 -0800 From: Mingjin Ye To: dev@dpdk.org Cc: qiming.yang@intel.com, Mingjin Ye , Jingjing Wu , Beilei Xing Subject: [PATCH v2] net/iavf: add diagnostic support in TX path Date: Fri, 22 Dec 2023 10:44:58 +0000 Message-Id: <20231222104458.3663930-1-mingjinx.ye@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231221101202.2815069-1-mingjinx.ye@intel.com> References: <20231221101202.2815069-1-mingjinx.ye@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The only way to enable diagnostics for TX paths is to modify the application source code. Making it difficult to diagnose faults. In this patch, the devarg option "mbuf_check" is introduced and the parameters are configured to enable the corresponding diagnostics. supported cases: mbuf, size, segment, offload, strict. 1. mbuf: check for corrupted mbuf. 2. size: check min/max packet length according to hw spec. 3. segment: check number of mbuf segments not exceed hw limitation. 4. offload: check any unsupported offload flag. 5. strict: check protocol headers. parameter format: mbuf_check=[mbuf,,] eg: dpdk-testpmd -a 0000:81:01.0,mbuf_check=[mbuf,size] -- -i Signed-off-by: Mingjin Ye --- v2: Remove call chain. --- drivers/net/iavf/iavf.h | 25 ++++- drivers/net/iavf/iavf_ethdev.c | 69 ++++++++++++ drivers/net/iavf/iavf_rxtx.c | 186 ++++++++++++++++++++++++++------- drivers/net/iavf/iavf_rxtx.h | 6 ++ 4 files changed, 246 insertions(+), 40 deletions(-) diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h index 10868f2c30..ab80388422 100644 --- a/drivers/net/iavf/iavf.h +++ b/drivers/net/iavf/iavf.h @@ -113,9 +113,14 @@ struct iavf_ipsec_crypto_stats { } ierrors; }; +struct iavf_mdd_stats { + uint64_t tx_pkt_errors; +}; + struct iavf_eth_xstats { struct virtchnl_eth_stats eth_stats; struct iavf_ipsec_crypto_stats ips_stats; + struct iavf_mdd_stats mdd_stats; }; /* Structure that defines a VSI, associated with a adapter. */ @@ -309,10 +314,27 @@ struct iavf_devargs { uint32_t watchdog_period; int auto_reset; int no_poll_on_link_down; + int mbuf_check; }; struct iavf_security_ctx; +struct iavf_rx_burst_elem { + TAILQ_ENTRY(iavf_rx_burst_elem) next; + eth_rx_burst_t rx_pkt_burst; +}; + +struct iavf_tx_burst_elem { + TAILQ_ENTRY(iavf_tx_burst_elem) next; + eth_tx_burst_t tx_pkt_burst; +}; + +#define IAVF_MDD_CHECK_F_TX_MBUF (1ULL << 0) +#define IAVF_MDD_CHECK_F_TX_SIZE (1ULL << 1) +#define IAVF_MDD_CHECK_F_TX_SEGMENT (1ULL << 2) +#define IAVF_MDD_CHECK_F_TX_OFFLOAD (1ULL << 3) +#define IAVF_MDD_CHECK_F_TX_STRICT (1ULL << 4) + /* Structure to store private data for each VF instance. */ struct iavf_adapter { struct iavf_hw hw; @@ -328,8 +350,7 @@ struct iavf_adapter { bool stopped; bool closed; bool no_poll; - eth_rx_burst_t rx_pkt_burst; - eth_tx_burst_t tx_pkt_burst; + uint64_t mc_flags; /* mdd check flags. */ uint16_t fdir_ref_cnt; struct iavf_devargs devargs; }; diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index d1edb0dd5c..6f4dd54602 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -39,6 +39,8 @@ #define IAVF_RESET_WATCHDOG_ARG "watchdog_period" #define IAVF_ENABLE_AUTO_RESET_ARG "auto_reset" #define IAVF_NO_POLL_ON_LINK_DOWN_ARG "no-poll-on-link-down" +#define IAVF_MDD_CHECK_ARG "mbuf_check" + uint64_t iavf_timestamp_dynflag; int iavf_timestamp_dynfield_offset = -1; @@ -48,6 +50,7 @@ static const char * const iavf_valid_args[] = { IAVF_RESET_WATCHDOG_ARG, IAVF_ENABLE_AUTO_RESET_ARG, IAVF_NO_POLL_ON_LINK_DOWN_ARG, + IAVF_MDD_CHECK_ARG, NULL }; @@ -174,6 +177,7 @@ static const struct rte_iavf_xstats_name_off rte_iavf_stats_strings[] = { {"tx_broadcast_packets", _OFF_OF(eth_stats.tx_broadcast)}, {"tx_dropped_packets", _OFF_OF(eth_stats.tx_discards)}, {"tx_error_packets", _OFF_OF(eth_stats.tx_errors)}, + {"tx_mdd_error_packets", _OFF_OF(mdd_stats.tx_pkt_errors)}, {"inline_ipsec_crypto_ipackets", _OFF_OF(ips_stats.icount)}, {"inline_ipsec_crypto_ibytes", _OFF_OF(ips_stats.ibytes)}, @@ -1881,6 +1885,8 @@ static int iavf_dev_xstats_get(struct rte_eth_dev *dev, { int ret; unsigned int i; + struct iavf_tx_queue *txq; + uint64_t mdd_pkt_errors = 0; struct iavf_adapter *adapter = IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); @@ -1904,6 +1910,15 @@ static int iavf_dev_xstats_get(struct rte_eth_dev *dev, if (iavf_ipsec_crypto_supported(adapter)) iavf_dev_update_ipsec_xstats(dev, &iavf_xtats.ips_stats); + if (adapter->devargs.mbuf_check) { + for (i = 0; i < dev->data->nb_tx_queues; i++) { + txq = dev->data->tx_queues[i]; + mdd_pkt_errors += __atomic_load_n(&txq->mdd_pkt_errors, + __ATOMIC_RELAXED); + } + iavf_xtats.mdd_stats.tx_pkt_errors = mdd_pkt_errors; + } + /* loop over xstats array and values from pstats */ for (i = 0; i < IAVF_NB_XSTATS; i++) { xstats[i].id = i; @@ -2286,6 +2301,52 @@ iavf_parse_watchdog_period(__rte_unused const char *key, const char *value, void return 0; } +static int +iavf_parse_mdd_checker(__rte_unused const char *key, const char *value, void *args) +{ + char *cur; + char *tmp; + int str_len; + int valid_len; + + int ret = 0; + uint64_t *mc_flags = args; + char *str2 = strdup(value); + if (str2 == NULL) + return -1; + + str_len = strlen(str2); + if (str2[0] == '[' && str2[str_len - 1] == ']') { + if (str_len < 3) { + ret = -1; + goto mdd_end; + } + valid_len = str_len - 2; + memmove(str2, str2 + 1, valid_len); + memset(str2 + valid_len, '\0', 2); + } + cur = strtok_r(str2, ",", &tmp); + while (cur != NULL) { + if (!strcmp(cur, "mbuf")) + *mc_flags |= IAVF_MDD_CHECK_F_TX_MBUF; + else if (!strcmp(cur, "size")) + *mc_flags |= IAVF_MDD_CHECK_F_TX_SIZE; + else if (!strcmp(cur, "segment")) + *mc_flags |= IAVF_MDD_CHECK_F_TX_SEGMENT; + else if (!strcmp(cur, "offload")) + *mc_flags |= IAVF_MDD_CHECK_F_TX_OFFLOAD; + else if (!strcmp(cur, "strict")) + *mc_flags |= IAVF_MDD_CHECK_F_TX_STRICT; + else + PMD_DRV_LOG(ERR, "Unsupported mdd check type: %s", cur); + cur = strtok_r(NULL, ",", &tmp); + } + +mdd_end: + free(str2); + return ret; +} + static int iavf_parse_devargs(struct rte_eth_dev *dev) { struct iavf_adapter *ad = @@ -2340,6 +2401,14 @@ static int iavf_parse_devargs(struct rte_eth_dev *dev) goto bail; } + ret = rte_kvargs_process(kvlist, IAVF_MDD_CHECK_ARG, + &iavf_parse_mdd_checker, &ad->mc_flags); + if (ret) + goto bail; + + if (ad->mc_flags) + ad->devargs.mbuf_check = 1; + ret = rte_kvargs_process(kvlist, IAVF_ENABLE_AUTO_RESET_ARG, &parse_bool, &ad->devargs.auto_reset); if (ret) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index f19aa14646..86b7af3263 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -425,6 +425,8 @@ struct iavf_txq_ops iavf_txq_release_mbufs_ops[] = { }; +static struct iavf_pkt_burst iavf_rxtx_pkt_burst[RTE_MAX_ETHPORTS]; + static inline void iavf_rxd_to_pkt_fields_by_comms_ovs(__rte_unused struct iavf_rx_queue *rxq, struct rte_mbuf *mb, @@ -3394,34 +3396,34 @@ check_mbuf_len(struct offload_info *info, struct rte_mbuf *m) { if (m->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) { if (info->outer_l2_len != m->outer_l2_len) { - PMD_TX_LOG(ERR, "outer_l2_len error in mbuf. Original " - "length: %hu, calculated length: %u", m->outer_l2_len, + PMD_DRV_LOG(ERR, "outer_l2_len error in mbuf. Original " + "length: %d, calculated length: %u", m->outer_l2_len, info->outer_l2_len); return -1; } if (info->outer_l3_len != m->outer_l3_len) { - PMD_TX_LOG(ERR, "outer_l3_len error in mbuf. Original " - "length: %hu,calculated length: %u", m->outer_l3_len, + PMD_DRV_LOG(ERR, "outer_l3_len error in mbuf. Original " + "length: %d,calculated length: %u", m->outer_l3_len, info->outer_l3_len); return -1; } } if (info->l2_len != m->l2_len) { - PMD_TX_LOG(ERR, "l2_len error in mbuf. Original " - "length: %hu, calculated length: %u", m->l2_len, + PMD_DRV_LOG(ERR, "l2_len error in mbuf. Original " + "length: %d, calculated length: %u", m->l2_len, info->l2_len); return -1; } if (info->l3_len != m->l3_len) { - PMD_TX_LOG(ERR, "l3_len error in mbuf. Original " - "length: %hu, calculated length: %u", m->l3_len, + PMD_DRV_LOG(ERR, "l3_len error in mbuf. Original " + "length: %d, calculated length: %u", m->l3_len, info->l3_len); return -1; } if (info->l4_len != m->l4_len) { - PMD_TX_LOG(ERR, "l4_len error in mbuf. Original " - "length: %hu, calculated length: %u", m->l4_len, + PMD_DRV_LOG(ERR, "l4_len error in mbuf. Original " + "length: %d, calculated length: %u", m->l4_len, info->l4_len); return -1; } @@ -3438,24 +3440,24 @@ check_ether_type(struct offload_info *info, struct rte_mbuf *m) if (info->outer_ethertype == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) { if (!(m->ol_flags & RTE_MBUF_F_TX_OUTER_IPV4)) { - PMD_TX_LOG(ERR, "Outer ethernet type is ipv4, " + PMD_DRV_LOG(ERR, "Outer ethernet type is ipv4, " "tx offload missing `RTE_MBUF_F_TX_OUTER_IPV4` flag."); ret = -1; } if (m->ol_flags & RTE_MBUF_F_TX_OUTER_IPV6) { - PMD_TX_LOG(ERR, "Outer ethernet type is ipv4, tx " + PMD_DRV_LOG(ERR, "Outer ethernet type is ipv4, tx " "offload contains wrong `RTE_MBUF_F_TX_OUTER_IPV6` flag"); ret = -1; } } else if (info->outer_ethertype == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6)) { if (!(m->ol_flags & RTE_MBUF_F_TX_OUTER_IPV6)) { - PMD_TX_LOG(ERR, "Outer ethernet type is ipv6, " + PMD_DRV_LOG(ERR, "Outer ethernet type is ipv6, " "tx offload missing `RTE_MBUF_F_TX_OUTER_IPV6` flag."); ret = -1; } if (m->ol_flags & RTE_MBUF_F_TX_OUTER_IPV4) { - PMD_TX_LOG(ERR, "Outer ethernet type is ipv6, tx " + PMD_DRV_LOG(ERR, "Outer ethernet type is ipv6, tx " "offload contains wrong `RTE_MBUF_F_TX_OUTER_IPV4` flag"); ret = -1; } @@ -3465,24 +3467,24 @@ check_ether_type(struct offload_info *info, struct rte_mbuf *m) if (info->ethertype == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4)) { if (!(m->ol_flags & RTE_MBUF_F_TX_IPV4)) { - PMD_TX_LOG(ERR, "Ethernet type is ipv4, tx offload " + PMD_DRV_LOG(ERR, "Ethernet type is ipv4, tx offload " "missing `RTE_MBUF_F_TX_IPV4` flag."); ret = -1; } if (m->ol_flags & RTE_MBUF_F_TX_IPV6) { - PMD_TX_LOG(ERR, "Ethernet type is ipv4, tx " + PMD_DRV_LOG(ERR, "Ethernet type is ipv4, tx " "offload contains wrong `RTE_MBUF_F_TX_IPV6` flag"); ret = -1; } } else if (info->ethertype == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6)) { if (!(m->ol_flags & RTE_MBUF_F_TX_IPV6)) { - PMD_TX_LOG(ERR, "Ethernet type is ipv6, tx offload " + PMD_DRV_LOG(ERR, "Ethernet type is ipv6, tx offload " "missing `RTE_MBUF_F_TX_IPV6` flag."); ret = -1; } if (m->ol_flags & RTE_MBUF_F_TX_IPV4) { - PMD_TX_LOG(ERR, "Ethernet type is ipv6, tx offload " + PMD_DRV_LOG(ERR, "Ethernet type is ipv6, tx offload " "contains wrong `RTE_MBUF_F_TX_IPV4` flag"); ret = -1; } @@ -3512,12 +3514,12 @@ iavf_check_mbuf(struct rte_mbuf *m) parse_gtp(udp_hdr, &info); if (info.is_tunnel) { if (!tunnel_type) { - PMD_TX_LOG(ERR, "gtp tunnel packet missing tx " + PMD_DRV_LOG(ERR, "gtp tunnel packet missing tx " "offload missing `RTE_MBUF_F_TX_TUNNEL_GTP` flag."); return -1; } if (tunnel_type != RTE_MBUF_F_TX_TUNNEL_GTP) { - PMD_TX_LOG(ERR, "gtp tunnel packet, tx offload has wrong " + PMD_DRV_LOG(ERR, "gtp tunnel packet, tx offload has wrong " "`%s` flag, correct is `RTE_MBUF_F_TX_TUNNEL_GTP` flag", rte_get_tx_ol_flag_name(tunnel_type)); return -1; @@ -3527,12 +3529,12 @@ iavf_check_mbuf(struct rte_mbuf *m) parse_vxlan_gpe(udp_hdr, &info); if (info.is_tunnel) { if (!tunnel_type) { - PMD_TX_LOG(ERR, "vxlan gpe tunnel packet missing tx " + PMD_DRV_LOG(ERR, "vxlan gpe tunnel packet missing tx " "offload missing `RTE_MBUF_F_TX_TUNNEL_VXLAN_GPE` flag."); return -1; } if (tunnel_type != RTE_MBUF_F_TX_TUNNEL_VXLAN_GPE) { - PMD_TX_LOG(ERR, "vxlan gpe tunnel packet, tx offload has " + PMD_DRV_LOG(ERR, "vxlan gpe tunnel packet, tx offload has " "wrong `%s` flag, correct is " "`RTE_MBUF_F_TX_TUNNEL_VXLAN_GPE` flag", rte_get_tx_ol_flag_name(tunnel_type)); @@ -3543,12 +3545,12 @@ iavf_check_mbuf(struct rte_mbuf *m) parse_vxlan(udp_hdr, &info); if (info.is_tunnel) { if (!tunnel_type) { - PMD_TX_LOG(ERR, "vxlan tunnel packet missing tx " + PMD_DRV_LOG(ERR, "vxlan tunnel packet missing tx " "offload missing `RTE_MBUF_F_TX_TUNNEL_VXLAN` flag."); return -1; } if (tunnel_type != RTE_MBUF_F_TX_TUNNEL_VXLAN) { - PMD_TX_LOG(ERR, "vxlan tunnel packet, tx offload has " + PMD_DRV_LOG(ERR, "vxlan tunnel packet, tx offload has " "wrong `%s` flag, correct is " "`RTE_MBUF_F_TX_TUNNEL_VXLAN` flag", rte_get_tx_ol_flag_name(tunnel_type)); @@ -3559,12 +3561,12 @@ iavf_check_mbuf(struct rte_mbuf *m) parse_geneve(udp_hdr, &info); if (info.is_tunnel) { if (!tunnel_type) { - PMD_TX_LOG(ERR, "geneve tunnel packet missing tx " + PMD_DRV_LOG(ERR, "geneve tunnel packet missing tx " "offload missing `RTE_MBUF_F_TX_TUNNEL_GENEVE` flag."); return -1; } if (tunnel_type != RTE_MBUF_F_TX_TUNNEL_GENEVE) { - PMD_TX_LOG(ERR, "geneve tunnel packet, tx offload has " + PMD_DRV_LOG(ERR, "geneve tunnel packet, tx offload has " "wrong `%s` flag, correct is " "`RTE_MBUF_F_TX_TUNNEL_GENEVE` flag", rte_get_tx_ol_flag_name(tunnel_type)); @@ -3575,7 +3577,7 @@ iavf_check_mbuf(struct rte_mbuf *m) /* Always keep last. */ if (unlikely(RTE_ETH_IS_TUNNEL_PKT(m->packet_type) != 0)) { - PMD_TX_LOG(ERR, "Unknown tunnel packet. UDP dst port: %hu", + PMD_DRV_LOG(ERR, "Unknown tunnel packet. UDP dst port: %hu", udp_hdr->dst_port); return -1; } @@ -3587,12 +3589,12 @@ iavf_check_mbuf(struct rte_mbuf *m) parse_gre(gre_hdr, &info); if (info.is_tunnel) { if (!tunnel_type) { - PMD_TX_LOG(ERR, "gre tunnel packet missing tx " + PMD_DRV_LOG(ERR, "gre tunnel packet missing tx " "offload missing `RTE_MBUF_F_TX_TUNNEL_GRE` flag."); return -1; } if (tunnel_type != RTE_MBUF_F_TX_TUNNEL_GRE) { - PMD_TX_LOG(ERR, "gre tunnel packet, tx offload has " + PMD_DRV_LOG(ERR, "gre tunnel packet, tx offload has " "wrong `%s` flag, correct is " "`RTE_MBUF_F_TX_TUNNEL_GRE` flag", rte_get_tx_ol_flag_name(tunnel_type)); @@ -3607,12 +3609,12 @@ iavf_check_mbuf(struct rte_mbuf *m) parse_encap_ip(encap_ip_hdr, &info); if (info.is_tunnel) { if (!tunnel_type) { - PMD_TX_LOG(ERR, "Ipip tunnel packet missing tx " + PMD_DRV_LOG(ERR, "Ipip tunnel packet missing tx " "offload missing `RTE_MBUF_F_TX_TUNNEL_IPIP` flag."); return -1; } if (tunnel_type != RTE_MBUF_F_TX_TUNNEL_IPIP) { - PMD_TX_LOG(ERR, "Ipip tunnel packet, tx offload has " + PMD_DRV_LOG(ERR, "Ipip tunnel packet, tx offload has " "wrong `%s` flag, correct is " "`RTE_MBUF_F_TX_TUNNEL_IPIP` flag", rte_get_tx_ol_flag_name(tunnel_type)); @@ -3629,6 +3631,100 @@ iavf_check_mbuf(struct rte_mbuf *m) return check_ether_type(&info, m); } +/* Tx MDD check */ +static uint16_t +iavf_xmit_pkts_mdd(void *tx_queue, struct rte_mbuf **tx_pkts, + uint16_t nb_pkts) +{ + struct iavf_tx_queue *txq = tx_queue; + struct iavf_adapter *adapter = txq->vsi->adapter; + uint16_t idx; + uint64_t ol_flags; + struct rte_mbuf *mb; + const char *reason = NULL; + uint64_t pkt_errors = 0; + + + for (idx = 0; idx < nb_pkts; idx++) { + mb = tx_pkts[idx]; + ol_flags = mb->ol_flags; + + if ((adapter->mc_flags & IAVF_MDD_CHECK_F_TX_MBUF) && + (rte_mbuf_check(mb, 1, &reason) != 0)) { + PMD_DRV_LOG(ERR, "INVALID mbuf: %s\n", reason); + pkt_errors++; + continue; + } + + if ((adapter->mc_flags & IAVF_MDD_CHECK_F_TX_SIZE) && + (mb->data_len < IAVF_TX_MIN_PKT_LEN || + mb->data_len > adapter->vf.max_pkt_len)) { + PMD_DRV_LOG(ERR, "INVALID mbuf: data_len (%u) is out " + "of range, reasonable range (%d - %u)\n", mb->data_len, + IAVF_TX_MIN_PKT_LEN, adapter->vf.max_pkt_len); + pkt_errors++; + continue; + } + + if (adapter->mc_flags & IAVF_MDD_CHECK_F_TX_SEGMENT) { + /* Check condition for nb_segs > IAVF_TX_MAX_MTU_SEG. */ + if (!(ol_flags & (RTE_MBUF_F_TX_TCP_SEG | RTE_MBUF_F_TX_UDP_SEG))) { + if (mb->nb_segs > IAVF_TX_MAX_MTU_SEG) { + PMD_DRV_LOG(ERR, "INVALID mbuf: nb_segs (%d) exceeds " + "HW limit, maximum allowed value is %d\n", mb->nb_segs, + IAVF_TX_MAX_MTU_SEG); + pkt_errors++; + continue; + } + } else if ((mb->tso_segsz < IAVF_MIN_TSO_MSS) || + (mb->tso_segsz > IAVF_MAX_TSO_MSS)) { + /* MSS outside the range are considered malicious */ + PMD_DRV_LOG(ERR, "INVALID mbuf: tso_segsz (%u) is out " + "of range, reasonable range (%d - %u)\n", mb->tso_segsz, + IAVF_MIN_TSO_MSS, IAVF_MAX_TSO_MSS); + pkt_errors++; + continue; + } else if (mb->nb_segs > txq->nb_tx_desc) { + PMD_DRV_LOG(ERR, "INVALID mbuf: nb_segs out " + "of ring length\n"); + pkt_errors++; + continue; + } + } + + if (adapter->mc_flags & IAVF_MDD_CHECK_F_TX_OFFLOAD) { + if (ol_flags & IAVF_TX_OFFLOAD_NOTSUP_MASK) { + PMD_DRV_LOG(ERR, "INVALID mbuf: TX offload " + "is not supported\n"); + pkt_errors++; + continue; + } + + if (!rte_validate_tx_offload(mb)) { + PMD_DRV_LOG(ERR, "INVALID mbuf: TX offload " + "setup error\n"); + pkt_errors++; + continue; + } + } + + if (adapter->mc_flags & IAVF_MDD_CHECK_F_TX_STRICT && + iavf_check_mbuf(mb)) { + pkt_errors++; + continue; + } + } + + if (pkt_errors) { + __atomic_fetch_add(&txq->mdd_pkt_errors, + pkt_errors, rte_memory_order_release); + return 0; + } + + return iavf_rxtx_pkt_burst[txq->port_id].tx_burst_raw(tx_queue, + tx_pkts, nb_pkts); +} + /* TX prep functions */ uint16_t iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, @@ -3715,7 +3811,7 @@ iavf_recv_pkts_no_poll(void *rx_queue, struct rte_mbuf **rx_pkts, if (!rxq->vsi || rxq->vsi->adapter->no_poll) return 0; - return rxq->vsi->adapter->rx_pkt_burst(rx_queue, + return iavf_rxtx_pkt_burst[rxq->port_id].rx_burst_raw(rx_queue, rx_pkts, nb_pkts); } @@ -3727,7 +3823,7 @@ iavf_xmit_pkts_no_poll(void *tx_queue, struct rte_mbuf **tx_pkts, if (!txq->vsi || txq->vsi->adapter->no_poll) return 0; - return txq->vsi->adapter->tx_pkt_burst(tx_queue, + return iavf_rxtx_pkt_burst[txq->port_id].tx_burst_raw(tx_queue, tx_pkts, nb_pkts); } @@ -3917,7 +4013,8 @@ iavf_set_rx_function(struct rte_eth_dev *dev) } if (no_poll_on_link_down) { - adapter->rx_pkt_burst = dev->rx_pkt_burst; + iavf_rxtx_pkt_burst[dev->data->port_id].rx_burst_raw = + dev->rx_pkt_burst; dev->rx_pkt_burst = iavf_recv_pkts_no_poll; } return; @@ -3937,7 +4034,8 @@ iavf_set_rx_function(struct rte_eth_dev *dev) dev->rx_pkt_burst = iavf_recv_pkts_vec; if (no_poll_on_link_down) { - adapter->rx_pkt_burst = dev->rx_pkt_burst; + iavf_rxtx_pkt_burst[dev->data->port_id].rx_burst_raw = + dev->rx_pkt_burst; dev->rx_pkt_burst = iavf_recv_pkts_no_poll; } return; @@ -3964,7 +4062,8 @@ iavf_set_rx_function(struct rte_eth_dev *dev) } if (no_poll_on_link_down) { - adapter->rx_pkt_burst = dev->rx_pkt_burst; + iavf_rxtx_pkt_burst[dev->data->port_id].rx_burst_raw = + dev->rx_pkt_burst; dev->rx_pkt_burst = iavf_recv_pkts_no_poll; } } @@ -3976,6 +4075,7 @@ iavf_set_tx_function(struct rte_eth_dev *dev) struct iavf_adapter *adapter = IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); int no_poll_on_link_down = adapter->devargs.no_poll_on_link_down; + int mbuf_check = adapter->devargs.mbuf_check; #ifdef RTE_ARCH_X86 struct iavf_tx_queue *txq; int i; @@ -4063,8 +4163,13 @@ iavf_set_tx_function(struct rte_eth_dev *dev) } if (no_poll_on_link_down) { - adapter->tx_pkt_burst = dev->tx_pkt_burst; + iavf_rxtx_pkt_burst[dev->data->port_id].tx_burst_raw = + dev->tx_pkt_burst; dev->tx_pkt_burst = iavf_xmit_pkts_no_poll; + } else if (mbuf_check) { + iavf_rxtx_pkt_burst[dev->data->port_id].tx_burst_raw = + dev->tx_pkt_burst; + dev->tx_pkt_burst = iavf_xmit_pkts_mdd; } return; } @@ -4077,8 +4182,13 @@ iavf_set_tx_function(struct rte_eth_dev *dev) dev->tx_pkt_prepare = iavf_prep_pkts; if (no_poll_on_link_down) { - adapter->tx_pkt_burst = dev->tx_pkt_burst; + iavf_rxtx_pkt_burst[dev->data->port_id].tx_burst_raw = + dev->tx_pkt_burst; dev->tx_pkt_burst = iavf_xmit_pkts_no_poll; + } else if (mbuf_check) { + iavf_rxtx_pkt_burst[dev->data->port_id].tx_burst_raw = + dev->tx_pkt_burst; + dev->tx_pkt_burst = iavf_xmit_pkts_mdd; } } diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h index f432f9d956..ab95bb30c7 100644 --- a/drivers/net/iavf/iavf_rxtx.h +++ b/drivers/net/iavf/iavf_rxtx.h @@ -203,6 +203,10 @@ struct iavf_txq_ops { void (*release_mbufs)(struct iavf_tx_queue *txq); }; +struct iavf_pkt_burst { + eth_rx_burst_t rx_burst_raw; + eth_tx_burst_t tx_burst_raw; +}; struct iavf_rx_queue_stats { uint64_t reserved; @@ -297,6 +301,8 @@ struct iavf_tx_queue { uint16_t next_rs; /* next to check DD, for VPMD */ uint16_t ipsec_crypto_pkt_md_offset; + uint64_t mdd_pkt_errors; + bool q_set; /* if rx queue has been configured */ bool tx_deferred_start; /* don't start this queue in dev start */ const struct iavf_txq_ops *ops;