On 10/7/24 17:06, Jason Andryuk wrote:
> On 2024-10-06 17:49, Daniel P. Smith wrote:
>> Allow the tracking of when a boot module has been consumed by a
>> handler in the
>> hypervisor independent of when it is claimed. The instances where the
>> hypervisor does nothing beyond claiming, the dom0 kernel, dom0
>> ramdisk, and a
>> placeholder for itself, are updated as being consumed at the time of
>> being
>> claimed.
>>
>> Signed-off-by: Daniel P. Smith <dpsmith@apertussolutions.com>
>> ---
>> xen/arch/x86/include/asm/bootinfo.h | 1 +
>> xen/arch/x86/setup.c | 3 +++
>> 2 files changed, 4 insertions(+)
>>
>> diff --git a/xen/arch/x86/include/asm/bootinfo.h
>> b/xen/arch/x86/include/asm/bootinfo.h
>> index c79678840d31..7833b065eff1 100644
>> --- a/xen/arch/x86/include/asm/bootinfo.h
>> +++ b/xen/arch/x86/include/asm/bootinfo.h
>> @@ -34,6 +34,7 @@ struct boot_module {
>> uint32_t flags;
>> #define BOOTMOD_FLAG_X86_RELOCATED (1U << 0)
>> +#define BOOTMOD_FLAG_X86_CONSUMED (1U << 1)
>> paddr_t start;
>> size_t size;
>> diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
>> index 4f540c461b26..235b4e41f653 100644
>> --- a/xen/arch/x86/setup.c
>> +++ b/xen/arch/x86/setup.c
>> @@ -318,6 +318,7 @@ static struct boot_info __init
>> *multiboot_fill_boot_info(unsigned long mbi_p)
>> /* map the last mb module for xen entry */
>> bi->mods[bi->nr_modules].type = BOOTMOD_XEN;
>> + bi->mods[bi->nr_modules].flags |= BOOTMOD_FLAG_X86_CONSUMED;
>> bi->mods[bi->nr_modules].mod = &mods[bi->nr_modules];
>> return bi;
>> @@ -1196,6 +1197,7 @@ void asmlinkage __init noreturn
>> __start_xen(unsigned long mbi_p)
>> bitmap_fill(module_map, bi->nr_modules);
>> __clear_bit(0, module_map); /* Dom0 kernel is always first */
>> bi->mods[0].type = BOOTMOD_KERNEL;
>> + bi->mods[0].flags |= BOOTMOD_FLAG_X86_CONSUMED;
>
> I think these first two can be straight assignments since they occur
> before relocation.
True, will change to straight assignment.
>> if ( pvh_boot )
>> {
>> @@ -2085,6 +2087,7 @@ void asmlinkage __init noreturn
>> __start_xen(unsigned long mbi_p)
>> initrdidx = find_first_bit(module_map, bi->nr_modules);
>> bi->mods[initrdidx].type = BOOTMOD_RAMDISK;
>> + bi->mods[initrdidx].flags |= BOOTMOD_FLAG_X86_CONSUMED;
>> if ( bitmap_weight(module_map, bi->nr_modules) > 1 )
>> printk(XENLOG_WARNING
>> "Multiple initrd candidates, picking module #%u\n",
>
> This one is after relocation, so |= is necessary.
I am going to assume that is just a reminder since it is already '|='.
v/r,
dps