From patchwork Thu Aug 20 21:55:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 75795 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 84695A04AF; Thu, 20 Aug 2020 23:55:58 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BC2461C0B6; Thu, 20 Aug 2020 23:55:49 +0200 (CEST) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by dpdk.org (Postfix) with ESMTP id ECB751C026 for ; Thu, 20 Aug 2020 23:55:47 +0200 (CEST) Received: by mail-qt1-f193.google.com with SMTP id 6so2366495qtt.0 for ; Thu, 20 Aug 2020 14:55:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atomicrules-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HQ5qB784PdCbP92IRD3ZItyDSutisz5ImnZ0VmHrI4M=; b=UaTrUqEKxAc+e3UI9h4X9DEToAykbn47JeNLiU1C4nH6XuLFXcPspijN/FlEIDrqxf ZT4XeW5Wj4FeTCWRvA+3agB4Kyse5lUU+SY8+ubeE8ILcJ93dkwVXWJqCkx5j1+BktFj aIcTP5iBCBV+lb0ZEQj9mtfstCB5VBieQXub+mA4+Y4b4353Cx7LSpdNYnvK4LyN32or QkVSqc/k+PCDUjSmws/80wJ00OfyGA4OSC3Xh2xXwZ+/ON0UubvIzxr9J6uLpCefIstR 8FoVJxYaSYbdNQm+R7m37IBaqve1YOwuJ9a0Kexem8Kr8boM3AhaPF9o9Koe2OQG0iWz wcEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HQ5qB784PdCbP92IRD3ZItyDSutisz5ImnZ0VmHrI4M=; b=fEmHPWL3FDs02PJ8tjNCIkWcj2eqyo5FbbcPdYIUA0Qo5GcNDVOe9ddz5Fn9ssxGyb xkf0PDaKfWEpY57ZY6OHkWY6Xk2HNJZw/HtEyoBvw7EUWu7Lusf1OmkQT5N7m+rrIeZK iVpIkbEyjck21y2+729qAiilDm31fwJZiJ/eLUxXaslooSnddsbbPOXzYYLSWJsNqgsV ldrh0033ccTi4rXd6cJrD+BBazS9lBFPv6ymaZbtTLuMpKJlmaUoN1TI9IsJXPsq/6NX 9ClGg/5mUqljV/t1MLQPMkwooulaPB3O6x1To7P+47r0XSiHOfeJYvns59ySWiNKVloo 28Kw== X-Gm-Message-State: AOAM532H49TV4USBaADtmCLr9HfUus53KMtp/zw3xy+1MonpWA9UuR0h pBdtkax7WO/4eUZG5qiOdMM5poKCjneYMaMZKxU= X-Google-Smtp-Source: ABdhPJxGIGbqNVFV1MhzyAYT9NPirCjgYmBTHG0BY6+fwfUhgtM/Hx1k6BKp7Dw+kjTIiePq518CnA== X-Received: by 2002:ac8:1b0f:: with SMTP id y15mr638030qtj.144.1597960546903; Thu, 20 Aug 2020 14:55:46 -0700 (PDT) Received: from z390.czeck.local (pool-72-74-133-40.bstnma.fios.verizon.net. [72.74.133.40]) by smtp.gmail.com with ESMTPSA id t8sm3430711qke.7.2020.08.20.14.55.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Aug 2020 14:55:46 -0700 (PDT) From: Ed Czeck To: dev@dpdk.org, ferruh.yigit@intel.com, bruce.richardson@intel.com Cc: shepard.siegel@atomicrules.com, john.miller@atomicrules.com, Ed Czeck Date: Thu, 20 Aug 2020 17:55:33 -0400 Message-Id: <20200820215533.18471-2-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200820215533.18471-1-ed.czeck@atomicrules.com> References: <20200819153539.32698-1-ed.czeck@atomicrules.com> <20200820215533.18471-1-ed.czeck@atomicrules.com> Subject: [dpdk-dev] [PATCH 2/2] net/ark remove ARK_TX_PAD_TO_60 configuration macro 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" Update documenation as needed. Signed-off-by: Ed Czeck --- doc/guides/nics/ark.rst | 3 --- drivers/net/ark/ark_ethdev_tx.c | 42 ++++++++++++++++++--------------- drivers/net/ark/ark_logs.h | 8 ------- 3 files changed, 23 insertions(+), 30 deletions(-) diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst index c3ffcbbc2..0f96ebd2c 100644 --- a/doc/guides/nics/ark.rst +++ b/doc/guides/nics/ark.rst @@ -129,9 +129,6 @@ Configuration Information * **CONFIG_RTE_LIBRTE_ARK_PMD** (default y): Enables or disables inclusion of the ARK PMD driver in the DPDK compilation. - * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y): When enabled TX - packets are padded to 60 bytes to support downstream MACS. - Building DPDK ------------- diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c index 72624deb3..c303ac58c 100644 --- a/drivers/net/ark/ark_ethdev_tx.c +++ b/drivers/net/ark/ark_ethdev_tx.c @@ -15,6 +15,11 @@ #define ARK_TX_MAX_NOCHAIN (RTE_MBUF_DEFAULT_DATAROOM) +#ifndef ARK_MIN_TX_PKTLEN +#define ARK_MIN_TX_PKTLEN 0 +#endif + + /* ************************************************************************* */ struct ark_tx_queue { struct ark_tx_meta *meta_q; @@ -91,6 +96,7 @@ eth_ark_xmit_pkts(void *vtxq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) uint32_t prod_index_limit; int stat; uint16_t nb; + const uint32_t min_pkt_len = ARK_MIN_TX_PKTLEN; queue = (struct ark_tx_queue *)vtxq; @@ -104,27 +110,25 @@ eth_ark_xmit_pkts(void *vtxq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) ++nb) { mbuf = tx_pkts[nb]; - if (ARK_TX_PAD_TO_60) { - if (unlikely(rte_pktmbuf_pkt_len(mbuf) < 60)) { - /* this packet even if it is small can be split, - * be sure to add to the end mbuf + if (unlikely(rte_pktmbuf_pkt_len(mbuf) < min_pkt_len)) { + /* this packet even if it is small can be split, + * be sure to add to the end mbuf + */ + uint16_t to_add = min_pkt_len - + rte_pktmbuf_pkt_len(mbuf); + char *appended = + rte_pktmbuf_append(mbuf, to_add); + + if (appended == 0) { + /* This packet is in error, + * we cannot send it so just + * count it and delete it. */ - uint16_t to_add = - 60 - rte_pktmbuf_pkt_len(mbuf); - char *appended = - rte_pktmbuf_append(mbuf, to_add); - - if (appended == 0) { - /* This packet is in error, - * we cannot send it so just - * count it and delete it. - */ - queue->tx_errors += 1; - rte_pktmbuf_free(mbuf); - continue; - } - memset(appended, 0, to_add); + queue->tx_errors += 1; + rte_pktmbuf_free(mbuf); + continue; } + memset(appended, 0, to_add); } if (unlikely(mbuf->nb_segs != 1)) { diff --git a/drivers/net/ark/ark_logs.h b/drivers/net/ark/ark_logs.h index c3d7e7d39..ca46d86c9 100644 --- a/drivers/net/ark/ark_logs.h +++ b/drivers/net/ark/ark_logs.h @@ -8,14 +8,6 @@ #include #include - -/* Configuration option to pad TX packets to 60 bytes */ -#ifdef RTE_LIBRTE_ARK_PAD_TX -#define ARK_TX_PAD_TO_60 1 -#else -#define ARK_TX_PAD_TO_60 0 -#endif - /* system camel case definition changed to upper case */ #define PRIU32 PRIu32 #define PRIU64 PRIu64