From patchwork Thu Nov 2 14:22:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 133767 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 7F48C43269; Thu, 2 Nov 2023 07:01:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5F083402C6; Thu, 2 Nov 2023 07:01:40 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id C874C402C3; Thu, 2 Nov 2023 07:01:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698904899; x=1730440899; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5l9ZBLHMbDZfDLxLV4m/wlK9fmFD8iZzJHPc6eCXrQI=; b=howdtpoAN9vSVZb8wXiKM7Uu3L8s27siWxxgvxuAnSYpQcVngy9OZZbI 98R0YibNWQeEeAypv3s2yIRQ3p9BM/O45QcBkt4sfw6/GAFLla0zNCFo9 nnjOXf7tVoyxIXSDJTBizOG5ed2Kva1JHhfOLXjv8jb335LWPNtEmLmPW xUCsy2AweHC1c3zpsBTUV4hOkpvvgrNOJd8hL+/QmxCWtcBCUvZDMsOem sPJhkrWXaQOOajb6x8E+QstYYZwL6hTNlIekYJM9owHzqUdu1Pcx/yH9p VKkIVYMiY3HoV/ciDEr+BxvO2jmc0QDzOxUj51d8NDV8DwiE5rS8UD+oy Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10881"; a="392528972" X-IronPort-AV: E=Sophos;i="6.03,270,1694761200"; d="scan'208";a="392528972" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2023 23:01:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10881"; a="737642771" X-IronPort-AV: E=Sophos;i="6.03,270,1694761200"; d="scan'208";a="737642771" Received: from dpdk-qzhan15-test02.sh.intel.com ([10.67.115.37]) by orsmga006.jf.intel.com with ESMTP; 01 Nov 2023 23:01:35 -0700 From: Qi Zhang To: qiming.yang@intel.com Cc: dev@dpdk.org, Qi Zhang , stable@dpdk.org Subject: [PATCH v2] net/ice: fix Tx preparation Date: Thu, 2 Nov 2023 10:22:07 -0400 Message-Id: <20231102142207.1510973-1-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231102101213.1446007-1-qi.z.zhang@intel.com> References: <20231102101213.1446007-1-qi.z.zhang@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 1. Check nb_segs > 8 for NO TSO case 2. Check nb_segs > Tx ring size for TSO case 3. report nb_mtu_seg_max and nb_seg_max in dev_info. Fixes: 17c7d0f9d6a4 ("net/ice: support basic Rx/Tx") Cc: stable@dpdk.org Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/ice_ethdev.c | 2 ++ drivers/net/ice/ice_rxtx.c | 18 ++++++++++++++++-- drivers/net/ice/ice_rxtx.h | 2 ++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 6ef06b9926..3ccba4db80 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -3918,6 +3918,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) .nb_max = ICE_MAX_RING_DESC, .nb_min = ICE_MIN_RING_DESC, .nb_align = ICE_ALIGN_RING_DESC, + .nb_mtu_seg_max = ICE_TX_MTU_SEG_MAX, + .nb_seg_max = ICE_MAX_RING_DESC, }; dev_info->speed_capa = RTE_ETH_LINK_SPEED_10M | diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index ee9cb7b955..73e47ae92d 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -3679,7 +3679,7 @@ ice_check_empty_mbuf(struct rte_mbuf *tx_pkt) } uint16_t -ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, +ice_prep_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) { int i, ret; @@ -3690,9 +3690,23 @@ ice_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, m = tx_pkts[i]; ol_flags = m->ol_flags; - if (ol_flags & RTE_MBUF_F_TX_TCP_SEG && + if (!(ol_flags & RTE_MBUF_F_TX_TCP_SEG) && + /** + * No TSO case: nb->segs, pkt_len to not exceed + * the limites. + */ + (m->nb_segs > ICE_TX_MTU_SEG_MAX || + m->pkt_len > ICE_FRAME_SIZE_MAX)) { + rte_errno = EINVAL; + return i; + } else if (ol_flags & RTE_MBUF_F_TX_TCP_SEG && + /** TSO case: tso_segsz, nb_segs, pkt_len not exceed + * the limits. + */ (m->tso_segsz < ICE_MIN_TSO_MSS || m->tso_segsz > ICE_MAX_TSO_MSS || + m->nb_segs > + ((struct ice_tx_queue *)tx_queue)->nb_tx_desc || m->pkt_len > ICE_MAX_TSO_FRAME_SIZE)) { /** * MSS outside the range are considered malicious diff --git a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h index 268289716e..bd2c4abec9 100644 --- a/drivers/net/ice/ice_rxtx.h +++ b/drivers/net/ice/ice_rxtx.h @@ -56,6 +56,8 @@ extern int ice_timestamp_dynfield_offset; #define ICE_HEADER_SPLIT_ENA BIT(0) +#define ICE_TX_MTU_SEG_MAX 8 + typedef void (*ice_rx_release_mbufs_t)(struct ice_rx_queue *rxq); typedef void (*ice_tx_release_mbufs_t)(struct ice_tx_queue *txq); typedef void (*ice_rxd_to_pkt_fields_t)(struct ice_rx_queue *rxq,