From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 03596A0524;
Wed, 5 May 2021 09:36:29 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 88F944117E;
Wed, 5 May 2021 09:34:25 +0200 (CEST)
Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com
[209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id B5FD041170
for <dev@dpdk.org>; Wed, 5 May 2021 09:34:21 +0200 (CEST)
Received: by mail-wr1-f48.google.com with SMTP id m9so676327wrx.3
for <dev@dpdk.org>; Wed, 05 May 2021 00:34:21 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=semihalf-com.20150623.gappssmtp.com; s=20150623;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=NpQ9HN3AXzhE8td9v8kQ+3HT73rqUpU2QrOriVMqfbM=;
b=U56GOPvPAPliQwv57gOyesdmBJrhmf1tYyLSKa1uXfW0tAHgc0ZUYmF4VNV7T8P3tl
Y1UzQnD2LpcJsGkUT9zeUShl5CSmZUod79CHptuKl+AnpH858lM23R2Py9R9fyGQBNJY
PFx+QKTVkDdqTBXscbCO4/J9I3IJtO+otkzcrpss3n1KqqsEuVd/mwmkcoMPab9IpTmN
XJnt9l1lyobJ35d95E9EFvEXSla6fJXkkFohaHzNeR2lvsOeq8lPUakURT385q2c6xcs
dGNPUMZ31ynuf+RY8zSAKepkUcSCykp9/HrO8DWFYnNVeP4P8lj747ZduLQrAqDqDqCR
AERw==
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:mime-version:content-transfer-encoding;
bh=NpQ9HN3AXzhE8td9v8kQ+3HT73rqUpU2QrOriVMqfbM=;
b=j3XAGzzkR62YW7GrWcW6PdHdtqOJq3hx899NkUEShuYT44OffXyQA1kwQ2/A4L62Jh
PybSz9m2B10nVrneiu1ieLCRuCJGAfhyrb9awcKiHXDItULBIe2lZ7hsvpnaVivbw9u0
wZYIyE7wouMXtPrhUCgbrJScrQQMPRMt5cnA0HqdlDtbafdkGIsZMD53RhN7AIHwhK+c
VitOjE/d2NVXp5rmX44U0y0hZ6tKAUF0oGEmI1mengiz21yUXlQx/HTmkewnKIJa2CHz
Vj9nlvB+AsYu5TiJDFba0Q/MN/30nYoFkFgoDxyq2dKXwS5RTIf1n7MWkiDgb/bLq3yb
W8Kg==
X-Gm-Message-State: AOAM533oXuxOUYQPOZHzQLjAWY54QZUfaZn5qHBwQ3gJLxCDMi3dB24j
VBIAZ18ZVUrgDSCd3jNlGNb2yNRzk3BHEVYd
X-Google-Smtp-Source: ABdhPJy1DpMTIf9AryjedTVPzfVm1SATM6jY05y6Z3OZ8S06Odgdn1mlOu07KKGO3NwFpH+wLOpyMw==
X-Received: by 2002:adf:ce12:: with SMTP id p18mr32109212wrn.228.1620200061128;
Wed, 05 May 2021 00:34:21 -0700 (PDT)
Received: from DESKTOP-U5LNN3J.localdomain (89-79-189-199.dynamic.chello.pl.
[89.79.189.199])
by smtp.gmail.com with ESMTPSA id t17sm4679856wmq.12.2021.05.05.00.34.19
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 05 May 2021 00:34:20 -0700 (PDT)
From: Michal Krawczyk <mk@semihalf.com>
To: dev@dpdk.org
Cc: ndagan@amazon.com, gtzalik@amazon.com, igorch@amazon.com,
upstream@semihalf.com, Stanislaw Kardach <kda@semihalf.com>,
Michal Krawczyk <mk@semihalf.com>, Shay Agroskin <shayagr@amazon.com>
Date: Wed, 5 May 2021 09:33:43 +0200
Message-Id: <20210505073348.6394-18-mk@semihalf.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20210505073348.6394-1-mk@semihalf.com>
References: <20210430125725.28796-1-mk@semihalf.com>
<20210505073348.6394-1-mk@semihalf.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v2 17/22] net/ena: support SMP for mz alloc
counter
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Stanislaw Kardach <kda@semihalf.com>
Introduce a memory area for ENA driver shared between all the processes
of a same prefix (memzone backed).
Move the memzone allocation counter for ENA_MEM_ALLOC_COHERENT there so
that all processes may utilize it.
Signed-off-by: Stanislaw Kardach <kda@semihalf.com>
Reviewed-by: Michal Krawczyk <mk@semihalf.com>
Reviewed-by: Igor Chauskin <igorch@amazon.com>
Reviewed-by: Shay Agroskin <shayagr@amazon.com>
---
drivers/net/ena/base/ena_plat_dpdk.h | 6 ++--
drivers/net/ena/ena_ethdev.c | 46 +++++++++++++++++++++++++++-
drivers/net/ena/ena_ethdev.h | 8 +++++
3 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
index bfb4b9aaa8..3b85003cd0 100644
--- a/drivers/net/ena/base/ena_plat_dpdk.h
+++ b/drivers/net/ena/base/ena_plat_dpdk.h
@@ -209,7 +209,7 @@ typedef struct {
* Each rte_memzone should have unique name.
* To satisfy it, count number of allocations and add it to name.
*/
-extern rte_atomic64_t ena_alloc_cnt;
+extern rte_atomic64_t *ena_alloc_cnt;
#define ENA_MEM_ALLOC_COHERENT_ALIGNED( \
dmadev, size, virt, phys, mem_handle, alignment) \
@@ -219,7 +219,7 @@ extern rte_atomic64_t ena_alloc_cnt;
if (size > 0) { \
char z_name[RTE_MEMZONE_NAMESIZE]; \
snprintf(z_name, sizeof(z_name), "ena_alloc_%"PRIi64"",\
- rte_atomic64_add_return(&ena_alloc_cnt, 1)); \
+ rte_atomic64_add_return(ena_alloc_cnt, 1)); \
mz = rte_memzone_reserve_aligned(z_name, size, \
SOCKET_ID_ANY, RTE_MEMZONE_IOVA_CONTIG,\
alignment); \
@@ -249,7 +249,7 @@ extern rte_atomic64_t ena_alloc_cnt;
if (size > 0) { \
char z_name[RTE_MEMZONE_NAMESIZE]; \
snprintf(z_name, sizeof(z_name), "ena_alloc_%"PRIi64"",\
- rte_atomic64_add_return(&ena_alloc_cnt, 1)); \
+ rte_atomic64_add_return(ena_alloc_cnt, 1)); \
mz = rte_memzone_reserve_aligned(z_name, size, \
node, RTE_MEMZONE_IOVA_CONTIG, alignment); \
mem_handle = mz; \
diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index 5d107775f4..0780e2fee2 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -83,11 +83,15 @@ struct ena_stats {
/* Device arguments */
#define ENA_DEVARG_LARGE_LLQ_HDR "large_llq_hdr"
+#define ENA_MZ_SHARED_DATA "ena_shared_data"
+
/*
* Each rte_memzone should have unique name.
* To satisfy it, count number of allocation and add it to name.
*/
-rte_atomic64_t ena_alloc_cnt;
+rte_atomic64_t *ena_alloc_cnt;
+
+struct ena_shared_data *ena_shared_data;
static const struct ena_stats ena_stats_global_strings[] = {
ENA_STAT_GLOBAL_ENTRY(wd_expired),
@@ -1752,6 +1756,42 @@ static uint32_t ena_calc_max_io_queue_num(struct ena_com_dev *ena_dev,
return max_num_io_queues;
}
+static void ena_prepare_shared_data(struct ena_shared_data *shared_data)
+{
+ memset(shared_data, 0, sizeof(*shared_data));
+}
+
+static int ena_shared_data_init(void)
+{
+ const struct rte_memzone *mz;
+
+ if (ena_shared_data != NULL)
+ return 0;
+
+ if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+ /* Allocate shared memory. */
+ mz = rte_memzone_reserve(ENA_MZ_SHARED_DATA,
+ sizeof(*ena_shared_data),
+ SOCKET_ID_ANY, 0);
+ if (mz == NULL) {
+ PMD_INIT_LOG(CRIT, "Cannot allocate ena shared data");
+ return -rte_errno;
+ }
+ ena_prepare_shared_data(mz->addr);
+ } else {
+ /* Lookup allocated shared memory. */
+ mz = rte_memzone_lookup(ENA_MZ_SHARED_DATA);
+ if (mz == NULL) {
+ PMD_INIT_LOG(CRIT, "Cannot attach ena shared data");
+ return -rte_errno;
+ }
+ }
+ ena_shared_data = mz->addr;
+ /* Setup ENA_MEM memzone name counter. */
+ ena_alloc_cnt = &ena_shared_data->mz_alloc_cnt;
+ return 0;
+}
+
static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
{
struct ena_calc_queue_size_ctx calc_queue_ctx = { 0 };
@@ -1773,6 +1813,10 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)
eth_dev->tx_pkt_burst = ð_ena_xmit_pkts;
eth_dev->tx_pkt_prepare = ð_ena_prep_pkts;
+ rc = ena_shared_data_init();
+ if (rc != 0)
+ return rc;
+
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
diff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h
index ae235897ee..e8858c6118 100644
--- a/drivers/net/ena/ena_ethdev.h
+++ b/drivers/net/ena/ena_ethdev.h
@@ -207,6 +207,14 @@ struct ena_offloads {
bool rx_csum_supported;
};
+/* Holds data shared between all instances of ENA PMD. */
+struct ena_shared_data {
+ /* Each rte_memzone should have unique name.
+ * To satisfy it, count number of allocation and add it to name.
+ */
+ rte_atomic64_t mz_alloc_cnt;
+};
+
/* board specific private data structure */
struct ena_adapter {
/* OS defined structs */
--
2.25.1