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 283EF3FFAAF for ; Wed, 29 Apr 2026 13:40:10 +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=1777470010; cv=none; b=di2nQmI+H2OtUCAMb4jPBkWGeweqSQ3xJYj4YzX0jWh+jvrbZK0IU0WEcXp0/gRxIabbzd7wWXMeWGa3J+T0rYvfYs3IDhIu9eYGKT1RHJySWMeTKu3BcbYcQQjKDgqZUYM+YowH9WDYSVqdjvHJlV8ODzd3p+0o3OmUj9wmyoU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777470010; c=relaxed/simple; bh=UueBsq01JA9/z9WSGSLkvtLjqf9jJ9B97O+wRu3Lxo0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WELtvc+qw4Z9181F1PC9vd801jIzLUvoh1hLttVRzVHq6yrkpMgxpqVSMuZ3XtLO4GM2w+qfKlBTxbA9LEzbaP1xxiYFyPXsn2uswiHa5sWR55ETUvRzBcPEA7nr0q/ESz5gLoawmMWOGhALmesPK/nh8gjG/CtdVQcP9SZvAis= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UfJW+gSG; 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="UfJW+gSG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07B36C2BCC6; Wed, 29 Apr 2026 13:40:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777470009; bh=UueBsq01JA9/z9WSGSLkvtLjqf9jJ9B97O+wRu3Lxo0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UfJW+gSG2hHNWNoTkzTSCO1P9P/dSOfWxc9kBCsK5009yDv+2I/0Io+9QKuv+++ak TCAHvLyL4sgUOYy5HVRKo19JHKkGN4spdRILrK5F32AOsLHzYMfVOtROTqycfzBLYw 10WAJ9JsR+XIfA7Etr63hAEoZddPOVXUhlw5l0M4itFuSuurWnFNKqRHEVrI0fGfdH /mXxwmUqtQDAF7asLJAHhI/8RJQfy34ei80E41so/aYblUWqu5l52ZCBXwtNMk2PkC qVe1/4nvLoVcHYSugIiYGapj0Q++uzzYQ582cjSmLHTGzvAqP50GorSirPnfctbrz4 +tSkIo0+KIcDQ== 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 11/12] kho: return virtual address of mem_map Date: Wed, 29 Apr 2026 15:39:13 +0200 Message-ID: <20260429133928.850721-12-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)" There are currently 3 callers of kho_get_mem_map_phys(). Two of them, kho_mem_retrieve() and kho_extend_scratch() need the virtual address. The third, kho_populate() doesn't care. Make things simpler by directly returning the virtual address. Rename kho_get_mem_map_phys() to kho_get_mem_map() to accurately reflect what it returns. Signed-off-by: Pratyush Yadav (Google) --- kernel/liveupdate/kexec_handover.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c index c2b843a5fb28..2e13b80d1c7d 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -625,10 +625,11 @@ static int __init kho_preserved_memory_reserve(unsigned long key, void *data) return 0; } -/* Returns physical address of the preserved memory map from FDT */ -static phys_addr_t __init kho_get_mem_map_phys(const void *fdt) +/* Returns virtual address of the preserved memory map from FDT */ +static __init void *kho_get_mem_map(const void *fdt) { const void *mem_ptr; + phys_addr_t mem_map_phys; int len; mem_ptr = fdt_getprop(fdt, 0, KHO_FDT_MEMORY_MAP_PROP_NAME, &len); @@ -637,7 +638,11 @@ static phys_addr_t __init kho_get_mem_map_phys(const void *fdt) return 0; } - return get_unaligned((const u64 *)mem_ptr); + mem_map_phys = get_unaligned((const u64 *)mem_ptr); + if (!mem_map_phys) + return NULL; + + return phys_to_virt(mem_map_phys); } /* @@ -932,15 +937,15 @@ void __init kho_extend_scratch(void) .key = kho_ext_mark_scratch, }; struct kho_radix_tree radix; - phys_addr_t prev_end = 0, mem_map_phys; + phys_addr_t prev_end = 0; int err = 0; if (!is_kho_boot()) return; /* Make sure the KHO radix tree is initialized. */ - mem_map_phys = kho_get_mem_map_phys(kho_get_fdt()); - err = kho_radix_init_tree(&kho_in.radix_tree, phys_to_virt(mem_map_phys)); + err = kho_radix_init_tree(&kho_in.radix_tree, + kho_get_mem_map(kho_get_fdt())); if (err) goto print; @@ -1587,11 +1592,9 @@ static int __init kho_mem_retrieve(const void *fdt) const struct kho_radix_walk_cb cb = { .key = kho_preserved_memory_reserve, }; - phys_addr_t mem_map_phys; int err; - mem_map_phys = kho_get_mem_map_phys(fdt); - err = kho_radix_init_tree(&kho_in.radix_tree, phys_to_virt(mem_map_phys)); + err = kho_radix_init_tree(&kho_in.radix_tree, kho_get_mem_map(fdt)); if (err) return err; @@ -1816,8 +1819,7 @@ void __init kho_populate(phys_addr_t fdt_phys, u64 fdt_len, { unsigned int scratch_cnt = scratch_len / sizeof(*kho_scratch); struct kho_scratch *scratch = NULL; - phys_addr_t mem_map_phys; - void *fdt = NULL; + void *fdt = NULL, *mem_map; bool populated = false; int err; @@ -1840,8 +1842,8 @@ void __init kho_populate(phys_addr_t fdt_phys, u64 fdt_len, goto unmap_fdt; } - mem_map_phys = kho_get_mem_map_phys(fdt); - if (!mem_map_phys) + mem_map = kho_get_mem_map(fdt); + if (!mem_map) goto unmap_fdt; scratch = early_memremap(scratch_phys, scratch_len); -- 2.54.0.545.g6539524ca2-goog