[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v4 38/44] x86/boot: introduce boot domain
To begin moving toward allowing the hypervisor to construct more than one domain at boot, a container is needed for a domain's build information. Introduce a new header, <xen/asm/bootdomain.h>, that contains the initial struct boot_domain that encapsulate the build information for a domain. No functional change intended. Signed-off-by: Daniel P. Smith <dpsmith@xxxxxxxxxxxxxxxxxxxx> --- xen/arch/x86/include/asm/bootdomain.h | 28 +++++++++++++++++++++++++++ xen/arch/x86/include/asm/bootinfo.h | 7 +++++++ xen/arch/x86/setup.c | 27 +++++++++++--------------- 3 files changed, 46 insertions(+), 16 deletions(-) create mode 100644 xen/arch/x86/include/asm/bootdomain.h diff --git a/xen/arch/x86/include/asm/bootdomain.h b/xen/arch/x86/include/asm/bootdomain.h new file mode 100644 index 000000000000..4285223ac5ab --- /dev/null +++ b/xen/arch/x86/include/asm/bootdomain.h @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (c) 2024 Apertus Solutions, LLC + * Author: Daniel P. Smith <dpsmith@xxxxxxxxxxxxxxxxxxxx> + * Copyright (c) 2024 Christopher Clark <christopher.w.clark@xxxxxxxxx> + */ + +#ifndef __XEN_X86_BOOTDOMAIN_H__ +#define __XEN_X86_BOOTDOMAIN_H__ + +struct boot_module; + +struct boot_domain { + struct boot_module *kernel; + struct boot_module *ramdisk; +}; + +#endif + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/x86/include/asm/bootinfo.h b/xen/arch/x86/include/asm/bootinfo.h index 59755ef42e53..b135aaebd25e 100644 --- a/xen/arch/x86/include/asm/bootinfo.h +++ b/xen/arch/x86/include/asm/bootinfo.h @@ -10,6 +10,11 @@ #include <xen/types.h> +#include <asm/bootdomain.h> + +/* Max number of boot domains that Xen can construct */ +#define MAX_NR_BOOTDOMS 1 + /* Boot module binary type / purpose */ enum bootmod_type { BOOTMOD_UNKNOWN, @@ -45,6 +50,8 @@ struct boot_info { paddr_t mmap_addr; uint32_t mmap_length; + + struct boot_domain *domains; }; static inline int __init next_boot_module_index( diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index a6fbaecee9ed..77abed637ff2 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -287,6 +287,7 @@ static void __init multiboot_to_bootinfo(multiboot_info_t *mbi, module_t *mods) { static struct boot_info __initdata info; static struct boot_module __initdata boot_mods[MAX_NR_BOOTMODS + 1]; + static struct boot_domain __initdata boot_doms[MAX_NR_BOOTDOMS]; unsigned int i; info.nr_mods = mbi->mods_count; @@ -321,6 +322,8 @@ static void __init multiboot_to_bootinfo(multiboot_info_t *mbi, module_t *mods) boot_mods[info.nr_mods].type = BOOTMOD_XEN; boot_mods[info.nr_mods].flags |= BOOTMOD_FLAG_X86_CONSUMED; + info.domains = boot_doms; + boot_info = &info; } @@ -958,20 +961,10 @@ static struct domain *__init create_dom0(const struct boot_info *bi) .misc_flags = opt_dom0_msr_relaxed ? XEN_X86_MSR_RELAXED : 0, }, }; - int mod_idx = first_boot_module_index(bi, BOOTMOD_RAMDISK); - struct boot_module *image, *initrd; + struct boot_domain *bd = &bi->domains[0]; struct domain *d; domid_t domid; - /* Map boot_module to mb1 module for dom0 */ - image = &bi->mods[0]; - - /* Map boot_module to mb1 module for initrd */ - if ( mod_idx < 0 ) - initrd = NULL; - else - initrd = &bi->mods[mod_idx]; - if ( opt_dom0_pvh ) { dom0_cfg.flags |= (XEN_DOMCTL_CDF_hvm | @@ -997,11 +990,11 @@ static struct domain *__init create_dom0(const struct boot_info *bi) panic("Error creating d%uv0\n", domid); /* Grab the DOM0 command line. */ - if ( image->cmdline || bi->kextra ) + if ( bd->kernel->cmdline || bi->kextra ) { - if ( image->cmdline ) - safe_strcpy(cmdline, - cmdline_cook(__va((unsigned long)image->cmdline), + if ( bd->kernel->cmdline ) + safe_strcpy(cmdline, cmdline_cook( + __va((unsigned long)bd->kernel->cmdline), bi->boot_loader_name)); if ( bi->kextra ) @@ -1036,7 +1029,7 @@ static struct domain *__init create_dom0(const struct boot_info *bi) write_cr4(read_cr4() & ~X86_CR4_SMAP); } - if ( construct_dom0(d, image, initrd, cmdline) != 0 ) + if ( construct_dom0(d, bd->kernel, bd->ramdisk, cmdline) != 0 ) panic("Could not construct domain 0\n"); if ( cpu_has_smap ) @@ -1221,6 +1214,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) /* Dom0 kernel is always first */ boot_info->mods[0].type = BOOTMOD_KERNEL; boot_info->mods[0].flags |= BOOTMOD_FLAG_X86_CONSUMED; + boot_info->domains[0].kernel = &boot_info->mods[0]; if ( pvh_boot ) { @@ -2112,6 +2106,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) { boot_info->mods[initrdidx].type = BOOTMOD_RAMDISK; boot_info->mods[initrdidx].flags |= BOOTMOD_FLAG_X86_CONSUMED; + boot_info->domains[0].ramdisk = &boot_info->mods[initrdidx]; if ( first_boot_module_index(boot_info, BOOTMOD_UNKNOWN) >= 0 ) printk(XENLOG_WARNING "Multiple initrd candidates, picking module #%u\n", -- 2.30.2
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |