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

HV: use api to get kernel load addr

Browse Source 
For a Linux guest, the kernel load address should be gotten from zeropage
even for a pre-launched VM;

Tracked-On: #3214

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 2019-06-02 22:23:24 +08:00 committed by wenlingz
parent 1c00611382
commit ae8893cba1
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,24 +135,36 @@ static void merge_cmdline(const struct acrn_vm *vm, const char *cmdline, const c
} }
} }
static void *get_kernel_load_addr(void *kernel_src_addr) static void *get_kernel_load_addr(struct acrn_vm *vm)
{ {
void *load_addr = NULL;
struct vm_sw_info *sw_info = &vm->sw;
struct zero_page *zeropage; struct zero_page *zeropage;
/* According to the explaination for pref_address switch (sw_info->kernel_type) {
* in Documentation/x86/boot.txt, a relocating case VM_LINUX_GUEST:
* bootloader should attempt to load kernel at pref_address /* According to the explaination for pref_address
* if possible. A non-relocatable kernel will unconditionally * in Documentation/x86/boot.txt, a relocating
* move itself and to run at this address, so no need to copy * bootloader should attempt to load kernel at pref_address
* kernel to perf_address by bootloader, if kernel is * if possible. A non-relocatable kernel will unconditionally
* non-relocatable. * move itself and to run at this address, so no need to copy
*/ * kernel to perf_address by bootloader, if kernel is
zeropage = (struct zero_page *)kernel_src_addr; * non-relocatable.
if (zeropage->hdr.relocatable_kernel != 0U) { */
zeropage = (struct zero_page *)zeropage->hdr.pref_addr; zeropage = (struct zero_page *)sw_info->kernel_info.kernel_src_addr;
if (zeropage->hdr.relocatable_kernel != 0U) {
zeropage = (struct zero_page *)zeropage->hdr.pref_addr;
}
load_addr = (void *)zeropage;
break;
default:
pr_err("Unsupported Kernel type.");
break;
} }
if (load_addr == NULL) {
return (void *)zeropage; pr_err("Could not get kernel load addr of VM %d .", vm->vm_id);
}
return load_addr;
} }
static int32_t init_general_vm_boot_info(struct acrn_vm *vm) static int32_t init_general_vm_boot_info(struct acrn_vm *vm)
@ -187,18 +199,15 @@ static int32_t init_general_vm_boot_info(struct acrn_vm *vm)
vm->sw.kernel_type = VM_LINUX_GUEST; vm->sw.kernel_type = VM_LINUX_GUEST;
vm->sw.kernel_info.kernel_src_addr = hpa2hva((uint64_t)mods[0].mm_mod_start); vm->sw.kernel_info.kernel_src_addr = hpa2hva((uint64_t)mods[0].mm_mod_start);
vm->sw.kernel_info.kernel_size = mods[0].mm_mod_end - mods[0].mm_mod_start; vm->sw.kernel_info.kernel_size = mods[0].mm_mod_end - mods[0].mm_mod_start;
vm->sw.kernel_info.kernel_load_addr = get_kernel_load_addr(vm);
struct acrn_vm_config *vm_config = get_vm_config(vm->vm_id); struct acrn_vm_config *vm_config = get_vm_config(vm->vm_id);
if (vm_config->load_order == PRE_LAUNCHED_VM) { if (vm_config->load_order == PRE_LAUNCHED_VM) {
vm->sw.kernel_info.kernel_load_addr = (void *)(MEM_1M * 16U);
vm->sw.bootargs_info.src_addr = (void *)vm_config->os_config.bootargs; vm->sw.bootargs_info.src_addr = (void *)vm_config->os_config.bootargs;
vm->sw.bootargs_info.size = vm->sw.bootargs_info.size =
strnlen_s(vm_config->os_config.bootargs, MAX_BOOTARGS_SIZE); strnlen_s(vm_config->os_config.bootargs, MAX_BOOTARGS_SIZE);
} else { } else {
vm->sw.kernel_info.kernel_load_addr =
get_kernel_load_addr(vm->sw.kernel_info.kernel_src_addr);
if ((mbi->mi_flags & MULTIBOOT_INFO_HAS_CMDLINE) != 0U) { if ((mbi->mi_flags & MULTIBOOT_INFO_HAS_CMDLINE) != 0U) {
/* /*
* If there is cmdline from mbi->mi_cmdline, merge it with * If there is cmdline from mbi->mi_cmdline, merge it with
@ -228,7 +237,9 @@ static int32_t init_general_vm_boot_info(struct acrn_vm *vm)
parse_other_modules(vm, mods + 1, mbi->mi_mods_count - 1); parse_other_modules(vm, mods + 1, mbi->mi_mods_count - 1);
} }
clac(); clac();
ret = 0; if (vm->sw.kernel_info.kernel_load_addr != NULL) {
ret = 0;
}
} }
} }
} }