From patchwork Tue Aug 15 01:38:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 130311 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 74AD643067; Tue, 15 Aug 2023 03:39:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C56ED4326F; Tue, 15 Aug 2023 03:38:44 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by mails.dpdk.org (Postfix) with ESMTP id AD43043036 for ; Tue, 15 Aug 2023 03:38:38 +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 3AE526133D; Tue, 15 Aug 2023 01:38:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5638AC433CA; Tue, 15 Aug 2023 01:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692063517; bh=D81Mme+vg6LTteTrCq5RBoyNOoHKhEG8hMgrs4+14+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q5V/+sy2h8X1EaK+JFRHfzPEdC1RHzjQU/LO5CIyqq696F1jHrxPkeW89uTYXKQqd rX768KPoyoQ1Yed4HHMQG4TH8CISmtULXzgcZrB8GvqO3YPazqexpCNvLYbbNMudq3 WZMzPO6nJgmrUOCq9phuPtFZeGCf1nplHeKzOOTuBiHP6/XX8oPvBO9sv0SDMxydfa fNdC83S/F2bnWXT3nlinj+akZzsYtO60eCtO9tyKtTvsklYgX/jgCcBckjDoUqBFY+ ooyAwykQurev0dUzeuikTSkY9wFRTlpyDXYQ92ipQHOcGjTQQTp72MAiPwsSZTqIXN 0oP3Ekrtn2Klw== From: okaya@kernel.org To: Anatoly Burakov Cc: dev@dpdk.org, Sinan Kaya Subject: [PATCH v1 5/7] eal_memory: skip initialization Date: Mon, 14 Aug 2023 21:38:24 -0400 Message-Id: <20230815013826.1288972-6-okaya@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230815013826.1288972-1-okaya@kernel.org> References: <20230815013826.1288972-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 | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/lib/eal/common/eal_common_memory.c b/lib/eal/common/eal_common_memory.c index 688dc615d7..e342eeb806 100644 --- a/lib/eal/common/eal_common_memory.c +++ b/lib/eal/common/eal_common_memory.c @@ -1084,10 +1084,14 @@ rte_eal_memory_init(void) int retval; RTE_LOG(DEBUG, EAL, "Setting up physically contiguous memory...\n"); + static int initialized = 0; if (!mcfg) return -1; + if (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; + 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..4c5f8aed0b 100644 --- a/lib/eal/common/malloc_heap.c +++ b/lib/eal/common/malloc_heap.c @@ -1405,6 +1405,10 @@ rte_eal_malloc_heap_init(void) unsigned int i; const struct internal_config *internal_conf = eal_get_internal_configuration(); + static int initialized = 0; + + if (initialized) + return 0; if (internal_conf->match_allocations) RTE_LOG(DEBUG, EAL, "Hugepages will be freed exactly as allocated.\n"); @@ -1443,6 +1447,8 @@ rte_eal_malloc_heap_init(void) if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; + initialized = true; + /* add all IOVA-contiguous areas to the heap */ return rte_memseg_contig_walk(malloc_add_seg, NULL); }