From patchwork Tue Aug 15 03:13:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 130318 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 499A743069; Tue, 15 Aug 2023 05:13:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CEB5A43273; Tue, 15 Aug 2023 05:13:19 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by mails.dpdk.org (Postfix) with ESMTP id D6BD343260 for ; Tue, 15 Aug 2023 05:13:15 +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 3F2F562FA4; Tue, 15 Aug 2023 03:13:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E3C1C433C9; Tue, 15 Aug 2023 03:13:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692069194; bh=LbXbA/fAi7x5JwHXeQ1RzO/syYieIVZwl7zLLfuk3WU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j5WNriBHV9hhN+cTkqzC4isdo+vDXwKMIMVQD7QJ6fp+MSeFwbmNTXDJMl2imOd3F x35qE8udBBdmQgJk4wMIv/tBd8fu/Kdo6v5jHKt6S1eo1FmLohnpJ5PvOrojrINofv xpzDK/lFc/lvFLsZYGNSefOvOCgigdMJQmSXFL7792zusZ7eJ5E/c9zWF4Z2HMoY7n hP/gj+k0IAVWUza7HtLt2xxPjvazAXLl9tUYw31amEPGXO4+YRVWMWuYAZK/FoUf8d Jo4Z+etRea/lKXauITOVPA+2SDiELyAh+ihi8/P0ishY9cOhnxQzdp9b7RQzuGd6IW 9NOr/GneZwzFQ== From: okaya@kernel.org To: Anatoly Burakov Cc: dev@dpdk.org, Sinan Kaya Subject: [PATCH v2 5/7] eal_memory: skip initialization Date: Mon, 14 Aug 2023 23:13:05 -0400 Message-Id: <20230815031307.1299726-6-okaya@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230815031307.1299726-1-okaya@kernel.org> References: <20230815031307.1299726-1-okaya@kernel.org> MIME-Version: 1.0 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 From: Sinan Kaya Initialize heap area just once. Signed-off-by: Sinan Kaya --- 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 688dc615d7..b6fcc293be 100644 --- a/lib/eal/common/eal_common_memory.c +++ b/lib/eal/common/eal_common_memory.c @@ -39,6 +39,7 @@ static void *next_baseaddr; static uint64_t system_page_sz; +static bool memory_initialized; #define MAX_MMAP_WITH_DEFINED_ADDR_TRIES 5 void * @@ -1088,6 +1089,9 @@ rte_eal_memory_init(void) if (!mcfg) return -1; + if (memory_initialized) + return 0; + /* lock mem hotplug here, to prevent races while we init */ rte_mcfg_mem_read_lock(); @@ -1106,6 +1110,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: rte_mcfg_mem_read_unlock(); diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c index 6eb6fcda5e..facc16a802 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) { @@ -1406,6 +1408,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"); @@ -1443,6 +1448,8 @@ rte_eal_malloc_heap_init(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); }