[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v6 13/44] x86/boot: transition relocation calculations to struct boot_module
- To: Jason Andryuk <jason.andryuk@xxxxxxx>, xen-devel@xxxxxxxxxxxxxxxxxxxx
- From: "Daniel P. Smith" <dpsmith@xxxxxxxxxxxxxxxxxxxx>
- Date: Sat, 19 Oct 2024 08:01:11 -0400
- Arc-authentication-results: i=1; mx.zohomail.com; dkim=pass header.i=apertussolutions.com; spf=pass smtp.mailfrom=dpsmith@xxxxxxxxxxxxxxxxxxxx; dmarc=pass header.from=<dpsmith@xxxxxxxxxxxxxxxxxxxx>
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729339275; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=EuAZ5n0GARnApKkjEdEJ5lLtbJazOpAP6AKPlAJmOWs=; b=ZvaswZ8DibhR2QuuNsORi2wuqj8ufrI+eD+I+mm5lHnHH4XPFhRa2xC/oVwvkmve3/1yk959pDrD0K2WMu2Gw9pR3y8oQ8n9g/ifU6WjUHe2vorsP9MYcRTm7LfWU9kdftdXVhoXvvKRqohT/BH6jmp/ag5N7cK7coZ1vBS8eek=
- Arc-seal: i=1; a=rsa-sha256; t=1729339275; cv=none; d=zohomail.com; s=zohoarc; b=TrRta5JeLWip0SAp+zQPe78M7eD+PVbsaFH93YA/+ZFKB7zjsmEP17z5zTCStlzsqqAiCJ07Qnbui6l5/EJMqPtCzEF1L7nbf5YdJLt/Y9ucRkAwzsJl6jdyF3CBSJBFKk8WK0RVtKzwIcylBHB/kzNfeoxcE2D8ajYw4NeBm70=
- Cc: christopher.w.clark@xxxxxxxxx, stefano.stabellini@xxxxxxx, Jan Beulich <jbeulich@xxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>
- Delivery-date: Sat, 19 Oct 2024 12:01:28 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
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 <dpsmith@xxxxxxxxxxxxxxxxxxxx>
---
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 <jason.andryuk@xxxxxxx>
Thanks!
v/r,
dps
|
