|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen staging] x86/boot: eliminate module_map
commit 74af2d98276d495933d67267cc66233028e3c89a
Author: Daniel P. Smith <dpsmith@xxxxxxxxxxxxxxxxxxxx>
AuthorDate: Sat Nov 2 13:25:41 2024 -0400
Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Wed Nov 6 19:05:02 2024 +0000
x86/boot: eliminate module_map
With all boot modules now labeled by type, it is no longer necessary to
track whether a boot module was identified via the module_map bitmap.
Introduce a set of helpers to search the list of boot modules based on type
and
the reference type, pointer or array index, desired. Then drop all uses of
setting a bit in module_map and replace its use for looping with the
helpers.
Signed-off-by: Daniel P. Smith <dpsmith@xxxxxxxxxxxxxxxxxxxx>
---
xen/arch/x86/cpu/microcode/core.c | 13 +++++++-----
xen/arch/x86/include/asm/bootinfo.h | 42 ++++++++++++++++++++++++++++++++++++-
xen/arch/x86/setup.c | 28 +++++++++++++++----------
xen/xsm/xsm_policy.c | 18 ++++++----------
4 files changed, 72 insertions(+), 29 deletions(-)
diff --git a/xen/arch/x86/cpu/microcode/core.c
b/xen/arch/x86/cpu/microcode/core.c
index c0619b124e..11cd878d1f 100644
--- a/xen/arch/x86/cpu/microcode/core.c
+++ b/xen/arch/x86/cpu/microcode/core.c
@@ -797,15 +797,18 @@ static int __init early_microcode_load(struct boot_info
*bi)
if ( opt_scan ) /* Scan for a CPIO archive */
{
- for ( idx = 1; idx < bi->nr_modules; ++idx )
+ for ( idx = 0; idx < bi->nr_modules; ++idx )
{
+ const struct boot_module *bm = &bi->mods[idx];
struct cpio_data cd;
- if ( !test_bit(idx, bi->module_map) )
+ /* Search anything unclaimed or likely to be a CPIO archive. */
+ if ( bm->type != BOOTMOD_UNKNOWN &&
+ bm->type != BOOTMOD_RAMDISK )
continue;
- size = bi->mods[idx].mod->mod_end;
- data = bootstrap_map_bm(&bi->mods[idx]);
+ size = bm->mod->mod_end;
+ data = bootstrap_map_bm(bm);
if ( !data )
{
printk(XENLOG_WARNING "Microcode: Could not map module %d,
size %zu\n",
@@ -851,7 +854,7 @@ static int __init early_microcode_load(struct boot_info *bi)
return -ENODEV;
}
- if ( !__test_and_clear_bit(idx, bi->module_map) )
+ if ( bi->mods[idx].type != BOOTMOD_UNKNOWN )
{
printk(XENLOG_WARNING "Microcode: Chosen module %d already
used\n", idx);
return -ENODEV;
diff --git a/xen/arch/x86/include/asm/bootinfo.h
b/xen/arch/x86/include/asm/bootinfo.h
index fc74e3b224..b828c67939 100644
--- a/xen/arch/x86/include/asm/bootinfo.h
+++ b/xen/arch/x86/include/asm/bootinfo.h
@@ -43,10 +43,50 @@ struct boot_info {
size_t memmap_length;
unsigned int nr_modules;
- unsigned long *module_map; /* Temporary */
struct boot_module mods[MAX_NR_BOOTMODS + 1];
};
+/*
+ * next_boot_module_index:
+ * Finds the next boot module of type t, starting at array index start.
+ *
+ * Returns:
+ * Success - index in boot_module array
+ * Failure - a value greater than MAX_NR_BOOTMODS
+ */
+static inline unsigned int __init next_boot_module_index(
+ const struct boot_info *bi, enum bootmod_type t, unsigned int start)
+{
+ unsigned int i;
+
+ if ( t == BOOTMOD_XEN )
+ return bi->nr_modules;
+
+ for ( i = start; i < bi->nr_modules; i++ )
+ {
+ if ( bi->mods[i].type == t )
+ return i;
+ }
+
+ return MAX_NR_BOOTMODS + 1;
+}
+
+/*
+ * first_boot_module_index:
+ * Finds the first boot module of type t.
+ *
+ * Returns:
+ * Success - index in boot_module array
+ * Failure - a value greater than MAX_NR_BOOTMODS
+ */
+#define first_boot_module_index(bi, t) \
+ next_boot_module_index(bi, t, 0)
+
+#define for_each_boot_module_by_type(i, b, t) \
+ for ( (i) = first_boot_module_index(b, t); \
+ (i) <= (b)->nr_modules; \
+ (i) = next_boot_module_index(b, t, i + 1) )
+
#endif /* X86_BOOTINFO_H */
/*
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index fac08b6242..92dbdfe12a 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1034,7 +1034,7 @@ void asmlinkage __init noreturn __start_xen(void)
struct cpu_info *info = get_cpu_info(), *bsp_info;
unsigned int initrdidx, num_parked = 0;
struct boot_info *bi;
- unsigned long nr_pages, raw_max_page, modules_headroom, module_map[1];
+ unsigned long nr_pages, raw_max_page, modules_headroom;
int i, j, e820_warn = 0, bytes = 0;
unsigned long eb_start, eb_end;
bool acpi_boot_table_init_done = false, relocated = false;
@@ -1097,8 +1097,6 @@ void asmlinkage __init noreturn __start_xen(void)
ASSERT(multiboot_ptr < MB(1) || xen_phys_start);
}
- bi->module_map = module_map; /* Temporary */
-
/* Parse the command-line options. */
if ( (kextra = strstr(bi->cmdline, " -- ")) != NULL )
{
@@ -1216,8 +1214,7 @@ void asmlinkage __init noreturn __start_xen(void)
bi->nr_modules);
}
- bitmap_fill(module_map, bi->nr_modules);
- __clear_bit(0, module_map); /* Dom0 kernel is always first */
+ /* Dom0 kernel is always first */
bi->mods[0].type = BOOTMOD_KERNEL;
if ( pvh_boot )
@@ -2098,13 +2095,22 @@ void asmlinkage __init noreturn __start_xen(void)
cpu_has_nx ? XENLOG_INFO : XENLOG_WARNING "Warning: ",
cpu_has_nx ? "" : "not ");
- initrdidx = find_first_bit(module_map, bi->nr_modules);
- if ( initrdidx < bi->nr_modules )
+ /*
+ * At this point all capabilities that consume boot modules should have
+ * claimed their boot modules. Find the first unclaimed boot module and
+ * claim it as the initrd ramdisk. Do a second search to see if there are
+ * any remaining unclaimed boot modules, and report them as unusued initrd
+ * candidates.
+ */
+ initrdidx = first_boot_module_index(bi, BOOTMOD_UNKNOWN);
+ if ( initrdidx < MAX_NR_BOOTMODS )
+ {
bi->mods[initrdidx].type = BOOTMOD_RAMDISK;
- if ( bitmap_weight(module_map, bi->nr_modules) > 1 )
- printk(XENLOG_WARNING
- "Multiple initrd candidates, picking module #%u\n",
- initrdidx);
+ if ( first_boot_module_index(bi, BOOTMOD_UNKNOWN) < MAX_NR_BOOTMODS )
+ printk(XENLOG_WARNING
+ "Multiple initrd candidates, picking module #%u\n",
+ initrdidx);
+ }
/*
* We're going to setup domain0 using the module(s) that we stashed safely
diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c
index 4c195411d0..76280903d5 100644
--- a/xen/xsm/xsm_policy.c
+++ b/xen/xsm/xsm_policy.c
@@ -33,22 +33,17 @@
int __init xsm_multiboot_policy_init(
struct boot_info *bi, void **policy_buffer, size_t *policy_size)
{
- int i;
+ unsigned int i;
int rc = 0;
u32 *_policy_start;
unsigned long _policy_len;
- /*
- * Try all modules and see whichever could be the binary policy.
- * Adjust module_map for the module that is the binary policy.
- */
- for ( i = bi->nr_modules - 1; i >= 1; i-- )
+ for_each_boot_module_by_type ( i, bi, BOOTMOD_UNKNOWN )
{
- if ( !test_bit(i, bi->module_map) )
- continue;
+ struct boot_module *bm = &bi->mods[i];
- _policy_start = bootstrap_map(bi->mods[i].mod);
- _policy_len = bi->mods[i].mod->mod_end;
+ _policy_start = bootstrap_map_bm(bm);
+ _policy_len = bm->mod->mod_end;
if ( (xsm_magic_t)(*_policy_start) == XSM_MAGIC )
{
@@ -58,8 +53,7 @@ int __init xsm_multiboot_policy_init(
printk("Policy len %#lx, start at %p.\n",
_policy_len,_policy_start);
- __clear_bit(i, bi->module_map);
- bi->mods[i].type = BOOTMOD_XSM_POLICY;
+ bm->type = BOOTMOD_XSM_POLICY;
break;
}
--
generated by git-patchbot for /home/xen/git/xen.git#staging
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |