From 5df3455e8dcca8cc00fc5a3acdf14c84f55e1fc5 Mon Sep 17 00:00:00 2001 From: Victor Sun Date: Fri, 19 Mar 2021 23:05:51 +0800 Subject: [PATCH] HV: remove SOS kernel hugepage related bootargs Hypervisor does not need to care about hugepage settings in SOS kernel, user could enable these settings in the scenario config file or GRUB menu. Tracked-On: #5815 Signed-off-by: Victor Sun --- hypervisor/common/vm_load.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/hypervisor/common/vm_load.c b/hypervisor/common/vm_load.c index bb1a2b7b7..4818cbed2 100644 --- a/hypervisor/common/vm_load.c +++ b/hypervisor/common/vm_load.c @@ -11,11 +11,8 @@ #include #include #include -#include #include -#define NUM_REMAIN_1G_PAGES 3UL - /* * We put the guest init gdt after kernel/bootarg/ramdisk images. Suppose this is a * safe place for guest init gdt of guest whatever the configuration is used by guest. @@ -118,12 +115,9 @@ static uint64_t create_zero_page(struct acrn_vm *vm) static void prepare_loading_bzimage(struct acrn_vm *vm, struct acrn_vcpu *vcpu) { uint32_t i; - char dyn_bootargs[100] = {0}; uint32_t kernel_entry_offset; struct zero_page *zeropage; struct sw_kernel_info *sw_kernel = &(vm->sw.kernel_info); - struct sw_module_info *bootargs_info = &(vm->sw.bootargs_info); - const struct acrn_vm_config *vm_config = get_vm_config(vm->vm_id); /* calculate the kernel entry point */ zeropage = (struct zero_page *)sw_kernel->kernel_src_addr; @@ -144,21 +138,6 @@ static void prepare_loading_bzimage(struct acrn_vm *vm, struct acrn_vcpu *vcpu) vcpu_set_gpreg(vcpu, i, 0UL); } - /* add "hugepagesz=1G hugepages=x" to cmdline for 1G hugepage - * reserving. Current strategy is "total_mem_size in Giga - - * remained 1G pages" for reserving. - */ - if (is_sos_vm(vm) && (bootargs_info->load_addr != NULL)) { - int64_t reserving_1g_pages; - - reserving_1g_pages = (vm_config->memory.size >> 30U) - NUM_REMAIN_1G_PAGES; - if (reserving_1g_pages > 0) { - snprintf(dyn_bootargs, 100U, " hugepagesz=1G hugepages=%ld", reserving_1g_pages); - (void)copy_to_gpa(vm, dyn_bootargs, ((uint64_t)bootargs_info->load_addr - + bootargs_info->size), (strnlen_s(dyn_bootargs, 99U) + 1U)); - } - } - /* Create Zeropage and copy Physical Base Address of Zeropage * in RSI */