From patchwork Wed Jan 19 19:12:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Miller X-Patchwork-Id: 106093 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 5330EA00C2; Wed, 19 Jan 2022 20:13:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A9BE5411DB; Wed, 19 Jan 2022 20:13:10 +0100 (CET) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mails.dpdk.org (Postfix) with ESMTP id 0DFDD411B6 for ; Wed, 19 Jan 2022 20:13:09 +0100 (CET) Received: by mail-pl1-f182.google.com with SMTP id d1so3091468plh.10 for ; Wed, 19 Jan 2022 11:13:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atomicrules-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h3CXcX8IfdRhOClDSwUBVI6lfs40fOYVVtnSWAjilhk=; b=1dSW4QM80JFmZ2V6fEufx6eGxQSKUJ5qhTV3fw4wo8FN7KGxZXR3gZ5fJJuORldU/W ANFu5ekpBS/OAw3o12IRolLoHB2qk1ujGiJ6lZ2AtQ0IKUg3Cw0tOuXl8NgNx7TokcBs rUl5fhPl0oc/BV3M1yS/0l93FUusWK3tsF95NP5p47fORYYq1rCKDTRxcmCplWLIhUIf 5H9TsyMz1Kyc4k2HrYG+mvXCDVkBjXWldIBScj1QcfsiJNbVhvZP5SsB+crpX5c6ceoj uMbFBaWGAxrGb2Fyn2JNSFIuzqGcZGo7/CqFhP8ubY22DSUuqhDw8krq9w7BjgCxEMCx 3zPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h3CXcX8IfdRhOClDSwUBVI6lfs40fOYVVtnSWAjilhk=; b=vafwfN1IZHRIfro0MK44ZpXARQsuA9SsF4Gk9zRvgd9l1jmb9J8/ft1ANt7/krwLB1 BV4afmVaGtFHEG66QUwxY8KbistmAndXjFU0tRXsYuQBNLNMO9DXw5pGgv/XOs74McC/ wHW3Ji6Dq4EsWxxBNgpltyHc/thK34pWwrXzH1ZtPC6YaHyYUibZtJM1jUWXcqTi6H1i 00fAhJdjgxPI4SV4NB+xvBguPGxERtXTd/rz9esvjmyXQVV7XV/8PrzytnJyNtsA146Y /bWQ0SNwaPEJUInRKteU9ojQpgCr0OCUk91fYr4ije3YAdt8nD0DEudkyH7s+Bn20LA8 cWpw== X-Gm-Message-State: AOAM533LZC7Fsvv5rWhDuTLe0tggVDQb9aMbcE5cnA06tN9zo/U9845q 1eCmq1fn3W4TRSBk1gP61j3pyjggfIdaRg== X-Google-Smtp-Source: ABdhPJxVNNvI5qQk2eyW2RquRlT0lDmL4ugLVMKeZxaxkNzOH1fRsm1wneDbJsLdLzcdjINT9OU4rw== X-Received: by 2002:a17:90b:4ac5:: with SMTP id mh5mr6066364pjb.197.1642619588937; Wed, 19 Jan 2022 11:13:08 -0800 (PST) Received: from john-All-Series.tds (h75-100-85-216.cntcnh.broadband.dynamic.tds.net. [75.100.85.216]) by smtp.gmail.com with ESMTPSA id c17sm399845pfc.171.2022.01.19.11.13.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jan 2022 11:13:08 -0800 (PST) From: John Miller To: dev@dpdk.org, ferruh.yigit@intel.com Cc: John Miller Subject: [PATCH 2/4] net/ark: support arbitrary mbuf size Date: Wed, 19 Jan 2022 13:12:53 -0600 Message-Id: <20220119191255.273988-2-john.miller@atomicrules.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220119191255.273988-1-john.miller@atomicrules.com> References: <20220119191255.273988-1-john.miller@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 Support arbitrary mbuf size per queue. Signed-off-by: John Miller --- drivers/net/ark/ark_ethdev.c | 8 -------- drivers/net/ark/ark_ethdev_rx.c | 23 +++++++++++++++++++---- drivers/net/ark/ark_udm.h | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index 0414c78bb5..b9843414b1 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -511,14 +511,6 @@ ark_config_device(struct rte_eth_dev *dev) mpu = RTE_PTR_ADD(mpu, ARK_MPU_QOFFSET); } - ark_udm_stop(ark->udm.v, 0); - ark_udm_configure(ark->udm.v, - RTE_PKTMBUF_HEADROOM, - RTE_MBUF_DEFAULT_DATAROOM, - ARK_RX_WRITE_TIME_NS); - ark_udm_stats_reset(ark->udm.v); - ark_udm_stop(ark->udm.v, 0); - /* TX -- DDM */ if (ark_ddm_stop(ark->ddm.v, 1)) ARK_PMD_LOG(ERR, "Unable to stop DDM\n"); diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c index 98658ce621..1000f50be0 100644 --- a/drivers/net/ark/ark_ethdev_rx.c +++ b/drivers/net/ark/ark_ethdev_rx.c @@ -12,7 +12,6 @@ #define ARK_RX_META_SIZE 32 #define ARK_RX_META_OFFSET (RTE_PKTMBUF_HEADROOM - ARK_RX_META_SIZE) -#define ARK_RX_MAX_NOCHAIN (RTE_MBUF_DEFAULT_DATAROOM) /* Forward declarations */ struct ark_rx_queue; @@ -41,6 +40,9 @@ struct ark_rx_queue { rx_user_meta_hook_fn rx_user_meta_hook; void *ext_user_data; + uint32_t dataroom; + uint32_t headroom; + uint32_t queue_size; uint32_t queue_mask; @@ -164,6 +166,9 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev, /* NOTE zmalloc is used, no need to 0 indexes, etc. */ queue->mb_pool = mb_pool; + queue->dataroom = rte_pktmbuf_data_room_size(mb_pool) - + RTE_PKTMBUF_HEADROOM; + queue->headroom = RTE_PKTMBUF_HEADROOM; queue->phys_qid = qidx; queue->queue_index = queue_idx; queue->queue_size = nb_desc; @@ -196,6 +201,15 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev, queue->udm = RTE_PTR_ADD(ark->udm.v, qidx * ARK_UDM_QOFFSET); queue->mpu = RTE_PTR_ADD(ark->mpurx.v, qidx * ARK_MPU_QOFFSET); + /* Configure UDM per queue */ + ark_udm_stop(queue->udm, 0); + ark_udm_configure(queue->udm, + RTE_PKTMBUF_HEADROOM, + queue->dataroom, + ARK_RX_WRITE_TIME_NS); + ark_udm_stats_reset(queue->udm); + ark_udm_stop(queue->udm, 0); + /* populate mbuf reserve */ status = eth_ark_rx_seed_mbufs(queue); @@ -276,6 +290,7 @@ eth_ark_recv_pkts(void *rx_queue, mbuf->data_len = meta->pkt_len; if (ARK_DEBUG_CORE) { /* debug sanity checks */ + if ((meta->pkt_len > (1024 * 16)) || (meta->pkt_len == 0)) { ARK_PMD_LOG(DEBUG, "RX: Bad Meta Q: %u" @@ -304,7 +319,7 @@ eth_ark_recv_pkts(void *rx_queue, } } - if (unlikely(meta->pkt_len > ARK_RX_MAX_NOCHAIN)) + if (unlikely(meta->pkt_len > queue->dataroom)) cons_index = eth_ark_rx_jumbo (queue, meta, mbuf, cons_index + 1); else @@ -345,14 +360,14 @@ eth_ark_rx_jumbo(struct ark_rx_queue *queue, /* first buf populated by called */ mbuf_prev = mbuf0; segments = 1; - data_len = RTE_MIN(meta->pkt_len, RTE_MBUF_DEFAULT_DATAROOM); + data_len = RTE_MIN(meta->pkt_len, queue->dataroom); remaining = meta->pkt_len - data_len; mbuf0->data_len = data_len; /* HW guarantees that the data does not exceed prod_index! */ while (remaining != 0) { data_len = RTE_MIN(remaining, - RTE_MBUF_DEFAULT_DATAROOM); + queue->dataroom); remaining -= data_len; segments += 1; diff --git a/drivers/net/ark/ark_udm.h b/drivers/net/ark/ark_udm.h index 4e51a5e82c..1cbcd94a98 100644 --- a/drivers/net/ark/ark_udm.h +++ b/drivers/net/ark/ark_udm.h @@ -33,7 +33,7 @@ struct ark_rx_meta { #define ARK_RX_WRITE_TIME_NS 2500 #define ARK_UDM_SETUP 0 #define ARK_UDM_CONST2 0xbACECACE -#define ARK_UDM_CONST3 0x334d4455 +#define ARK_UDM_CONST3 0x344d4455 #define ARK_UDM_CONST ARK_UDM_CONST3 struct ark_udm_setup_t { uint32_t r0;