From patchwork Tue Oct 10 20:42:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ed Czeck X-Patchwork-Id: 132486 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 E3F4E42350; Tue, 10 Oct 2023 22:42:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 381A140A70; Tue, 10 Oct 2023 22:42:19 +0200 (CEST) Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by mails.dpdk.org (Postfix) with ESMTP id 4C142402EA for ; Tue, 10 Oct 2023 22:42:16 +0200 (CEST) Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-77574c5979fso388538185a.3 for ; Tue, 10 Oct 2023 13:42:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atomicrules-com.20230601.gappssmtp.com; s=20230601; t=1696970535; x=1697575335; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=w9QpRJ8lI5G1eCEKOD+1JGcOh3ZmXohYcGsIeaDbFPw=; b=JFebvXA6SPLAM+3m0RkPgUDniCkFGlbYli0wL02wr5JawN8NwbT/1zbCaCBMatQH4X KajxlJLUCG7cLtBgLMjiGuQk5K6Xq0Apc5ZJr/ArcF7uZHqEw0vVR+JSm3GYMqTwsQiG 04AkqiZ5VV2mDV1vMTatSCv7TObQygkS8D03AOdoFhqwVoe9E793MERPSOwtalPwXuwk rYNInDWPJemWI/D+lug7SSlslpTRVJMtd83t+mf4cTyOeINfmHUo3MwctPJI20xRdh14 ugZWD/em6dsK+0gMPXatx+gL4553KpQRK9UrCazhig86BWcp++z7peJmcR+auCUkDq/O 8bEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696970535; x=1697575335; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=w9QpRJ8lI5G1eCEKOD+1JGcOh3ZmXohYcGsIeaDbFPw=; b=Tmg4zLEScA56hsoc13Xuq3gCtJkDSH/n+BqluiTNCjFyglLen8EZ6kPHg5jgseDe25 AsMmncOxoInRgaE03kFjDoUMFAulZ/IjFZNbwqA6Ty4AS4LOMrm1SVuCAkch3t+k4MuO 9dn7PkRaBnpxwxONLc4ejhSXEVQHQMQ9OlsEtLxueYytqIKRa75zmj2ilve6mhAEMnqL Bo0mqxiQKY01GvuFKk3khK8i7FjRqwEXUTIwA205jknJsOzis/n+OYJ9SdTFXxq0u5dh Bc7TMiLZCISKYKon+pfWwnEqKWpxlJ2d/vFy54pWSxiJjaA6p2pYhiOE0MGssP0kWQ+L pUAA== X-Gm-Message-State: AOJu0Yw7esZteg7i6R1uV5WCuTYTTVNdO+U9YzghaNcLJFmYNUUdzRaX fXbKxNvUYBp9MwwDVOHSI/bO4YM+3vtHyEYXpFY= X-Google-Smtp-Source: AGHT+IFo9JIkAN7LAPyU0a56yAUrs7JcPpi7OGzC1i7frTml05bln9Xj9Drj3Ti/MvGbH9LT4Y6iWg== X-Received: by 2002:a05:620a:1210:b0:775:7909:ece8 with SMTP id u16-20020a05620a121000b007757909ece8mr18928401qkj.43.1696970535640; Tue, 10 Oct 2023 13:42:15 -0700 (PDT) Received: from z690.czeck.local (pool-173-48-111-149.bstnma.fios.verizon.net. [173.48.111.149]) by smtp.gmail.com with ESMTPSA id c27-20020a05620a165b00b0076cc0a6e127sm4603280qko.116.2023.10.10.13.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Oct 2023 13:42:15 -0700 (PDT) From: Ed Czeck To: ferruh.yigit@amd.com, dev@dpdk.org Cc: Shepard Siegel , John Miller Subject: [PATCH v2 3/3] net/ark: support for large dataroom in FPGA Date: Tue, 10 Oct 2023 16:42:07 -0400 Message-Id: <20231010204207.1027430-3-ed.czeck@atomicrules.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231010204207.1027430-1-ed.czeck@atomicrules.com> References: <20231005205217.1753187-1-ed.czeck@atomicrules.com> <20231010204207.1027430-1-ed.czeck@atomicrules.com> 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 Allow for non-standard dataroom sizes for upstream data motion when using a custom mbuf pool. - New firmware version for UDM (Upstream Data Mover) - New layout on ark_rx_meta data Signed-off-by: Ed Czeck --- doc/guides/nics/ark.rst | 1 + drivers/net/ark/ark_ethdev_rx.c | 8 ++++++++ drivers/net/ark/ark_ext.h | 9 +++++++++ drivers/net/ark/ark_udm.h | 5 +++-- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst index e1683cf782..bcc9f505df 100644 --- a/doc/guides/nics/ark.rst +++ b/doc/guides/nics/ark.rst @@ -334,6 +334,7 @@ with Arkville releases 21.05, 21.08 and 21.11. LTS versions of DPDK remain compatible with the corresponding Arkville version. If other combinations are required, please contact Atomic Rules support. +* DPDK 23.11 requires Arkville 23.11. * DPDK 22.07 requires Arkville 22.07. * DPDK 22.03 requires Arkville 22.03. * DPDK 21.05 requires Arkville 21.05. diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c index 38bc69dff4..24f1c65690 100644 --- a/drivers/net/ark/ark_ethdev_rx.c +++ b/drivers/net/ark/ark_ethdev_rx.c @@ -9,6 +9,7 @@ #include "ark_logs.h" #include "ark_mpu.h" #include "ark_udm.h" +#include "ark_ext.h" #define ARK_RX_META_SIZE 32 #define ARK_RX_META_OFFSET (RTE_PKTMBUF_HEADROOM - ARK_RX_META_SIZE) @@ -166,6 +167,13 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev, queue->mb_pool = mb_pool; queue->dataroom = rte_pktmbuf_data_room_size(mb_pool) - RTE_PKTMBUF_HEADROOM; + + /* Check pool's private data to confirm pool structure */ + if (mb_pool->private_data_size != 0) { + struct rte_pmd_ark_lmbuf_mempool_priv *pool_priv = rte_mempool_get_priv(mb_pool); + if (strncmp(pool_priv->cookie, ARK_MEMPOOL_COOKIE, sizeof(pool_priv->cookie)) == 0) + queue->dataroom = pool_priv->dataroom; + } queue->headroom = RTE_PKTMBUF_HEADROOM; queue->phys_qid = qidx; queue->queue_index = queue_idx; diff --git a/drivers/net/ark/ark_ext.h b/drivers/net/ark/ark_ext.h index d235d0ff85..6d37449195 100644 --- a/drivers/net/ark/ark_ext.h +++ b/drivers/net/ark/ark_ext.h @@ -5,6 +5,7 @@ #ifndef _ARK_EXT_H_ #define _ARK_EXT_H_ +#include #include /* The following section lists function prototypes for Arkville's @@ -16,6 +17,14 @@ * See documentation for compiling and use of extensions. */ +/* private data optionally attached to mempool for rx */ +struct rte_pmd_ark_lmbuf_mempool_priv { + struct rte_pktmbuf_pool_private pool_private; + char cookie[4]; + uint32_t dataroom; +}; +#define ARK_MEMPOOL_COOKIE "ARK1" + /** * Extension prototype, required implementation if extensions are used. * Called during device probe to initialize the user structure diff --git a/drivers/net/ark/ark_udm.h b/drivers/net/ark/ark_udm.h index f0685c95c7..ec53ec7e79 100644 --- a/drivers/net/ark/ark_udm.h +++ b/drivers/net/ark/ark_udm.h @@ -20,7 +20,8 @@ */ struct ark_rx_meta { uint32_t user_meta[5]; /* user defined based on fpga code */ - uint8_t reserved[10]; + uint32_t pkt_len32; + uint8_t reserved[6]; uint16_t pkt_len; } __rte_packed; @@ -33,7 +34,7 @@ struct ark_rx_meta { #define ARK_RX_WRITE_TIME_NS 2500 #define ARK_UDM_SETUP 0 #define ARK_UDM_MODID 0x4d445500 -#define ARK_UDM_MODVER 0x37313232 +#define ARK_UDM_MODVER 0x37333332 struct ark_udm_setup_t { union {