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 DDDA83B0AF1 for ; Wed, 29 Apr 2026 13:39:49 +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=1777469990; cv=none; b=Cw3w7r3Ip21+mTy3E1yazpKZcrxvmIi0TBq7dDU6q5XbN2rHWNSPI5tl0bb2I6Pswj2Ooz+Ry4isIWqqL7nylyGY0Q+2kPMeA70mbKH/oNhNAUrS9NJeRLEECFK1oY0me5YYO2j6CtZkorY7+mrTauERxpj8TGe8thPlSej+Glc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777469990; c=relaxed/simple; bh=YXAWpdZ3W51xhQU3+WJdhbI9oKC26cOKjbvk+teZUO0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=myX5sR3I+Nm4PxLZYQd5M2sRvQ1DRAGz8b+xBWY7+E5P9nRikwNalKyNpDnBrsMaqktivO8qzuO7RpDfKXBjyUY+Tq/ek7IYNR0lI0ih8qXANsb//oGv+RI3rxcMc2qIlsoriZr7sKyfthv+jDmkxrPvOPV6yZdRnQO6oRgzLj4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=hF0BgQZh; 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="hF0BgQZh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55B8BC2BCB8; Wed, 29 Apr 2026 13:39:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777469989; bh=YXAWpdZ3W51xhQU3+WJdhbI9oKC26cOKjbvk+teZUO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hF0BgQZheuBbHrIBASmeG6IKFi6/IfNNPeQo4/p0QxH4XIWw4txR06lG8lRig2e7h A7KyoQyT45WLHHJE/4PHYo447I6CmnxKf3qOeDaEHmCjwoixY8PKhtRkiFyJ5H6sy8 iXMRxEkO/wfImxBhD3iJK1QcnZ122+C46VH4sgF2lFM/eBTFxMI1T15wCj0THO3F+9 QUvhJl4+uG+NgnPVwSKSXv6IICHD3xHivOTewplC4HtnPjwNajpBJlycdIDmCde1Vn ii53ZdcSSQPrjnHo1cUt16ll9JZx4kAntipfObI5T/NpEoxJMH+wiV75qujnqHSWT0 Z1nuxlnaTUmQQ== From: Pratyush Yadav To: Mike Rapoport , Pasha Tatashin , Pratyush Yadav , Alexander Graf , Muchun Song , Oscar Salvador , David Hildenbrand , Andrew Morton , Jason Miu Cc: kexec@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 02/12] kho: store incoming radix tree in kho_in Date: Wed, 29 Apr 2026 15:39:04 +0200 Message-ID: <20260429133928.850721-3-pratyush@kernel.org> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog In-Reply-To: <20260429133928.850721-1-pratyush@kernel.org> References: <20260429133928.850721-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)" 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)); + 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; + } } else { kho_reserve_scratch(); } -- 2.54.0.545.g6539524ca2-goog