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 7446543073;
Tue, 15 Aug 2023 16:51:10 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 355B143273;
Tue, 15 Aug 2023 16:50:40 +0200 (CEST)
Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217])
by mails.dpdk.org (Postfix) with ESMTP id D1DDD43260
for <dev@dpdk.org>; Tue, 15 Aug 2023 16:50:36 +0200 (CEST)
Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by dfw.source.kernel.org (Postfix) with ESMTPS id 616A663286;
Tue, 15 Aug 2023 14:50:36 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6973CC433CA;
Tue, 15 Aug 2023 14:50:35 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
s=k20201202; t=1692111035;
bh=8KfylMDNAAMf/4PTvAvXfM+LCTHBDpSbwxGnQ2N4shA=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=udDMdlnqo9y+IQkYkrskPWv0L60GFuW4xHo74+jXsKVmt5MKRpEmlvZ3fJ6MR+0yr
+PXchKRof3HVbOJwvTvNzZh+vKFMqRYU82J85AVIWDIxeGr3qzccmzBOSfudc+6Ylo
4MECYXjWohvX98Dj4gLURzto4gQe3qFq4On1dACoUV44mgNqztPD9EF6ysfb3u77Ys
kOu1KvQ9IxTEFsv3Q98mKfGcMtWmfao81enHgNd1fjn/xh9tipnVdkbfVgNb13i/wK
1Z2FpFTA8oFtnepHu1QWvUgP/6YcxLgIUjHSPjbDxJKldi6dRXCg9ndmp64sijcgqR
AnEiPDMwAYOUA==
From: okaya@kernel.org
To: Anatoly Burakov <anatoly.burakov@intel.com>
Cc: dev@dpdk.org,
Sinan Kaya <okaya@kernel.org>
Subject: [PATCH v4 6/8] eal_memory: skip initialization
Date: Tue, 15 Aug 2023 10:50:21 -0400
Message-Id: <20230815145023.1386003-7-okaya@kernel.org>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20230815145023.1386003-1-okaya@kernel.org>
References: <20230815145023.1386003-1-okaya@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
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
From: Sinan Kaya <okaya@kernel.org>
Initialize heap area just once.
Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
lib/eal/common/eal_common_memory.c | 5 +++++
lib/eal/common/malloc_heap.c | 7 +++++++
2 files changed, 12 insertions(+)
diff --git a/lib/eal/common/eal_common_memory.c b/lib/eal/common/eal_common_memory.c
index d9433db623..4c68de1054 100644
--- a/lib/eal/common/eal_common_memory.c
+++ b/lib/eal/common/eal_common_memory.c
@@ -41,6 +41,7 @@
static void *next_baseaddr;
static uint64_t system_page_sz;
+static bool memory_initialized;
#define MAX_MMAP_WITH_DEFINED_ADDR_TRIES 5
void *
@@ -1084,6 +1085,9 @@ rte_eal_memory_init(void)
eal_get_internal_configuration();
int retval;
+ if (memory_initialized)
+ return 0;
+
RTE_LOG(DEBUG, EAL, "Setting up physically contiguous memory...\n");
if (rte_eal_memseg_init() < 0)
@@ -1101,6 +1105,7 @@ rte_eal_memory_init(void)
if (internal_conf->no_shconf == 0 && rte_eal_memdevice_init() < 0)
goto fail;
+ memory_initialized = true;
return 0;
fail:
return -1;
diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
index 6b6cf9174c..8d05a2ab2e 100644
--- a/lib/eal/common/malloc_heap.c
+++ b/lib/eal/common/malloc_heap.c
@@ -31,6 +31,8 @@
#define CONST_MAX(a, b) (a > b ? a : b) /* RTE_MAX is not a constant */
#define EXTERNAL_HEAP_MIN_SOCKET_ID (CONST_MAX((1 << 8), RTE_MAX_NUMA_NODES))
+static bool heap_initialized;
+
static unsigned
check_hugepage_sz(unsigned flags, uint64_t hugepage_sz)
{
@@ -1410,6 +1412,9 @@ rte_eal_malloc_heap_init(void)
const struct internal_config *internal_conf =
eal_get_internal_configuration();
+ if (heap_initialized)
+ return 0;
+
if (internal_conf->match_allocations)
RTE_LOG(DEBUG, EAL, "Hugepages will be freed exactly as allocated.\n");
@@ -1449,6 +1454,8 @@ int rte_eal_malloc_heap_populate(void)
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
+ heap_initialized = true;
+
/* add all IOVA-contiguous areas to the heap */
return rte_memseg_contig_walk(malloc_add_seg, NULL);
}
--
2.25.1