From: Jork Loeser <jloeser@linux•microsoft.com>
To: linux-hyperv@vger•kernel.org, linux-mm@kvack•org,
kexec@lists•infradead.org
Cc: "K. Y. Srinivasan" <kys@microsoft•com>,
Haiyang Zhang <haiyangz@microsoft•com>,
Wei Liu <wei.liu@kernel•org>, Dexuan Cui <decui@microsoft•com>,
Long Li <longli@microsoft•com>, Mike Rapoport <rppt@kernel•org>,
Pasha Tatashin <pasha.tatashin@soleen•com>,
Pratyush Yadav <pratyush@kernel•org>,
Alexander Graf <graf@amazon•com>, Jason Miu <jasonmiu@google•com>,
Andrew Morton <akpm@linux-foundation•org>,
David Hildenbrand <david@kernel•org>,
Muchun Song <muchun.song@linux•dev>,
Oscar Salvador <osalvador@suse•de>, Baoquan He <bhe@redhat•com>,
Catalin Marinas <catalin.marinas@arm•com>,
Will Deacon <will@kernel•org>, Thomas Gleixner <tglx@kernel•org>,
Ingo Molnar <mingo@redhat•com>, Borislav Petkov <bp@alien8•de>,
Dave Hansen <dave.hansen@linux•intel.com>,
"H. Peter Anvin" <hpa@zytor•com>, Kees Cook <kees@kernel•org>,
Ran Xiaokai <ran.xiaokai@zte•com.cn>,
Justinien Bouron <jbouron@amazon•com>,
Sourabh Jain <sourabhjain@linux•ibm.com>,
Pingfan Liu <piliu@redhat•com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel•com>,
Mario Limonciello <mario.limonciello@amd•com>,
linux-arm-kernel@lists•infradead.org, x86@kernel•org,
linux-kernel@vger•kernel.org,
Michael Kelley <mhklinux@outlook•com>,
Jork Loeser <jloeser@linux•microsoft.com>
Subject: [RFC PATCH 11/20] kho: return virtual address of mem_map
Date: Wed, 27 May 2026 17:41:53 -0700 [thread overview]
Message-ID: <20260528004204.1484584-12-jloeser@linux.microsoft.com> (raw)
In-Reply-To: <20260528004204.1484584-1-jloeser@linux.microsoft.com>
From: "Pratyush Yadav (Google)" <pratyush@kernel•org>
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) <pratyush@kernel•org>
Signed-off-by: Jork Loeser <jloeser@linux•microsoft.com>
---
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 a006a883ee94..797ec285b698 100644
--- a/kernel/liveupdate/kexec_handover.c
+++ b/kernel/liveupdate/kexec_handover.c
@@ -610,10 +610,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);
@@ -622,7 +623,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);
}
/*
@@ -917,15 +922,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;
@@ -1609,11 +1614,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;
@@ -1838,8 +1841,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;
@@ -1862,8 +1864,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.43.0
next prev parent reply other threads:[~2026-05-28 0:43 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-28 0:41 [RFC PATCH 00/20] mshv: enable kexec with Hyper-V donated pages and partitions Jork Loeser
2026-05-28 0:41 ` [RFC PATCH 01/20] kho: generalize radix tree APIs Jork Loeser
2026-05-28 0:41 ` [RFC PATCH 02/20] kho: store incoming radix tree in kho_in Jork Loeser
2026-05-28 0:41 ` [RFC PATCH 03/20] kho: add a struct for radix callbacks Jork Loeser
2026-05-28 0:41 ` [RFC PATCH 04/20] kho: add callback for table pages Jork Loeser
2026-05-28 0:41 ` [RFC PATCH 05/20] kho: add data argument to radix walk callback Jork Loeser
2026-05-28 0:41 ` [RFC PATCH 06/20] kho: allow early-boot usage of the KHO radix tree Jork Loeser
2026-05-28 0:41 ` [RFC PATCH 07/20] kho: allow destroying " Jork Loeser
2026-05-28 0:41 ` [RFC PATCH 08/20] kho: add kho_radix_init_tree() Jork Loeser
2026-05-28 0:41 ` [RFC PATCH 09/20] memblock: introduce MEMBLOCK_KHO_SCRATCH_EXT Jork Loeser
2026-05-28 0:41 ` [RFC PATCH 10/20] kho: extended scratch Jork Loeser
2026-05-28 0:41 ` Jork Loeser [this message]
2026-05-28 0:41 ` [RFC PATCH 12/20] mm/hugetlb: make bootmem allocation work with KHO Jork Loeser
2026-05-28 0:41 ` [RFC PATCH 13/20] kho: add radix tree freeze and del_key() error reporting Jork Loeser
2026-05-28 0:41 ` [RFC PATCH 14/20] kho: Add crash-kernel-safe radix tree presence check Jork Loeser
2026-05-28 0:41 ` [RFC PATCH 15/20] mshv: Use page tracker to manage MSHV-owned pages and preserve with KHO Jork Loeser
2026-05-28 0:41 ` [RFC PATCH 16/20] mshv: Add debugfs interface to page tracker Jork Loeser
2026-05-28 0:41 ` [RFC PATCH 17/20] hyperv: Reserve crash MSR P2 for page preservation root PA Jork Loeser
2026-05-28 0:42 ` [RFC PATCH 18/20] mshv: Exclude Hyper-V donated pages from crash dump collection Jork Loeser
2026-05-28 0:42 ` [RFC PATCH 19/20] kexec: export kexec_in_progress for modules Jork Loeser
2026-05-28 0:42 ` [RFC PATCH 20/20] mshv: freeze and vacuum partitions across kexec Jork Loeser
2026-05-31 17:10 ` [RFC PATCH 00/20] mshv: enable kexec with Hyper-V donated pages and partitions Mike Rapoport
2026-06-01 15:00 ` Pasha Tatashin
2026-06-01 20:15 ` Jork Loeser
2026-06-01 20:09 ` Jork Loeser
2026-06-03 9:29 ` Mike Rapoport
2026-06-03 17:25 ` Jork Loeser
2026-06-04 12:17 ` Mike Rapoport
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260528004204.1484584-12-jloeser@linux.microsoft.com \
--to=jloeser@linux$(echo .)microsoft.com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=bhe@redhat$(echo .)com \
--cc=bp@alien8$(echo .)de \
--cc=catalin.marinas@arm$(echo .)com \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=david@kernel$(echo .)org \
--cc=decui@microsoft$(echo .)com \
--cc=graf@amazon$(echo .)com \
--cc=haiyangz@microsoft$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=jasonmiu@google$(echo .)com \
--cc=jbouron@amazon$(echo .)com \
--cc=kees@kernel$(echo .)org \
--cc=kexec@lists$(echo .)infradead.org \
--cc=kys@microsoft$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-hyperv@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-mm@kvack$(echo .)org \
--cc=longli@microsoft$(echo .)com \
--cc=mario.limonciello@amd$(echo .)com \
--cc=mhklinux@outlook$(echo .)com \
--cc=mingo@redhat$(echo .)com \
--cc=muchun.song@linux$(echo .)dev \
--cc=osalvador@suse$(echo .)de \
--cc=pasha.tatashin@soleen$(echo .)com \
--cc=piliu@redhat$(echo .)com \
--cc=pratyush@kernel$(echo .)org \
--cc=rafael.j.wysocki@intel$(echo .)com \
--cc=ran.xiaokai@zte$(echo .)com.cn \
--cc=rppt@kernel$(echo .)org \
--cc=sourabhjain@linux$(echo .)ibm.com \
--cc=tglx@kernel$(echo .)org \
--cc=wei.liu@kernel$(echo .)org \
--cc=will@kernel$(echo .)org \
--cc=x86@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox