new file mode 100644
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (c) 2024 Apertus Solutions, LLC
+ * Author: Daniel P. Smith <dpsmith@apertussolutions.com>
+ * Copyright (c) 2024 Christopher Clark <christopher.w.clark@gmail.com>
+ */
+
+#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:
+ */
@@ -9,10 +9,14 @@
#define X86_BOOTINFO_H
#include <xen/types.h>
+#include <asm/bootdomain.h>
/* Max number of boot modules a bootloader can provide in addition to Xen */
#define MAX_NR_BOOTMODS 63
+/* Max number of boot domains that Xen can construct */
+#define MAX_NR_BOOTDOMS 1
+
/* Boot module binary type / purpose */
enum bootmod_type {
BOOTMOD_UNKNOWN,
@@ -68,6 +72,7 @@ struct boot_info {
unsigned int nr_modules;
struct boot_module mods[MAX_NR_BOOTMODS + 1];
+ struct boot_domain domains[MAX_NR_BOOTDOMS];
};
static inline struct boot_module *__init next_boot_module_by_type(
@@ -972,20 +972,10 @@ static struct domain *__init create_dom0(struct boot_info *bi)
.misc_flags = opt_dom0_msr_relaxed ? XEN_X86_MSR_RELAXED : 0,
},
};
- unsigned 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 |
@@ -1011,11 +1001,10 @@ static struct domain *__init create_dom0(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(image->cmdline),
+ if ( bd->kernel->cmdline )
+ safe_strcpy(cmdline, cmdline_cook(__va(bd->kernel->cmdline),
bi->loader));
if ( bi->kextra )
@@ -1039,7 +1028,7 @@ static struct domain *__init create_dom0(struct boot_info *bi)
}
}
- 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");
return d;
@@ -1226,6 +1215,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
/* Dom0 kernel is always first */
bi->mods[0].type = BOOTMOD_KERNEL;
bi->mods[0].consumed = true;
+ bi->domains[0].kernel = &bi->mods[0];
if ( pvh_boot )
{
@@ -2104,6 +2094,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p)
{
bi->mods[initrdidx].type = BOOTMOD_RAMDISK;
bi->mods[initrdidx].consumed = true;
+ bi->domains[0].ramdisk = &bi->mods[initrdidx];
if ( first_boot_module_index(bi, BOOTMOD_UNKNOWN) < MAX_NR_BOOTMODS )
printk(XENLOG_WARNING
"Multiple initrd candidates, picking module #%u\n",
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@apertussolutions.com> --- xen/arch/x86/include/asm/bootdomain.h | 28 +++++++++++++++++++++++++++ xen/arch/x86/include/asm/bootinfo.h | 5 +++++ xen/arch/x86/setup.c | 23 +++++++--------------- 3 files changed, 40 insertions(+), 16 deletions(-) create mode 100644 xen/arch/x86/include/asm/bootdomain.h