From patchwork Mon Aug 24 13:36:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 75885 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 67F9BA04AC; Mon, 24 Aug 2020 15:37:06 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 786621C0B0; Mon, 24 Aug 2020 15:36:57 +0200 (CEST) Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by dpdk.org (Postfix) with ESMTP id 58CB51C0B0 for ; Mon, 24 Aug 2020 15:36:56 +0200 (CEST) Received: by mail-qk1-f195.google.com with SMTP id m7so7329008qki.12 for ; Mon, 24 Aug 2020 06:36:56 -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=gcsTHtZV4waAfdRxQUn6q2IgwU/d/fpBHotaSprRgK0=; b=aWRpKPioI2P+KWCLaBk9Hk6vflON9o/8kHq5UpVjHQRtVoPfnp27HQ+Qh7OosxJlST 9xm7Lg50AysKxxLHVIG/cHZBMgcJuB2BaLxoZYBsUvSXN3xMjSQFHHIfEvuvjj9c8Puu c1G8Oewlq7aF4toiedWgiFcBcWxHBbWZ4FiVJa/aclZgaxd1mdoE6Hx66crwsxm0Dwdx ISG5YwLlMwTdW7lcpve26SkgZouTxsMoNX8toBaGtH0+g2rhqRVVB46ilxSocAuHN5Ai Z++PyVKvNX7X1mQIqcI5pb8pSBt5FUvs5NMj6E6/KVCxVENtvQaEY9XyqQiIlklfzSWU 02Nw== 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=gcsTHtZV4waAfdRxQUn6q2IgwU/d/fpBHotaSprRgK0=; b=uRp0JRitPmB0Sgykfvy/X7D37xe+ADgGVG4Ni7ImFBWWfhPZrnq2yQpp2z3gticgAy pr4Kvc1+tv2AVxJqKeZ6TY7LZhOeikc8UijpuvqB1xjfGl8EM2OgSe2VlRA3GjTRyaRz Z6W/eFwd3S7pHamn1+qkdbQX0wK2Iilm2ACQUFMRZzsPWQZcXHeBSDTeErLXpHG/3P+X lc1txEB+YbruVH2xxAP2nGOU0UbfL+XV2Pm6KkpixWhSq8fChGnw9oPSZNczSU1TkO2G KD/pCEXTO+FhzKPkD5XYfjYXj4K3vvOjMSPpFPOVPEEnjfvPtajoJ7b3bQ+QwHdnu7q0 tsXg== X-Gm-Message-State: AOAM533XseoF73RJqjVZ9Id1k8W7z1UIRFUcVAgj6Axwk0GtzJWKy2Bh C+d9E1dWT+VcbenZWdHX+LdZtvOE0nyoNTM6 X-Google-Smtp-Source: ABdhPJywlmqjwYpFYiT2mIZpmGHwxcI6NZZdriSqTNIkUhQgoTtf5QLCdTOdLjyNHp11FitR2Yh7hQ== X-Received: by 2002:ae9:f106:: with SMTP id k6mr4433774qkg.3.1598276214310; Mon, 24 Aug 2020 06:36:54 -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 p34sm11855707qte.79.2020.08.24.06.36.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2020 06:36:53 -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: Mon, 24 Aug 2020 09:36:41 -0400 Message-Id: <20200824133641.19450-2-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200824133641.19450-1-ed.czeck@atomicrules.com> References: <20200819153539.32698-1-ed.czeck@atomicrules.com> <20200824133641.19450-1-ed.czeck@atomicrules.com> Subject: [dpdk-dev] [PATCH 2/2] net/ark: remove RTE_LIBRTE_ARK_PAD_TX 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" Replace behavior with RTE_LIBRTE_ARK_MIN_TX_PKTLEN with a default value of 0. Update documentation as needed. Signed-off-by: Ed Czeck --- doc/guides/nics/ark.rst | 13 ++++++++-- drivers/net/ark/ark_ethdev_tx.c | 44 +++++++++++++++++++-------------- drivers/net/ark/ark_logs.h | 8 ------ 3 files changed, 36 insertions(+), 29 deletions(-) diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst index c3ffcbbc2..f4d4539e5 100644 --- a/doc/guides/nics/ark.rst +++ b/doc/guides/nics/ark.rst @@ -129,8 +129,10 @@ 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. + * **CONFIG_RTE_LIBRTE_ARK_MIN_TX_PKTLEN** (default 0): Sets the minimum + packet length for tx packets to the FPGA. Packets less than this + length are padded to meet the requirement. This allows padding to + be offloaded or remain in host software. Building DPDK @@ -144,6 +146,13 @@ By default the ARK PMD library will be built into the DPDK library. For configuring and using UIO and VFIO frameworks, please also refer :ref:`the documentation that comes with DPDK suite `. +To build with a non-zero minimum tx packet length, set the above macro in your +CFLAGS environment prior to the meson build step. I.e., + + export CFLAGS="-DRTE_LIBRTE_ARK_MIN_TX_PKTLEN=60" + meson build + + Supported ARK RTL PCIe Instances -------------------------------- diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c index 72624deb3..d24d7ac21 100644 --- a/drivers/net/ark/ark_ethdev_tx.c +++ b/drivers/net/ark/ark_ethdev_tx.c @@ -15,6 +15,13 @@ #define ARK_TX_MAX_NOCHAIN (RTE_MBUF_DEFAULT_DATAROOM) +#ifndef RTE_LIBRTE_ARK_MIN_TX_PKTLEN +#define ARK_MIN_TX_PKTLEN 0 +#else +#define ARK_MIN_TX_PKTLEN RTE_LIBRTE_ARK_MIN_TX_PKTLEN +#endif + + /* ************************************************************************* */ struct ark_tx_queue { struct ark_tx_meta *meta_q; @@ -91,6 +98,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 +112,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