From patchwork Wed Apr 26 19:04:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ronak Doshi X-Patchwork-Id: 126554 X-Patchwork-Delegate: ferruh.yigit@amd.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 50C1742A0A; Wed, 26 Apr 2023 21:30:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D5B6342D52; Wed, 26 Apr 2023 21:30:09 +0200 (CEST) Received: from EX-PRD-EDGE01.vmware.com (EX-PRD-EDGE01.vmware.com [208.91.3.33]) by mails.dpdk.org (Postfix) with ESMTP id 45D284068E for ; Wed, 26 Apr 2023 21:04:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=s1024; d=vmware.com; h=from:to:cc:subject:date:message-id:in-reply-to:mime-version: content-type; bh=am+89PS/HJGdtII8YmqMh6hZAID3jtRz4wlveSWbYJU=; b=NKr3Apvkot/vQN18BgwZylVvIMwmvcAE3cm6w4Br/PL2iVRGMPrMwVxwJbBEsH x8EULjK5MW47RQ1LOhyCeKF7sn5Dxujn9KCvQLmHLZFVdSE7loAGczMzv+VMon OMAlYixp20cHtnxa+7wvpDgbE6b7fAKa6X/mwV8jO6GMhzk= Received: from sc9-mailhost1.vmware.com (10.113.161.71) by EX-PRD-EDGE01.vmware.com (10.188.245.6) with Microsoft SMTP Server id 15.1.2375.34; Wed, 26 Apr 2023 12:04:31 -0700 Received: from htb-1n-eng-dhcp122.eng.vmware.com (unknown [10.20.114.216]) by sc9-mailhost1.vmware.com (Postfix) with ESMTP id 3139320160; Wed, 26 Apr 2023 12:04:34 -0700 (PDT) Received: by htb-1n-eng-dhcp122.eng.vmware.com (Postfix, from userid 0) id 14647A83B8; Wed, 26 Apr 2023 12:04:34 -0700 (PDT) From: Ronak Doshi To: Jochen Behrens CC: , Ronak Doshi Subject: [PATCH v2 next 5/7] net/vmxnet3: limit number of TXDs used for TSO packet Date: Wed, 26 Apr 2023 12:04:12 -0700 Message-ID: <20230426190415.28239-6-doshir@vmware.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20230426190415.28239-1-doshir@vmware.com> References: <20230426190415.28239-1-doshir@vmware.com> MIME-Version: 1.0 Received-SPF: None (EX-PRD-EDGE01.vmware.com: doshir@vmware.com does not designate permitted sender hosts) X-Mailman-Approved-At: Wed, 26 Apr 2023 21:30:01 +0200 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 Currently, vmxnet3 does not have a limit on number of descriptors used for a TSO packet. However, with UPT, for hardware performance reasons, this patch limits the number of transmit descriptors to 24 for a TSO packet. Signed-off-by: Ronak Doshi Acked-by: Jochen Behrens --- drivers/net/vmxnet3/base/vmxnet3_defs.h | 2 ++ drivers/net/vmxnet3/vmxnet3_rxtx.c | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/net/vmxnet3/base/vmxnet3_defs.h b/drivers/net/vmxnet3/base/vmxnet3_defs.h index d8cc295b08..24c235876e 100644 --- a/drivers/net/vmxnet3/base/vmxnet3_defs.h +++ b/drivers/net/vmxnet3/base/vmxnet3_defs.h @@ -419,6 +419,8 @@ typedef union Vmxnet3_GenericDesc { /* max # of tx descs for a non-tso pkt */ #define VMXNET3_MAX_TXD_PER_PKT 16 +/* max # of tx descs for a tso pkt */ +#define VMXNET3_MAX_TSO_TXD_PER_PKT 24 /* Max size of a single rx buffer */ #define VMXNET3_MAX_RX_BUF_SIZE ((1 << 14) - 1) diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index e31878ecab..7bbae4177e 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -364,6 +364,14 @@ vmxnet3_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, rte_errno = EINVAL; return i; } + /* TSO packet cannot occupy more than + * VMXNET3_MAX_TSO_TXD_PER_PKT TX descriptors. + */ + if ((ol_flags & RTE_MBUF_F_TX_TCP_SEG) != 0 && + m->nb_segs > VMXNET3_MAX_TSO_TXD_PER_PKT) { + rte_errno = EINVAL; + return i; + } /* check that only supported TX offloads are requested. */ if ((ol_flags & VMXNET3_TX_OFFLOAD_NOTSUP_MASK) != 0 || @@ -444,10 +452,12 @@ vmxnet3_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, continue; } - /* Drop non-TSO packet that is excessively fragmented */ - if (unlikely(!tso && count > VMXNET3_MAX_TXD_PER_PKT)) { - PMD_TX_LOG(ERR, "Non-TSO packet cannot occupy more than %d tx " - "descriptors. Packet dropped.", VMXNET3_MAX_TXD_PER_PKT); + /* Drop non-TSO or TSO packet that is excessively fragmented */ + if (unlikely((!tso && count > VMXNET3_MAX_TXD_PER_PKT) || + (tso && count > VMXNET3_MAX_TSO_TXD_PER_PKT))) { + PMD_TX_LOG(ERR, "Non-TSO or TSO packet cannot occupy more than " + "%d or %d tx descriptors respectively. Packet dropped.", + VMXNET3_MAX_TXD_PER_PKT, VMXNET3_MAX_TSO_TXD_PER_PKT); txq->stats.drop_too_many_segs++; txq->stats.drop_total++; rte_pktmbuf_free(txm);