From patchwork Wed Jan 19 19:12:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Miller X-Patchwork-Id: 106092 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 13D28A00C2; Wed, 19 Jan 2022 20:13:10 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D39354118F; Wed, 19 Jan 2022 20:13:09 +0100 (CET) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mails.dpdk.org (Postfix) with ESMTP id 9E2A541147 for ; Wed, 19 Jan 2022 20:13:08 +0100 (CET) Received: by mail-pj1-f51.google.com with SMTP id s61-20020a17090a69c300b001b4d0427ea2so7148279pjj.4 for ; Wed, 19 Jan 2022 11:13:08 -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:mime-version :content-transfer-encoding; bh=jcWBWCwVSPygDilewyDQPR99yZAOFUToaJhAHK4SJK4=; b=IuDUpvAPmrceebRSu5ue5hI3A5Y0K1CMk3ozR2Zbqt+40iiGIj6J20bD2zQFVNPbCX vFl/8fBcT1pn+bsHFx3BvhJoYEMxjBWYtZRJ0CJXU+1K6bmhnEYltH7uiYqbnZw+92aa hWocykX7W5o8xn2pF4DqDkoGuJ1XqZfcIsOj0wJmbsKipP4ISWWmYJcxsK6WLo9qQVit NANEiHzlYqRWTI47fvJIjLpx1+kudEvmoq1e30CrYEKs3NTGwVgSfax0VPNyt0bvu6Dh ZFtfYyX+25fEKEHEJWoWr2r4bewthFrYvhkh0phA6O4CV+iCpN2+beJze/JoNyxoBzeb GnQg== 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:mime-version :content-transfer-encoding; bh=jcWBWCwVSPygDilewyDQPR99yZAOFUToaJhAHK4SJK4=; b=X7Xa0upL4QffnF0gzoRqcsQzQabx6ylIKj8XRB/QZ33xhvRxwDKR+WB6qEK6T7y3BY vtY7xqQEEkDL0BuHGrtXQz5Mi4XrY/Xtl7xjOszeSp6iVTVOuBtGQdUV5vg29Cm/Hcgw Ga+Yh+44Qco6ksV449Q+pBKTYvl9av9Cckv50MhsP+8l0UtVglUbXXugS196iZqi5Zyv vBMLgSsVIcjWhbu+jVTz5cMMVo/b74WxruVE1B4hMqyOqXurLd9cCrlx8a+OuDixwMiG Vns29QSwK8QP/e3OXagl/wnzGNWvs9gUl5ZTfyWadSMMZypJe23lLmfUtLaqlN0SkO4B FawA== X-Gm-Message-State: AOAM531VvwVaXBZ9wOvYGwA69yRk7c9U2hQCPMJPYSTn+mAAMras3J5F lYEMbUbQfDXPWPg8BsO5DgW5ZvUP9Tfy9w== X-Google-Smtp-Source: ABdhPJwzs51kb6bzpdgbr5JgXnHMRx/bCRImYKqhYU5DFor5iXjimTWbQAt8NrwbA6ZOy452Jy7mKQ== X-Received: by 2002:a17:90a:bd09:: with SMTP id y9mr5984544pjr.57.1642619587721; Wed, 19 Jan 2022 11:13:07 -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.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jan 2022 11:13:07 -0800 (PST) From: John Miller To: dev@dpdk.org, ferruh.yigit@intel.com Cc: John Miller Subject: [PATCH 1/4] net/ark: add device capabilities record Date: Wed, 19 Jan 2022 13:12:52 -0600 Message-Id: <20220119191255.273988-1-john.miller@atomicrules.com> X-Mailer: git-send-email 2.25.1 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 Add static record of supported device capabilities. Signed-off-by: John Miller --- drivers/net/ark/ark_ethdev.c | 58 +++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index b618cba3f0..0414c78bb5 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -96,6 +96,26 @@ static const struct rte_pci_id pci_id_ark_map[] = { {.vendor_id = 0, /* sentinel */ }, }; +struct ark_caps { + bool rqpacing; +}; +struct ark_dev_caps { + uint32_t device_id; + struct ark_caps caps; +}; +static const struct ark_dev_caps +ark_device_caps[] = { + {0x100d, {.rqpacing = true} }, + {0x100e, {.rqpacing = true} }, + {0x100f, {.rqpacing = true} }, + {0x1010, {.rqpacing = false} }, + {0x1017, {.rqpacing = true} }, + {0x1018, {.rqpacing = true} }, + {0x1019, {.rqpacing = true} }, + {0x101e, {.rqpacing = false} }, + {.device_id = 0,} +}; + static int eth_ark_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, struct rte_pci_device *pci_dev) @@ -256,6 +276,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev) int ret; int port_count = 1; int p; + bool rqpacing = false; ark->eth_dev = dev; @@ -270,6 +291,15 @@ eth_ark_dev_init(struct rte_eth_dev *dev) rte_eth_copy_pci_info(dev, pci_dev); dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; + p = 0; + while (ark_device_caps[p].device_id != 0) { + if (pci_dev->id.device_id == ark_device_caps[p].device_id) { + rqpacing = ark_device_caps[p].caps.rqpacing; + break; + } + p++; + } + /* Use dummy function until setup */ dev->rx_pkt_burst = ð_ark_recv_pkts_noop; dev->tx_pkt_burst = ð_ark_xmit_pkts_noop; @@ -288,8 +318,12 @@ eth_ark_dev_init(struct rte_eth_dev *dev) ark->pktgen.v = (void *)&ark->bar0[ARK_PKTGEN_BASE]; ark->pktchkr.v = (void *)&ark->bar0[ARK_PKTCHKR_BASE]; - ark->rqpacing = - (struct ark_rqpace_t *)(ark->bar0 + ARK_RCPACING_BASE); + if (rqpacing) { + ark->rqpacing = + (struct ark_rqpace_t *)(ark->bar0 + ARK_RCPACING_BASE); + } else { + ark->rqpacing = NULL; + } ark->started = 0; ark->pkt_dir_v = ARK_PKT_DIR_INIT_VAL; @@ -309,13 +343,15 @@ eth_ark_dev_init(struct rte_eth_dev *dev) return -1; } if (ark->sysctrl.t32[3] != 0) { - if (ark_rqp_lasped(ark->rqpacing)) { - ARK_PMD_LOG(ERR, "Arkville Evaluation System - " - "Timer has Expired\n"); - return -1; + if (ark->rqpacing) { + if (ark_rqp_lasped(ark->rqpacing)) { + ARK_PMD_LOG(ERR, "Arkville Evaluation System - " + "Timer has Expired\n"); + return -1; + } + ARK_PMD_LOG(WARNING, "Arkville Evaluation System - " + "Timer is Running\n"); } - ARK_PMD_LOG(WARNING, "Arkville Evaluation System - " - "Timer is Running\n"); } ARK_PMD_LOG(DEBUG, @@ -499,7 +535,8 @@ ark_config_device(struct rte_eth_dev *dev) ark_ddm_stats_reset(ark->ddm.v); ark_ddm_stop(ark->ddm.v, 0); - ark_rqp_stats_reset(ark->rqpacing); + if (ark->rqpacing) + ark_rqp_stats_reset(ark->rqpacing); return 0; } @@ -695,7 +732,8 @@ eth_ark_dev_close(struct rte_eth_dev *dev) /* * TODO This should only be called once for the device during shutdown */ - ark_rqp_dump(ark->rqpacing); + if (ark->rqpacing) + ark_rqp_dump(ark->rqpacing); for (i = 0; i < dev->data->nb_tx_queues; i++) { eth_ark_tx_queue_release(dev->data->tx_queues[i]); 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; From patchwork Wed Jan 19 19:12:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Miller X-Patchwork-Id: 106094 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 54C53A00C2; Wed, 19 Jan 2022 20:13:22 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C505F4120A; Wed, 19 Jan 2022 20:13:11 +0100 (CET) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mails.dpdk.org (Postfix) with ESMTP id 1144C411E1 for ; Wed, 19 Jan 2022 20:13:11 +0100 (CET) Received: by mail-pf1-f169.google.com with SMTP id i17so3136341pfk.11 for ; Wed, 19 Jan 2022 11:13:10 -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=sovRTlGi8ffMJJsPzFGMDD4Z/UKOg9uwAIC6tnH9qsE=; b=K6rHv4qlmkghsVy8QK4/ElEe/Qw+TGS4+weXMNBdOVuvuGrTwQhrDI6NDTygqSJTcf YctB88emdsTAy/PoDyTGeoxt9ihqdyks6BOwksyxAC1QBH2msGFuYNhSkUcxPXrwD9Ob Idn0u+ijyHrEaIeZBWkQVd4JhMDinkRaf/S7tt1tllDp0RUHhSfcKeUZKEyIhOG22nwi qE7pT4w4O3jWD6C/lHiDHqCGFyqCMRxqqkC25ZBPmJ0lkPbmXXh8AElzlO6cJhJuItuV KOiM8X5PGydZCXsR26W4YiljmtJtN5P5gGwpABtES79fIncqUXKX/pXJo/piXO9y4Qzr EwfA== 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=sovRTlGi8ffMJJsPzFGMDD4Z/UKOg9uwAIC6tnH9qsE=; b=xbccR2xFUDQ9ngDHkCwm5c3x2n8xLsA57+Fcs1qTtzrQWudKWykUqcYeSNMRrY1q08 gnucl4iELoNU9Cn34CNwikW5aA6AaZq9xXUJ08t9V44RMVSDjPIxt6GqyXHVgG2oRU8O DEf4kxs+JPvq0dClB31Lva+WqQHGBNa70XV0HW23KQGDdOpv9qLLZ9E+lsG886C9MINM JokKT+ME3Zn/sI03cKhdxoA4ST/ECNWkoEvwk0YtvNidQk2S7vyMZTe8D5OhaC+40fG2 QMcUK85hMPRvlMu/qTTWSs5ZRMjww0LJSa/0eEuDqwq/ZsR6FVn35bG6uoBuCDURpbK9 w9dg== X-Gm-Message-State: AOAM5332iPfBtqyZqCx3qWUw3fy7CI6xAQHxtKfpZU9VvH/oP+cvogOe 7c62VDCcRTBzqraU6pjqXFhYwY+VIyuuog== X-Google-Smtp-Source: ABdhPJzO+G/cmiGr2WSptEM0Nqz5r1UOTD4cfMBlvFAR0kFLaI3X5/uxP83dlAP9DUNoYecbnrNTRQ== X-Received: by 2002:a62:5251:0:b0:4bd:bc3a:2f77 with SMTP id g78-20020a625251000000b004bdbc3a2f77mr32347015pfb.3.1642619590079; Wed, 19 Jan 2022 11:13:10 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jan 2022 11:13:09 -0800 (PST) From: John Miller To: dev@dpdk.org, ferruh.yigit@intel.com Cc: John Miller Subject: [PATCH 3/4] net/ark: publish include file for external access Date: Wed, 19 Jan 2022 13:12:54 -0600 Message-Id: <20220119191255.273988-3-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 publish rte_pmd_ark.h for external access to extension Signed-off-by: John Miller --- doc/guides/nics/ark.rst | 4 ++-- drivers/net/ark/meson.build | 2 ++ drivers/net/ark/{ark_ext.h => rte_pmd_ark.h} | 8 ++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) rename drivers/net/ark/{ark_ext.h => rte_pmd_ark.h} (97%) diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst index da61814b5d..bcc3babd53 100644 --- a/doc/guides/nics/ark.rst +++ b/doc/guides/nics/ark.rst @@ -143,7 +143,7 @@ object file contains extension (or hook) functions that are registered and then called during PMD operations. The allowable set of extension functions are defined and documented in -``ark_ext.h``, only the initialization function, +``rte_pmd_ark.h``, only the initialization function, ``rte_pmd_ark_dev_init()``, is required; all others are optional. The following sections give a small extension example along with instructions for compiling and using the extension. @@ -157,7 +157,7 @@ during RX from user meta data coming from FPGA hardware. .. code-block:: c - #include + #include #include #include #include diff --git a/drivers/net/ark/meson.build b/drivers/net/ark/meson.build index 8d87744c22..83488d87a8 100644 --- a/drivers/net/ark/meson.build +++ b/drivers/net/ark/meson.build @@ -7,6 +7,8 @@ if is_windows subdir_done() endif +headers = files('rte_pmd_ark.h') + sources = files( 'ark_ddm.c', 'ark_ethdev.c', diff --git a/drivers/net/ark/ark_ext.h b/drivers/net/ark/rte_pmd_ark.h similarity index 97% rename from drivers/net/ark/ark_ext.h rename to drivers/net/ark/rte_pmd_ark.h index d235d0ff85..f77c36eb2d 100644 --- a/drivers/net/ark/ark_ext.h +++ b/drivers/net/ark/rte_pmd_ark.h @@ -5,7 +5,11 @@ #ifndef _ARK_EXT_H_ #define _ARK_EXT_H_ -#include +#include +struct rte_eth_dev; +struct rte_mbuf; +struct rte_ether_addr; +struct rte_eth_stats; /* The following section lists function prototypes for Arkville's * dynamic PMD extension. User's who create an extension @@ -55,7 +59,7 @@ void rte_pmd_ark_dev_uninit(struct rte_eth_dev *dev, void *user_data); * user argument from dev_init() call. * @return (0) if successful. */ -uint8_t dev_get_port_count(struct rte_eth_dev *dev, void *user_data); +uint8_t rte_pmd_ark_dev_get_port_count(struct rte_eth_dev *dev, void *user_data); /** * Extension prototype, optional implementation. From patchwork Wed Jan 19 19:12:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Miller X-Patchwork-Id: 106095 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 29276A00C2; Wed, 19 Jan 2022 20:13:27 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B2F8E4122E; Wed, 19 Jan 2022 20:13:13 +0100 (CET) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mails.dpdk.org (Postfix) with ESMTP id 3FFE741229 for ; Wed, 19 Jan 2022 20:13:12 +0100 (CET) Received: by mail-pl1-f181.google.com with SMTP id c3so3115953pls.5 for ; Wed, 19 Jan 2022 11:13:12 -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=MvvomVVCPtyzO8zbs7u6ncn4HVWVVhueldJWqg0c3/Y=; b=YSgp2scGaNp5tQgQgIXv5BSSbqEYTriR2OyYmEj9FQil1QNNVDLAIDgonc2lKzPk7B sWnIiCoQdLJNWWpOaeiY3YplFPd1FiDDhJ4feIoZud+bdz6GDbW33TLYumzHfIG+lIHN Pay+I2G2c32GwKYvFz8PrhmwjjIbNcKX6pdFfW/xWbgdE6CNTrNjU84EMZ6FWBAt/YAn hyEDasMa8ntIvuxS2HZJrDZLOrxmii9EC974B0sK+x7oxA6Z+Of4bRNah8kYMiGm7wFz I6bWdbLissaBHqfnzQ6X49YxNORlDpjashqD2IGQxVXFH6RvUMlkGhBxzg0uMkkR2HB1 06SQ== 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=MvvomVVCPtyzO8zbs7u6ncn4HVWVVhueldJWqg0c3/Y=; b=Xd5HAQXwxDg1+St/bBwl50bO6Uh4F4WFGfgcvYldIHt0FmXc7ZKg0l3UjV7v7+LJLQ yHfXyr3athHxX6j/nVFKwJOPMEJtxPscx9mLfwpWe64sEABcYhZvhaLi02wnJsW2KR13 lG8VgGQBrjnP042Ig0APMxNneI/pJ0QoYb2jYUvjqe5XhkMUBsZVSQXALYG+YNJexUp4 Dpj4yJIufg2Lw32mEYQoCIM3A7L8UaBJ7kS0AoKZdUfyymj77RWgAJSPf6/dL2zbmSQ/ X/yi2P+uj/aX4bp7QTur2bZZRg/96bBP3DyLpBn3I7Ot622Vo4d1oOfz0wBlqWkIa5H2 2StQ== X-Gm-Message-State: AOAM532psDq97FX2asSx2Cvrk7bIXyLPABwBWYK1813laRCkhKDImXZr ivLpmeN98gpafdQRKQbhhw7ZGzaUh+zs+g== X-Google-Smtp-Source: ABdhPJw4vZ0FdbDZPJKst0Sx07StdSAxjRZL2TeSEBeW+rwVRxVXkUGokRy0CPs9rM2s+iJ/khIi/g== X-Received: by 2002:a17:90b:4a45:: with SMTP id lb5mr6030991pjb.220.1642619591310; Wed, 19 Jan 2022 11:13:11 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jan 2022 11:13:10 -0800 (PST) From: John Miller To: dev@dpdk.org, ferruh.yigit@intel.com Cc: John Miller Subject: [PATCH 4/4] net/ark: support chunk DMA transfers Date: Wed, 19 Jan 2022 13:12:55 -0600 Message-Id: <20220119191255.273988-4-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 Add support for chunk DMA transfers. Signed-off-by: John Miller --- drivers/net/ark/ark_ddm.c | 1 + drivers/net/ark/ark_ethdev_rx.c | 16 +++++++++------- drivers/net/ark/ark_mpu.c | 1 + drivers/net/ark/ark_pktchkr.c | 2 +- drivers/net/ark/ark_pktgen.c | 2 +- drivers/net/ark/ark_udm.c | 3 +++ 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/drivers/net/ark/ark_ddm.c b/drivers/net/ark/ark_ddm.c index 2321371572..b16c739d50 100644 --- a/drivers/net/ark/ark_ddm.c +++ b/drivers/net/ark/ark_ddm.c @@ -55,6 +55,7 @@ ark_ddm_stop(struct ark_ddm_t *ddm, const int wait) int cnt = 0; ddm->cfg.command = 2; + rte_wmb(); while (wait && (ddm->cfg.stop_flushed & 0x01) == 0) { if (cnt++ > 1000) return 1; diff --git a/drivers/net/ark/ark_ethdev_rx.c b/drivers/net/ark/ark_ethdev_rx.c index 1000f50be0..49134ea08f 100644 --- a/drivers/net/ark/ark_ethdev_rx.c +++ b/drivers/net/ark/ark_ethdev_rx.c @@ -12,6 +12,7 @@ #define ARK_RX_META_SIZE 32 #define ARK_RX_META_OFFSET (RTE_PKTMBUF_HEADROOM - ARK_RX_META_SIZE) +#define ARK_RX_MPU_CHUNK (64U) /* Forward declarations */ struct ark_rx_queue; @@ -104,7 +105,7 @@ static inline void eth_ark_rx_update_cons_index(struct ark_rx_queue *queue, uint32_t cons_index) { queue->cons_index = cons_index; - if ((cons_index + queue->queue_size - queue->seed_index) >= 64U) { + if ((cons_index + queue->queue_size - queue->seed_index) >= ARK_RX_MPU_CHUNK) { eth_ark_rx_seed_mbufs(queue); ark_mpu_set_producer(queue->mpu, queue->seed_index); } @@ -179,12 +180,12 @@ eth_ark_dev_rx_queue_setup(struct rte_eth_dev *dev, queue->reserve_q = rte_zmalloc_socket("Ark_rx_queue mbuf", nb_desc * sizeof(struct rte_mbuf *), - 64, + 512, socket_id); queue->paddress_q = rte_zmalloc_socket("Ark_rx_queue paddr", nb_desc * sizeof(rte_iova_t), - 64, + 512, socket_id); if (queue->reserve_q == 0 || queue->paddress_q == 0) { @@ -455,7 +456,8 @@ eth_ark_rx_stop_queue(struct rte_eth_dev *dev, uint16_t queue_id) static inline int eth_ark_rx_seed_mbufs(struct ark_rx_queue *queue) { - uint32_t limit = queue->cons_index + queue->queue_size; + uint32_t limit = (queue->cons_index & ~(ARK_RX_MPU_CHUNK - 1)) + + queue->queue_size; uint32_t seed_index = queue->seed_index; uint32_t count = 0; @@ -618,14 +620,14 @@ eth_ark_udm_force_close(struct rte_eth_dev *dev) ark_mpu_start(queue->mpu); /* Add some buffers */ - index = 100000 + queue->seed_index; + index = ARK_RX_MPU_CHUNK + queue->seed_index; ark_mpu_set_producer(queue->mpu, index); } /* Wait to allow data to pass */ usleep(100); - ARK_PMD_LOG(DEBUG, "UDM forced flush attempt, stopped = %d\n", - ark_udm_is_flushed(ark->udm.v)); + ARK_PMD_LOG(NOTICE, "UDM forced flush attempt, stopped = %d\n", + ark_udm_is_flushed(ark->udm.v)); } ark_udm_reset(ark->udm.v); } diff --git a/drivers/net/ark/ark_mpu.c b/drivers/net/ark/ark_mpu.c index 8160c1de7b..b8e94b6ed3 100644 --- a/drivers/net/ark/ark_mpu.c +++ b/drivers/net/ark/ark_mpu.c @@ -68,6 +68,7 @@ ark_mpu_reset(struct ark_mpu_t *mpu) int cnt = 0; mpu->cfg.command = MPU_CMD_RESET; + rte_wmb(); while (mpu->cfg.command != MPU_CMD_IDLE) { if (cnt++ > 1000) diff --git a/drivers/net/ark/ark_pktchkr.c b/drivers/net/ark/ark_pktchkr.c index 84bb567a41..12a5abb2f7 100644 --- a/drivers/net/ark/ark_pktchkr.c +++ b/drivers/net/ark/ark_pktchkr.c @@ -113,7 +113,7 @@ ark_pktchkr_stopped(ark_pkt_chkr_t handle) struct ark_pkt_chkr_inst *inst = (struct ark_pkt_chkr_inst *)handle; uint32_t r = inst->sregs->pkt_start_stop; - return (((r >> 16) & 1) == 1); + return (((r >> 16) & 1) == 1) || (r == 0); } void diff --git a/drivers/net/ark/ark_pktgen.c b/drivers/net/ark/ark_pktgen.c index 515bfe461c..6195ef997f 100644 --- a/drivers/net/ark/ark_pktgen.c +++ b/drivers/net/ark/ark_pktgen.c @@ -107,7 +107,7 @@ ark_pktgen_paused(ark_pkt_gen_t handle) struct ark_pkt_gen_inst *inst = (struct ark_pkt_gen_inst *)handle; uint32_t r = inst->regs->pkt_start_stop; - return (((r >> 16) & 1) == 1); + return (((r >> 24) & 1) == 1) || (((r >> 16) & 1) == 1) || (r == 0); } void diff --git a/drivers/net/ark/ark_udm.c b/drivers/net/ark/ark_udm.c index 28c4500a2c..9ebed89627 100644 --- a/drivers/net/ark/ark_udm.c +++ b/drivers/net/ark/ark_udm.c @@ -33,7 +33,9 @@ ark_udm_stop(struct ark_udm_t *udm, const int wait) { int cnt = 0; + udm->setup.r0 = 0; udm->cfg.command = 2; + rte_wmb(); while (wait && (udm->cfg.stop_flushed & 0x01) == 0) { if (cnt++ > 1000) @@ -70,6 +72,7 @@ ark_udm_reset(struct ark_udm_t *udm) void ark_udm_start(struct ark_udm_t *udm) { + udm->setup.r0 = 0x100; udm->cfg.command = 1; }