From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 B2D01426EAB for ; Mon, 11 May 2026 16:28:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778516904; cv=none; b=CimJdk69i/xBSH0pdl+WajBPygX+h6T40NA1onTVqAzxchO8kQKkMOuvpJewaVLpCCnsAApYgCgx8M1ricXm4CT3rNGQau2v0/wA5G0iG1M1f0KOYVnSA4UtCIiX5bOYd8+bPGW41KLOJshvGu8TaZyX6Ydl6aPMaiQRRpZKi6Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778516904; c=relaxed/simple; bh=u5JXHEfkMPoZSqSacIx/XE1J9UzNOfNs7ZcjLVjNd/w=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=l83+GChI2gT1XF21DqWMWaEgsMwk5odraabfLVUOXZ/NmrvBprGIs/2Xkk0WFgxdMHqei+bOE3Sd18iCsJLxxqkgY7oAsvvvMM1TEDGOhvCZWTnp4GQnfnLsXDStaf87sEiALnINUqLQfCHfwamOV7krhqTqeVgrCGg3j4LHNiE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=o7FW2XxX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="o7FW2XxX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D586C2BCB0; Mon, 11 May 2026 16:28:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778516904; bh=u5JXHEfkMPoZSqSacIx/XE1J9UzNOfNs7ZcjLVjNd/w=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=o7FW2XxXRBGQ8nfAo9dFMeDzenLwFr5eECqJwnbVmgMyiw5p8jdDRLdXgOrXzTjJj 7x6AbZ9eMVptgkc4wbEdnNy/O+Iv3N7nTo8ftFOhKFmXVdl95Wbn3dETbq4sPA5LIx kPTVdQK0EgSHXiqD1o2sgdnc7GhQna80NaZglPCQ+hvuHHKx9E101fHPbvR3a2KzmB Ju6MC6ubbO+lT+62igLLYQ8cEYJXv+G1AOlo4Y4Y5Jn1PgtUBfotQPCc00nKWfaYty 0KV46X6QjdM1qQaKlR7TE13d3puNKJkj/veUh76++YNF/iHFIRlNStUuARkvttHjwR imhnJT0gJCRdA== From: Pratyush Yadav To: Mike Rapoport Cc: Pratyush Yadav , Pasha Tatashin , Alexander Graf , Muchun Song , Oscar Salvador , David Hildenbrand , Andrew Morton , Jason Miu , kexec@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 02/12] kho: store incoming radix tree in kho_in In-Reply-To: (Mike Rapoport's message of "Mon, 11 May 2026 14:43:22 +0300") References: <20260429133928.850721-1-pratyush@kernel.org> <20260429133928.850721-3-pratyush@kernel.org> Date: Mon, 11 May 2026 18:28:21 +0200 Message-ID: <2vxz4ikddi6y.fsf@kernel.org> User-Agent: Gnus/5.13 (Gnus v5.13) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain On Mon, May 11 2026, Mike Rapoport wrote: > On Wed, Apr 29, 2026 at 03:39:04PM +0200, Pratyush Yadav wrote: >> From: "Pratyush Yadav (Google)" >> >> This allows other functions to also use the radix tree. While at it, >> also use kho_get_mem_map_phys() instead of duplicating the code to get >> the radix tree root from the FDT. >> >> Signed-off-by: Pratyush Yadav (Google) >> --- >> kernel/liveupdate/kexec_handover.c | 27 ++++++++------------------- >> 1 file changed, 8 insertions(+), 19 deletions(-) >> >> diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c >> index ba568d34c5b4..5758dc6fab5d 100644 >> --- a/kernel/liveupdate/kexec_handover.c >> +++ b/kernel/liveupdate/kexec_handover.c >> @@ -1294,6 +1294,7 @@ struct kho_in { >> char previous_release[__NEW_UTS_LEN + 1]; >> u32 kexec_count; >> struct kho_debugfs dbg; >> + struct kho_radix_tree radix_tree; >> }; >> >> static struct kho_in kho_in = { >> @@ -1373,24 +1374,10 @@ EXPORT_SYMBOL_GPL(kho_retrieve_subtree); >> >> static int __init kho_mem_retrieve(const void *fdt) >> { >> - struct kho_radix_tree tree; >> - const phys_addr_t *mem; >> - int len; >> - >> - /* Retrieve the KHO radix tree from passed-in FDT. */ >> - mem = fdt_getprop(fdt, 0, KHO_FDT_MEMORY_MAP_PROP_NAME, &len); >> - >> - if (!mem || len != sizeof(*mem)) { >> - pr_err("failed to get preserved KHO memory tree\n"); >> - return -ENOENT; >> - } >> - >> - if (!*mem) >> - return -EINVAL; >> - >> - tree.root = phys_to_virt(*mem); >> - mutex_init(&tree.lock); >> - return kho_radix_walk_tree(&tree, kho_preserved_memory_reserve); >> + kho_in.radix_tree.root = phys_to_virt(kho_get_mem_map_phys(fdt)); > > Do we really want to remove an explicit check for 0 and get a WARN() in > kho_radix_walk_tree()? If mem_map_phys is 0 then kho_populate() never sets kho_in.scratch_phys and thus kho_mem_retrieve() never gets called. So here it will never be 0, and if it is, a WARN() is certainly warranted. Perhaps I should add a comment since this isn't so obvious? > >> + mutex_init(&kho_in.radix_tree.lock); >> + return kho_radix_walk_tree(&kho_in.radix_tree, >> + kho_preserved_memory_reserve); >> } >> >> static __init int kho_out_fdt_setup(void) >> @@ -1597,8 +1584,10 @@ void __init kho_memory_init(void) >> if (kho_in.scratch_phys) { >> kho_scratch = phys_to_virt(kho_in.scratch_phys); >> >> - if (kho_mem_retrieve(kho_get_fdt())) >> + if (kho_mem_retrieve(kho_get_fdt())) { >> kho_in.fdt_phys = 0; >> + kho_in.radix_tree.root = NULL; > > I'd make kho_mem_retrieve() void and put these there. Sure, will do. > >> + } >> } else { >> kho_reserve_scratch(); >> } >> -- >> 2.54.0.545.g6539524ca2-goog >> -- Regards, Pratyush Yadav