From: okaya@kernel.org
To: Anatoly Burakov <anatoly.burakov@intel.com>
Cc: dev@dpdk.org, Sinan Kaya <okaya@kernel.org>
Subject: [PATCH v3 5/7] eal_memory: skip initialization
Date: Mon, 14 Aug 2023 23:52:37 -0400 [thread overview]
Message-ID: <20230815035239.1365591-6-okaya@kernel.org> (raw)
In-Reply-To: <20230815035239.1365591-1-okaya@kernel.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
next prev parent reply other threads:[~2023-08-15 3:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-15 3:52 [PATCH v3 0/7] support reinit flow okaya
2023-08-15 3:52 ` [PATCH v3 1/7] eal: fixes for re-initialization issues okaya
2023-08-15 3:52 ` [PATCH v3 2/7] tailq: skip init if already initialized okaya
2023-08-15 3:52 ` [PATCH v3 3/7] eal_memzone: bail out on initialized okaya
2023-08-15 3:52 ` [PATCH v3 4/7] memseg: init once okaya
2023-08-15 3:52 ` okaya [this message]
2023-08-15 3:52 ` [PATCH v3 6/7] eal_interrupts: don't reinitialize threads okaya
2023-08-15 3:52 ` [PATCH v3 7/7] eal: initialize worker threads once okaya
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230815035239.1365591-6-okaya@kernel.org \
--to=okaya@kernel.org \
--cc=anatoly.burakov@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).