From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C5AD5A04B1; Tue, 8 Sep 2020 21:20:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C4AC41C0C9; Tue, 8 Sep 2020 21:20:39 +0200 (CEST) Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by dpdk.org (Postfix) with ESMTP id 2D9604C99 for ; Tue, 8 Sep 2020 21:20:36 +0200 (CEST) Received: by mail-qk1-f196.google.com with SMTP id o16so160011qkj.10 for ; Tue, 08 Sep 2020 12:20:36 -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=mL7ygDrK08p2EfiDItWboCWYIEdVJpQ9i1oceBJ4dt8=; b=SQG+rMIq5VOm5UubWg20alkmiW9CEcnM4HFSj90tWKvL/PrjqdYxU+0tgJxhH3rjy/ JgOoqS+C96xA8whktPGRiUcDTvUqiN38LzAYfJ81MTOLHT1In8EvcnUSq0zf2ujSr8pA aIJGQzFT6sGM4NuxZ+M0LY2sHstWlcSDSKNV/cw2ocF4eu6IWQcHUlGm2NoOYVLWJ9M7 MOBeYLHcN2bMHbPiU6b8x94Juz5E/EIDCjBEU0Va6YnJRcKHxOEbUt94ffqecUhUaibK RnNxM0Xmxx9s5fPF4GHVaBLt1dvBoZasIP1Im8N/tEGl9pl56MQtbUMTCc6xcBBSlRVI mviA== 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=mL7ygDrK08p2EfiDItWboCWYIEdVJpQ9i1oceBJ4dt8=; b=hyL7piQKbztEc56UV/8Gfil/WGfQTN+8ZbMdK4VkKzWa3oT90xlRdxT4OGc9kWtt3w bWewmdu76czK9LbsDOoh7vRxqn1m3IsRI1WZfjMQfFMgZgG9EIaM9hVACdfb5+EpceyC wpU7A6FMh9HxkOm2pXeGTtyOP0QTGHh129E36TP1PfQ5WENq9PU4BrneLjyPFNiROUyo WAb8DTq3X+3sBv6HAwMUgSw7ymlyhdxKlir6khaI0J9nWqwZqKSY4JNx5bXglyk/9xBh 5j4hx0DZnS5Sq/JVCECppiRB3Jx1HffC/HxtO+Jziz2WK6VN2AGyCstoBohwd0906rbM sIZA== X-Gm-Message-State: AOAM531nP2g+qFB2Lnhgsu/nfMOWWSW2l1YUsFgqX9WPbczq01zbrDHd yo19wfk4HdnCE1COPumeN9Izh69wS6lBLw== X-Google-Smtp-Source: ABdhPJzE4XVMKClnsZvkLZfvJ9qiouARJPR8xgJKuyQhLFrhXhiuOJBi3hiv+R9I8XrnCvxZbw6JGg== X-Received: by 2002:a37:e01:: with SMTP id 1mr118055qko.128.1599592834976; Tue, 08 Sep 2020 12:20:34 -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 t11sm383111qtp.32.2020.09.08.12.20.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 12:20:34 -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: Tue, 8 Sep 2020 15:20:18 -0400 Message-Id: <20200908192018.18798-2-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200908192018.18798-1-ed.czeck@atomicrules.com> References: <20200819153539.32698-1-ed.czeck@atomicrules.com> <20200908192018.18798-1-ed.czeck@atomicrules.com> Subject: [dpdk-dev] [PATCH v7 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 --- v7: -- add ARK_MIN_TX_PKTLEN to conditional expression to avoid compile warning with icc. -- restore CONFIG_RTE_LIBRTE_ARK_PMD doc as requested. --- doc/guides/nics/ark.rst | 13 ++++++++-- drivers/net/ark/ark_ethdev_tx.c | 43 ++++++++++++++++++--------------- drivers/net/ark/ark_logs.h | 8 ------ 3 files changed, 35 insertions(+), 29 deletions(-) diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst index c3ffcbbc2..358e7f624 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. + * **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..a0e35af88 100644 --- a/drivers/net/ark/ark_ethdev_tx.c +++ b/drivers/net/ark/ark_ethdev_tx.c @@ -14,6 +14,11 @@ #define ARK_TX_META_OFFSET (RTE_PKTMBUF_HEADROOM - ARK_TX_META_SIZE) #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 { @@ -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,26 @@ 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 (min_pkt_len && + 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 -- 2.17.1