From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C41438DC44 for ; Wed, 29 Jul 2026 14:57:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785337022; cv=none; b=KVCLZ8ajiqZsBd0mE6E5sV0Y8dg1zVcdMzmyPlnhqO8z5aGKj8r1Og2rLwkHEADT7Pw8wUF5e0Dcl2uDqbRRSCDIMrNWEzMo97K2RNNkEPCWLoNSBnoen1Lw0lj+49aFYqWt6eqoNOI/tzED/9wNgcZPkvxdxgM8p5OjtvqdAbw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785337022; c=relaxed/simple; bh=1Vi13z1+e3cTHJzOXjJYxcCagSQ/rTMCpwV9Exv3IKo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=orrrCjNRAjJF8kb5UBibGY13vXATbJFTO1kisNTRjS4VIH6NhR7LItSLQKpFdDAWielo5znqKZiRUSSWjPgvqWdaUXikRwtLYlZWwtsdFXDDWtmo1qLtTyNSHl/WPPSENdYRRqKGPglUDUIeGe14BBjGIddLqbgvGTDoAq46mME= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=juQFDwcO; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="juQFDwcO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 004F31F000E9; Wed, 29 Jul 2026 14:56:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785337021; bh=aKqc31TeZXFcHalUwtLT8t9WbNac7HeKnH2JgkerxJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=juQFDwcOSX/yMI2cIAoSl3nUUm1pmJ1ja+LUjuPw5tlGZaNZVtTqBKqRVOs3KodTl hMtQ69g6p6eJAxUi1KXWlYfz2KXCAhaDIwItbQAHmXda/w50XRhu9TaKDWUNehnno4 UUyeEGsf3sgT4mePV8gRDdoJ+EPaI+HbN2esnx2hcITv+Xa0YNw0hFRy7ezDZ0/4AL QYGk6j4Q5xkiqhTDCO6Qdk6jjlm77p80167CL1fabpW4aBOzNn0kLuZyEGzsntphsZ Fs2Q5zZDwnRJsipCAPbpLghO3BswhKKMIWK3GHPU6trV03b1NyFrnVuPIF2QmfBcYO orcHcE6jBh5ZA== From: Pratyush Yadav To: Mike Rapoport , Pasha Tatashin , Pratyush Yadav , Alexander Graf , Muchun Song , Oscar Salvador , David Hildenbrand , Andrew Morton , Jason Miu , Jork Loeser Cc: kexec@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 15/22] kho: initialize preserved memory map radix tree earlier Date: Wed, 29 Jul 2026 16:56:00 +0200 Message-ID: <20260729145610.2827231-16-pratyush@kernel.org> X-Mailer: git-send-email 2.55.0.508.g3f0d502094-goog In-Reply-To: <20260729145610.2827231-1-pratyush@kernel.org> References: <20260729145610.2827231-1-pratyush@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Pratyush Yadav (Google)" Currently the preserved memory radix tree is initialized from kho_memory_init(), which happens relatively late in MM init. In a coming patch, the tree will be used from kho_memory_init_early(). Move the tree initialization there. Simplify some of the code in kho_mem_retrieve() by getting rid of the err variable and jumping to err directly. Signed-off-by: Pratyush Yadav (Google) --- kernel/liveupdate/kexec_handover.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c index 2ddfc804cdf7..6e8682469bd7 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -1531,20 +1531,8 @@ static void __init kho_mem_retrieve(void) const struct kho_radix_walk_cb cb = { .leaf = kho_preserved_memory_reserve, }; - const void *fdt = kho_get_fdt(); - int err; - /* - * kho_get_mem_map() should always succeed. If it fails, kho_populate() - * catches that and never sets kho_in.scratch_phys, which stops memory - * retrieval. - */ - err = kho_radix_init_tree(&kho_in.radix_tree, kho_get_mem_map(fdt)); - if (err) - goto err; - - err = kho_radix_walk_tree(&kho_in.radix_tree, &cb, NULL); - if (err) + if (kho_radix_walk_tree(&kho_in.radix_tree, &cb, NULL)) goto err; return; @@ -1756,6 +1744,8 @@ fs_initcall(kho_init); void __init kho_memory_init_early(void) { + const void *fdt = kho_get_fdt(); + if (!is_kho_boot()) return; @@ -1765,6 +1755,20 @@ void __init kho_memory_init_early(void) * early. */ kho_scratch = phys_to_virt(kho_in.scratch_phys); + + /* + * kho_get_mem_map() should always succeed. If it fails, kho_populate() + * catches that and never sets kho_in.fdt_phys. + */ + if (kho_radix_init_tree(&kho_in.radix_tree, kho_get_mem_map(fdt))) { + /* + * Failed to initialize preserved memory radix tree. Clear FDT + * and scratch so KHO users don't treat it as a KHO boot. + */ + kho_in.fdt_phys = 0; + kho_in.scratch_phys = 0; + return; + } } void __init kho_memory_init(void) -- 2.55.0.508.g3f0d502094-goog