xen-project/xen
1
0 Fork 0
mirror of https://github.com/xen-project/xen.git synced 2026-10-28 02:01:24 +01:00
Code Issues Activity

x86/boot: convert domain construction to use boot info

Browse Source 
With all the components used to construct dom0 encapsulated in struct boot_info
and struct boot_module, it is no longer necessary to pass all them as
parameters down the domain construction call chain. Change the parameter list
to pass the struct boot_info instance and the struct domain reference.

In dom0_construct() change i to be unsigned, and split some multiple
assignments to placate MISRA.

Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jason Andryuk <jason.andryuk@amd.com>
This commit is contained in:
Daniel P. Smith authored and Andrew Cooper committed 2024-11-15 18:54:47 +00:00
1 parent 8417b4b0bb
commit 88c40dc108
6 files changed
+96 -75
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

xen/arch/x86/dom0_build.c
+3 -5
View File
@@ -596,9 +596,7 @@ int __init dom0_setup_permissions(struct domain *d)
return rc;
}
int __init construct_dom0(struct domain *d, const module_t *image,
unsigned long image_headroom, module_t *initrd,
const char *cmdline)
int __init construct_dom0(struct boot_info *bi, struct domain *d)
{
int rc;
@@ -610,9 +608,9 @@ int __init construct_dom0(struct domain *d, const module_t *image,
process_pending_softirqs();
if ( is_hvm_domain(d) )
rc = dom0_construct_pvh(d, image, image_headroom, initrd, cmdline);
rc = dom0_construct_pvh(bi, d);
else if ( is_pv_domain(d) )
rc = dom0_construct_pv(d, image, image_headroom, initrd, cmdline);
rc = dom0_construct_pv(bi, d);
else
panic("Cannot construct Dom0. No guest interface available\n");
xen/arch/x86/hvm/dom0_build.c
+27 -17
View File
@@ -16,6 +16,7 @@
#include <acpi/actables.h>
#include <asm/bootinfo.h>
#include <asm/bzimage.h>
#include <asm/dom0_build.h>
#include <asm/hvm/support.h>
@@ -642,15 +643,15 @@ static bool __init check_and_adjust_load_address(
return true;
}
static int __init pvh_load_kernel(struct domain *d, const module_t *image,
unsigned long image_headroom,
module_t *initrd, void *image_base,
const char *cmdline, paddr_t *entry,
paddr_t *start_info_addr)
static int __init pvh_load_kernel(
struct domain *d, struct boot_module *image, struct boot_module *initrd,
paddr_t *entry, paddr_t *start_info_addr)
{
void *image_start = image_base + image_headroom;
unsigned long image_len = image->mod_end;
unsigned long initrd_len = initrd ? initrd->mod_end : 0;
void *image_base = bootstrap_map_bm(image);
void *image_start = image_base + image->headroom;
unsigned long image_len = image->mod->mod_end;
unsigned long initrd_len = initrd ? initrd->mod->mod_end : 0;
const char *cmdline = image->cmdline_pa ? __va(image->cmdline_pa) : NULL;
struct elf_binary elf;
struct elf_dom_parms parms;
paddr_t last_addr;
@@ -725,7 +726,7 @@ static int __init pvh_load_kernel(struct domain *d, const module_t *image,
if ( initrd != NULL )
{
rc = hvm_copy_to_guest_phys(last_addr, mfn_to_virt(initrd->mod_start),
rc = hvm_copy_to_guest_phys(last_addr, mfn_to_virt(initrd->mod->mod_start),
initrd_len, v);
if ( rc )
{
@@ -736,9 +737,9 @@ static int __init pvh_load_kernel(struct domain *d, const module_t *image,
mod.paddr = last_addr;
mod.size = initrd_len;
last_addr += ROUNDUP(initrd_len, elf_64bit(&elf) ? 8 : 4);
if ( initrd->string )
if ( initrd->cmdline_pa )
{
char *str = __va(initrd->string);
char *str = __va(initrd->cmdline_pa);
size_t len = strlen(str) + 1;
rc = hvm_copy_to_guest_phys(last_addr, str, len, v);
@@ -1300,16 +1301,26 @@ static void __hwdom_init pvh_setup_mmcfg(struct domain *d)
}
}
int __init dom0_construct_pvh(struct domain *d, const module_t *image,
unsigned long image_headroom,
module_t *initrd,
const char *cmdline)
int __init dom0_construct_pvh(struct boot_info *bi, struct domain *d)
{
paddr_t entry, start_info;
struct boot_module *image;
struct boot_module *initrd = NULL;
unsigned int idx;
int rc;
printk(XENLOG_INFO "*** Building a PVH Dom%d ***\n", d->domain_id);
idx = first_boot_module_index(bi, BOOTMOD_KERNEL);
if ( idx >= bi->nr_modules )
panic("Missing kernel boot module for %pd construction\n", d);
image = &bi->mods[idx];
idx = first_boot_module_index(bi, BOOTMOD_RAMDISK);
if ( idx < bi->nr_modules )
initrd = &bi->mods[idx];
if ( is_hardware_domain(d) )
{
/*
@@ -1347,8 +1358,7 @@ int __init dom0_construct_pvh(struct domain *d, const module_t *image,
return rc;
}
rc = pvh_load_kernel(d, image, image_headroom, initrd, bootstrap_map(image),
cmdline, &entry, &start_info);
rc = pvh_load_kernel(d, image, initrd, &entry, &start_info);
if ( rc )
{
printk("Failed to load Dom0 kernel\n");
xen/arch/x86/include/asm/dom0_build.h
+3 -9
View File
@@ -13,15 +13,9 @@ unsigned long dom0_compute_nr_pages(struct domain *d,
unsigned long initrd_len);
int dom0_setup_permissions(struct domain *d);
int dom0_construct_pv(struct domain *d, const module_t *image,
unsigned long image_headroom,
module_t *initrd,
const char *cmdline);
int dom0_construct_pvh(struct domain *d, const module_t *image,
unsigned long image_headroom,
module_t *initrd,
const char *cmdline);
struct boot_info;
int dom0_construct_pv(struct boot_info *bi, struct domain *d);
int dom0_construct_pvh(struct boot_info *bi, struct domain *d);
unsigned long dom0_paging_pages(const struct domain *d,
unsigned long nr_pages);
xen/arch/x86/include/asm/setup.h
+3 -5
View File
@@ -26,11 +26,9 @@ void subarch_init_memory(void);
void init_IRQ(void);
int construct_dom0(
struct domain *d,
const module_t *image, unsigned long image_headroom,
module_t *initrd,
const char *cmdline);
struct boot_info;
int construct_dom0(struct boot_info *bi, struct domain *d);
void setup_io_bitmap(struct domain *d);
extern struct boot_info xen_boot_info;
xen/arch/x86/pv/dom0_build.c
+41 -25
View File
@@ -14,6 +14,7 @@
#include <xen/softirq.h>
#include <xen/vga.h>
#include <asm/bootinfo.h>
#include <asm/bzimage.h>
#include <asm/dom0_build.h>
#include <asm/guest.h>
@@ -354,13 +355,10 @@ static struct page_info * __init alloc_chunk(struct domain *d,
return page;
}
static int __init dom0_construct(struct domain *d,
const module_t *image,
unsigned long image_headroom,
module_t *initrd,
const char *cmdline)
static int __init dom0_construct(struct boot_info *bi, struct domain *d)
{
int i, rc, order, machine;
unsigned int i;
int rc, order, machine;
bool compatible, compat;
struct cpu_user_regs *regs;
unsigned long pfn, mfn;
@@ -374,10 +372,14 @@ static int __init dom0_construct(struct domain *d,
unsigned int flush_flags = 0;
start_info_t *si;
struct vcpu *v = d->vcpu[0];
void *image_base = bootstrap_map(image);
unsigned long image_len = image->mod_end;
void *image_start = image_base + image_headroom;
unsigned long initrd_len = initrd ? initrd->mod_end : 0;
struct boot_module *image;
struct boot_module *initrd = NULL;
void *image_base;
unsigned long image_len;
void *image_start;
unsigned long initrd_len = 0;
l4_pgentry_t *l4tab = NULL, *l4start = NULL;
l3_pgentry_t *l3tab = NULL, *l3start = NULL;
l2_pgentry_t *l2tab = NULL, *l2start = NULL;
@@ -414,6 +416,22 @@ static int __init dom0_construct(struct domain *d,
printk(XENLOG_INFO "*** Building a PV Dom%d ***\n", d->domain_id);
i = first_boot_module_index(bi, BOOTMOD_KERNEL);
if ( i >= bi->nr_modules )
panic("Missing kernel boot module for %pd construction\n", d);
image = &bi->mods[i];
image_base = bootstrap_map_bm(image);
image_len = image->mod->mod_end;
image_start = image_base + image->headroom;
i = first_boot_module_index(bi, BOOTMOD_RAMDISK);
if ( i < bi->nr_modules )
{
initrd = &bi->mods[i];
initrd_len = initrd->mod->mod_end;
}
d->max_pages = ~0U;
if ( (rc = bzimage_parse(image_base, &image_start, &image_len)) != 0 )
@@ -613,7 +631,8 @@ static int __init dom0_construct(struct domain *d,
initrd_pfn = vinitrd_start ?
(vinitrd_start - v_start) >> PAGE_SHIFT :
domain_tot_pages(d);
initrd_mfn = mfn = initrd->mod_start;
initrd_mfn = initrd->mod->mod_start;
mfn = initrd_mfn;
count = PFN_UP(initrd_len);
if ( d->arch.physaddr_bitsize &&
((mfn + count - 1) >> (d->arch.physaddr_bitsize - PAGE_SHIFT)) )
@@ -628,12 +647,13 @@ static int __init dom0_construct(struct domain *d,
free_domheap_pages(page, order);
page += 1UL << order;
}
memcpy(page_to_virt(page), mfn_to_virt(initrd->mod_start),
memcpy(page_to_virt(page), mfn_to_virt(initrd->mod->mod_start),
initrd_len);
mpt_alloc = (paddr_t)initrd->mod_start << PAGE_SHIFT;
mpt_alloc = pfn_to_paddr(initrd->mod->mod_start);
init_domheap_pages(mpt_alloc,
mpt_alloc + PAGE_ALIGN(initrd_len));
initrd->mod_start = initrd_mfn = mfn_x(page_to_mfn(page));
initrd_mfn = mfn_x(page_to_mfn(page));
initrd->mod->mod_start = initrd_mfn;
}
else
{
@@ -650,7 +670,7 @@ static int __init dom0_construct(struct domain *d,
* Either way, tell discard_initial_images() to not free it a second
* time.
*/
initrd->mod_end = 0;
initrd->mod->mod_end = 0;
iommu_memory_setup(d, "initrd", mfn_to_page(_mfn(initrd_mfn)),
PFN_UP(initrd_len), &flush_flags);
@@ -664,7 +684,7 @@ static int __init dom0_construct(struct domain *d,
nr_pages - domain_tot_pages(d));
if ( initrd )
{
mpt_alloc = (paddr_t)initrd->mod_start << PAGE_SHIFT;
mpt_alloc = pfn_to_paddr(initrd->mod->mod_start);
printk("\n Init. ramdisk: %"PRIpaddr"->%"PRIpaddr,
mpt_alloc, mpt_alloc + initrd_len);
}
@@ -892,7 +912,7 @@ static int __init dom0_construct(struct domain *d,
if ( pfn >= initrd_pfn )
{
if ( pfn < initrd_pfn + PFN_UP(initrd_len) )
mfn = initrd->mod_start + (pfn - initrd_pfn);
mfn = initrd->mod->mod_start + (pfn - initrd_pfn);
else
mfn -= PFN_UP(initrd_len);
}
@@ -962,8 +982,8 @@ static int __init dom0_construct(struct domain *d,
}
memset(si->cmd_line, 0, sizeof(si->cmd_line));
if ( cmdline != NULL )
strlcpy((char *)si->cmd_line, cmdline, sizeof(si->cmd_line));
if ( image->cmdline_pa )
strlcpy((char *)si->cmd_line, __va(image->cmdline_pa), sizeof(si->cmd_line));
#ifdef CONFIG_VIDEO
if ( !pv_shim && fill_console_start_info((void *)(si + 1)) )
@@ -1060,11 +1080,7 @@ out:
return rc;
}
int __init dom0_construct_pv(struct domain *d,
const module_t *image,
unsigned long image_headroom,
module_t *initrd,
const char *cmdline)
int __init dom0_construct_pv(struct boot_info *bi, struct domain *d)
{
unsigned long cr4 = read_cr4();
int rc;
@@ -1082,7 +1098,7 @@ int __init dom0_construct_pv(struct domain *d,
write_cr4(cr4 & ~X86_CR4_SMAP);
}
rc = dom0_construct(d, image, image_headroom, initrd, cmdline);
rc = dom0_construct(bi, d);
if ( cr4 & X86_CR4_SMAP )
{
xen/arch/x86/setup.c
+19 -14
View File
@@ -952,10 +952,7 @@ static unsigned int __init copy_bios_e820(struct e820entry *map, unsigned int li
return n;
}
static struct domain *__init create_dom0(const module_t *image,
unsigned long headroom,
module_t *initrd, const char *kextra,
const char *loader)
static struct domain *__init create_dom0(struct boot_info *bi)
{
static char __initdata cmdline[MAX_GUEST_CMDLINE];
@@ -972,6 +969,14 @@ static struct domain *__init create_dom0(const module_t *image,
};
struct domain *d;
domid_t domid;
struct boot_module *image;
unsigned int idx;
idx = first_boot_module_index(bi, BOOTMOD_KERNEL);
if ( idx >= bi->nr_modules )
panic("Missing kernel boot module for building domain\n");
image = &bi->mods[idx];
if ( opt_dom0_pvh )
{
@@ -998,14 +1003,15 @@ static struct domain *__init create_dom0(const module_t *image,
panic("Error creating d%uv0\n", domid);
/* Grab the DOM0 command line. */
if ( image->string || kextra )
if ( image->cmdline_pa || bi->kextra )
{
if ( image->string )
safe_strcpy(cmdline, cmdline_cook(__va(image->string), loader));
if ( image->cmdline_pa )
safe_strcpy(
cmdline, cmdline_cook(__va(image->cmdline_pa), bi->loader));
if ( kextra )
if ( bi->kextra )
/* kextra always includes exactly one leading space. */
safe_strcat(cmdline, kextra);
safe_strcat(cmdline, bi->kextra);
/* Append any extra parameters. */
if ( skip_ioapic_setup && !strstr(cmdline, "noapic") )
@@ -1022,9 +1028,11 @@ static struct domain *__init create_dom0(const module_t *image,
safe_strcat(cmdline, " acpi=");
safe_strcat(cmdline, acpi_param);
}
image->cmdline_pa = __pa(cmdline);
}
if ( construct_dom0(d, image, headroom, initrd, cmdline) != 0 )
if ( construct_dom0(bi, d) != 0 )
panic("Could not construct domain 0\n");
return d;
@@ -2116,10 +2124,7 @@ void asmlinkage __init noreturn __start_xen(void)
* We're going to setup domain0 using the module(s) that we stashed safely
* above our heap. The second module, if present, is an initrd ramdisk.
*/
dom0 = create_dom0(bi->mods[0].mod, bi->mods[0].headroom,
initrdidx < bi->nr_modules ? bi->mods[initrdidx].mod
: NULL,
bi->kextra, bi->loader);
dom0 = create_dom0(bi);
if ( !dom0 )
panic("Could not set up DOM0 guest OS\n");
Reference in new issue
xen-project/xen
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.

The note is not visible to the blocked user.