[v3,5/7] eal_memory: skip initialization
Checks
Commit Message
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(+)
@@ -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;
@@ -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);
}