From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EC536A0546; Fri, 30 Apr 2021 14:59:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B74674132C; Fri, 30 Apr 2021 14:58:06 +0200 (CEST) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id E2376412A1 for ; Fri, 30 Apr 2021 14:57:59 +0200 (CEST) Received: by mail-wr1-f50.google.com with SMTP id l14so637838wrx.5 for ; Fri, 30 Apr 2021 05:57:59 -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=EFjw7JZyl9lLkDheCmLMVq7RDLMhODbQjNctlLB7nuU=; b=Oj1t1lzKQXTt8s695rRzn+rmZq37lm1J9lGhOT4/rPhRBL3c8mOpZxlXmu1IOyiUiV wpvTv2aHpiL7EO0Nv56Z/IGqYnq8Po3VWKlYBdVWFlwAWrtSaERi4vGxB8jJwsHP/TPh ZNgf2U5TyeXB5R01nvTPqEvFxMHM98eucbM2D5d9RlW64hPhjeQcHSLJBVhuq9Gx+9JG HJxV05HM1n6NYCg2CKiHExPHExquqfbhgpCFJRh/i7PiTp2yJYRBRJc6N0BNjOZbzNOY 5jyMpqv2H/IzD2JzSSW0Kt3vVJyWZG1t094wnNQwY0K4ukgkUvQ3q59I4Q5QWU6XWFUo Y/oQ== 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=EFjw7JZyl9lLkDheCmLMVq7RDLMhODbQjNctlLB7nuU=; b=f8LxD/n6yuFBG2qvFwAfT9JwvJ+N0EC73ldp1xO9jotRuvr+CGAoAh0icOpfASSWbd 8iElsetKnWLqhSSgQlqp0pGAjDL24yV7m7A4rKpiVMdUPlHvdu2N5s1zEEBQNEkG7rRH /7l1lv8cft9hahdDrytIgvFUkMCkIlBR2KWHStUY5mz1job/LM0Bylq5Qlh2NYZl3Qvp jbRws0J65SCiG8Kx9gEWCvpPBqF3+Yw36zLa+IyCc+H47R8xX9hJ66feTsEi4/2DHIlc 2n2eGMoG65ERUZJqRJiJ7XIP+UKB7ul5aL8T0hXo826huQvjBQ5tGDzZqz7N/IG66JLk iD2A== X-Gm-Message-State: AOAM531nEDvgnVcIQPNhgY+nqZnWGkGkkW7++4hNIBKnOr7QagmuCS0M aYpk8p9+lYnSsMZzIFcP5Ra0wCqqmHySOdc/ X-Google-Smtp-Source: ABdhPJyTCf/rwALJnwgjZeD5YUvyBjOuyqrAiosMT8T0JUo/68QTcUsRro3U7MSio/pUb7dTWqu/bA== X-Received: by 2002:a05:6000:1012:: with SMTP id a18mr604399wrx.68.1619787479329; Fri, 30 Apr 2021 05:57:59 -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 l13sm13476245wmj.3.2021.04.30.05.57.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Apr 2021 05:57:58 -0700 (PDT) From: Michal Krawczyk To: dev@dpdk.org Cc: ndagan@amazom.com, gtzalik@amazon.com, igorch@amazon.com, mw@semihalf.com, Stanislaw Kardach , Michal Krawczyk , Shay Agroskin Date: Fri, 30 Apr 2021 14:57:20 +0200 Message-Id: <20210430125725.28796-18-mk@semihalf.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210430125725.28796-1-mk@semihalf.com> References: <20210430125725.28796-1-mk@semihalf.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Stanislaw Kardach 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 Reviewed-by: Michal Krawczyk Reviewed-by: Igor Chauskin Reviewed-by: Shay Agroskin --- 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 2e2cd0736c..1282c05f59 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -206,7 +206,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) \ @@ -216,7 +216,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); \ @@ -246,7 +246,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