On 10/17/24 20:42, Jason Andryuk wrote:
On 2024-10-17 13:02, Daniel P. Smith wrote:
Use struct boot_module fields, start and size, when calculating the
relocation
address and size. It also ensures that early_mod references are kept
in sync.
Signed-off-by: Daniel P. Smith <[email protected]>
---
Changes since v5:
- removed unnecessary paddr_to_pfn, allowing condition to collapse to
one line
- correct a missed conversion from .mod->mod_start to .start
---
xen/arch/x86/setup.c | 38 +++++++++++++++++---------------------
1 file changed, 17 insertions(+), 21 deletions(-)
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index d51b0b03bc97..44cec48fc877 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1528,11 +1526,10 @@ void asmlinkage __init noreturn
__start_xen(unsigned long mbi_p)
panic("Not enough memory to relocate the dom0 kernel image\n");
for ( i = 0; i < bi->nr_modules; ++i )
{
- uint64_t s = (uint64_t)bi->mods[i].mod->mod_start
- << PAGE_SHIFT;
+ uint64_t s = (uint64_t)bi->mods[i].start;
I don't think this cast is necessary.
Ack.
reserve_e820_ram(&boot_e820, s,
- s + PAGE_ALIGN(bi->mods[i].mod->mod_end));
+ s + PAGE_ALIGN(bi->mods[i].size));
}
if ( !xen_phys_start )
@@ -1686,12 +1682,12 @@ void asmlinkage __init noreturn
__start_xen(unsigned long mbi_p)
for ( i = 0; i < bi->nr_modules; ++i )
{
- set_pdx_range(bi->mods[i].mod->mod_start,
- bi->mods[i].mod->mod_start +
- PFN_UP(bi->mods[i].mod->mod_end));
- map_pages_to_xen((unsigned
long)mfn_to_virt(bi->mods[i].mod->mod_start),
- _mfn(bi->mods[i].mod->mod_start),
- PFN_UP(bi->mods[i].mod->mod_end), PAGE_HYPERVISOR);
+ set_pdx_range(paddr_to_pfn(bi->mods[i].start),
+ paddr_to_pfn(bi->mods[i].start) +
+ PFN_UP(bi->mods[i].size));
+ map_pages_to_xen((unsigned
long)maddr_to_virt(bi->mods[i].start),
+ maddr_to_mfn(bi->mods[i].start),
+ PFN_UP(bi->mods[i].size), PAGE_HYPERVISOR);
I would vertically align all the parameters inside the (.
Ack, though I will be applying the format requested by Jan.
With those:
Reviewed-by: Jason Andryuk <[email protected]>
Thanks!
v/r,
dps
