From patchwork Thu Nov 2 12:05:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 133764 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 7A0E543268; Thu, 2 Nov 2023 04:44:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 637C3402B1; Thu, 2 Nov 2023 04:44:37 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id 75E4640294; Thu, 2 Nov 2023 04:44:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698896676; x=1730432676; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=o6ZgM/Td+KUTdyMYlVSmeCUt8bR43mQwAjE/cN5nSpU=; b=aZ2cDGLwQ08Jskc3X8AHCcp/a7EfJsLXqur2NSEmY1GAtYTSkUTZ4X+z kUTOEvBxzqh5Py6s98ZBAeecXU/u0vtPYWmChWyovyY1Biy/u07OI49ef 40ViY6SwDbvfVdiGkMh7UsjHBLzS771l/hYzOf6y8uE9tuG4sdYB4SPzo VtmRbagF3tLbJDLi+SPtbANYBZUQkbolXh9JwYiF6Y9YAAuiWrKvW8JNr k8wlzyYN5kAzo18m9zOar6AqUqM5dPWoXYjshvO3XpjMCmHHjda6Aku7f 1+tDl8etLGb+nyjQklECZ+h8d9T53lCyxZC2nVu1PlQzhOKe/O9+xqI4j g==; X-IronPort-AV: E=McAfee;i="6600,9927,10881"; a="367977659" X-IronPort-AV: E=Sophos;i="6.03,270,1694761200"; d="scan'208";a="367977659" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2023 20:44:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10881"; a="754659974" X-IronPort-AV: E=Sophos;i="6.03,270,1694761200"; d="scan'208";a="754659974" Received: from dpdk-qzhan15-test02.sh.intel.com ([10.67.115.37]) by orsmga007.jf.intel.com with ESMTP; 01 Nov 2023 20:44:33 -0700 From: Qi Zhang To: beilei.xing@intel.com Cc: dev@dpdk.org, Qi Zhang , stable@dpdk.org Subject: [PATCH] net/iavf: fix Tx preparation Date: Thu, 2 Nov 2023 08:05:04 -0400 Message-Id: <20231102120504.1468111-1-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.31.1 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 > Tx ring size for TSO case. 2. report nb_mtu_seg_max and nb_seg_max in dev_info. Fixes: a2b29a7733ef ("net/avf: enable basic Rx Tx") Cc: stable@dpdk.org Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/iavf/iavf_ethdev.c | 2 ++ drivers/net/iavf/iavf_rxtx.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 98cc5c8ea8..0c6ab4ac5a 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1207,6 +1207,8 @@ iavf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) .nb_max = IAVF_MAX_RING_DESC, .nb_min = IAVF_MIN_RING_DESC, .nb_align = IAVF_ALIGN_RING_DESC, + .nb_mtu_seg_max = IAVF_TX_MAX_MTU_SEG, + .nb_seg_max = IAVF_MAX_RING_DESC, }; dev_info->err_handle_mode = RTE_ETH_ERROR_HANDLE_MODE_PASSIVE; diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 610912f635..45f638c1d2 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -3656,7 +3656,8 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, return i; } } else if ((m->tso_segsz < IAVF_MIN_TSO_MSS) || - (m->tso_segsz > IAVF_MAX_TSO_MSS)) { + (m->tso_segsz > IAVF_MAX_TSO_MSS) || + (m->nb_segs > txq->nb_tx_desc)) { /* MSS outside the range are considered malicious */ rte_errno = EINVAL; return i;