github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-25 23:13:26 +00:00
Code Issues Projects Releases Wiki Activity

HV: vm_load: refine api of get_initrd_load_addr()

Browse Source 
Currently the guest kernel load address and ramdisk load address are
initialized during init_vm_sw_load() stage, this is meaningless when
guest kernel has multiple segments with different loading addresses.
In that case, the kernel load addresses should be parsed and loaded
in vm_sw_loader() stage, the ramdisk load address should be set in
that stage also because it is depended on kernel load address.

This patch refines the API of get_initrd_load_addr() which will set
proper initrd load address of bzImage type kernel for later use.

Tracked-On: #6323

Signed-off-by: Victor Sun <victor.sun@intel.com>
Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com>
This commit is contained in:
Victor Sun 2021-06-20 16:53:27 +08:00 committed by wenlingz
parent bc5c3a0bb7
commit 33d226bf58
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
hypervisor/boot/guest/vboot_info.c
View File

@ -30,38 +30,24 @@
#define PRE_VM_MAX_RAM_ADDR_BELOW_4GB (VIRT_ACPI_DATA_ADDR - 1U) #define PRE_VM_MAX_RAM_ADDR_BELOW_4GB (VIRT_ACPI_DATA_ADDR - 1U)
/** static void *get_initrd_load_addr(struct acrn_vm *vm, uint64_t kernel_start)
* @pre vm != NULL && mod != NULL
*/
static void init_vm_ramdisk_info(struct acrn_vm *vm, const struct abi_module *mod)
{ {
uint64_t ramdisk_load_gpa = INVALID_GPA; uint64_t ramdisk_load_gpa = INVALID_GPA;
uint64_t ramdisk_gpa_max = DEFAULT_RAMDISK_GPA_MAX; uint64_t ramdisk_gpa_max = DEFAULT_RAMDISK_GPA_MAX;
uint64_t kernel_start = (uint64_t)vm->sw.kernel_info.kernel_load_addr; struct zero_page *zeropage = (struct zero_page *)vm->sw.kernel_info.kernel_src_addr;
uint64_t kernel_end = kernel_start + vm->sw.kernel_info.kernel_size;
struct acrn_vm_config *vm_config = get_vm_config(vm->vm_id);
if (mod->start != NULL) {
vm->sw.ramdisk_info.src_addr = mod->start;
vm->sw.ramdisk_info.size = mod->size;
}
/* Per Linux boot protocol, the Kernel need a size of contiguous /* Per Linux boot protocol, the Kernel need a size of contiguous
* memory(i.e. init_size field in zeropage) from its extract address to boot, * memory(i.e. init_size field in zeropage) from its extract address to boot,
* and initrd_addr_max field specifies the maximum address of the ramdisk. * and initrd_addr_max field specifies the maximum address of the ramdisk.
* Per kernel src head_64.S, decompressed kernel start at 2M aligned to the * Per kernel src head_64.S, decompressed kernel start at 2M aligned to the
* compressed kernel load address. * compressed kernel load address.
*/ */
if (vm->sw.kernel_type == KERNEL_BZIMAGE) {
struct zero_page *zeropage = (struct zero_page *)vm->sw.kernel_info.kernel_src_addr;
uint32_t kernel_init_size = zeropage->hdr.init_size; uint32_t kernel_init_size = zeropage->hdr.init_size;
uint32_t initrd_addr_max = zeropage->hdr.initrd_addr_max; uint32_t initrd_addr_max = zeropage->hdr.initrd_addr_max;
uint64_t kernel_end = kernel_start + MEM_2M + kernel_init_size;
kernel_end = kernel_start + MEM_2M + kernel_init_size;
if (initrd_addr_max != 0U) { if (initrd_addr_max != 0U) {
ramdisk_gpa_max = initrd_addr_max; ramdisk_gpa_max = initrd_addr_max;
} }
}
if (is_sos_vm(vm)) { if (is_sos_vm(vm)) {
uint64_t mods_start, mods_end; uint64_t mods_start, mods_end;
@ -111,6 +97,28 @@ static void init_vm_ramdisk_info(struct acrn_vm *vm, const struct abi_module *mo
vm->sw.ramdisk_info.size = 0U; vm->sw.ramdisk_info.size = 0U;
} }
return (ramdisk_load_gpa == INVALID_GPA) ? NULL : (void *)ramdisk_load_gpa;
}
/**
* @pre vm != NULL && mod != NULL
*/
static void init_vm_ramdisk_info(struct acrn_vm *vm, const struct abi_module *mod)
{
uint64_t ramdisk_load_gpa = INVALID_GPA;
struct acrn_vm_config *vm_config = get_vm_config(vm->vm_id);
if (mod->start != NULL) {
vm->sw.ramdisk_info.src_addr = mod->start;
vm->sw.ramdisk_info.size = mod->size;
}
if (vm->sw.kernel_type == KERNEL_BZIMAGE) {
uint64_t kernel_start = (uint64_t)vm->sw.kernel_info.kernel_load_addr;
ramdisk_load_gpa = (uint64_t)get_initrd_load_addr(vm, kernel_start);
}
/* Use customer specified ramdisk load addr if it is configured in VM configuration, /* Use customer specified ramdisk load addr if it is configured in VM configuration,
* otherwise use allocated address calculated by HV. * otherwise use allocated address calculated by HV.
*/ */