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

hv: remove the vm loader for UOS in hv.

Browse Source 
Now, we make UOS to set BSP init state by using hypercall. We
could drop the old UOS loader in HV and make vm loader in HV
only for SOS.

Tracked-On: #1231
Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Yin Fengwei 2018-10-03 20:07:39 +08:00 committed by wenlingz
parent fc575460a3
commit b454a067be
5 changed files with 11 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hypervisor/arch/x86/guest/vcpu.c
View File

@ -661,6 +661,7 @@ int prepare_vcpu(struct vm *vm, uint16_t pcpu_id)
} else { } else {
return -EINVAL; return -EINVAL;
} }
vm_sw_loader(vm);
} else { } else {
#ifdef CONFIG_EFI_STUB #ifdef CONFIG_EFI_STUB
/* currently non-vm0 will boot kernel directly */ /* currently non-vm0 will boot kernel directly */
@ -670,7 +671,6 @@ int prepare_vcpu(struct vm *vm, uint16_t pcpu_id)
#endif #endif
} }
#endif //CONFIG_PARTITION_MODE #endif //CONFIG_PARTITION_MODE
vm_sw_loader(vm, vcpu);
} else { } else {
vcpu->arch_vcpu.cpu_mode = CPU_MODE_REAL; vcpu->arch_vcpu.cpu_mode = CPU_MODE_REAL;
} }

8
hypervisor/arch/x86/guest/vm.c
View File

@ -304,11 +304,11 @@ int reset_vm(struct vm *vm)
foreach_vcpu(i, vm, vcpu) { foreach_vcpu(i, vm, vcpu) {
reset_vcpu(vcpu); reset_vcpu(vcpu);
vcpu->arch_vcpu.cpu_mode = CPU_MODE_REAL; vcpu->arch_vcpu.cpu_mode = CPU_MODE_REAL;
if (is_vcpu_bsp(vcpu)) { }
vm_sw_loader(vm, vcpu);
} if (is_vm0(vm)) {
vm_sw_loader(vm);
} }
vioapic_reset(vm_ioapic(vm)); vioapic_reset(vm_ioapic(vm));

6
hypervisor/bsp/uefi/uefi.c
View File

@ -36,18 +36,16 @@ void efi_spurious_handler(int vector)
return; return;
} }
int uefi_sw_loader(struct vm *vm, struct vcpu *vcpu) int uefi_sw_loader(struct vm *vm)
{ {
int ret = 0; int ret = 0;
struct vcpu *vcpu = get_primary_vcpu(vm);
struct acrn_vcpu_regs *vcpu_regs = &vm0_boot_context; struct acrn_vcpu_regs *vcpu_regs = &vm0_boot_context;
ASSERT(vm != NULL, "Incorrect argument"); ASSERT(vm != NULL, "Incorrect argument");
pr_dbg("Loading guest to run-time location"); pr_dbg("Loading guest to run-time location");
if (!is_vm0(vm))
return load_guest(vm, vcpu);
vlapic_restore(vcpu_vlapic(vcpu), &uefi_lapic_regs); vlapic_restore(vcpu_vlapic(vcpu), &uefi_lapic_regs);
/* For UEFI platform, the bsp init regs come from two places: /* For UEFI platform, the bsp init regs come from two places:

45
hypervisor/common/vm_load.c
View File

@ -85,41 +85,7 @@ static uint64_t create_zero_page(struct vm *vm)
return gpa; return gpa;
} }
int load_guest(struct vm *vm, struct vcpu *vcpu) int general_sw_loader(struct vm *vm)
{
int32_t ret = 0;
void *hva;
uint64_t lowmem_gpa_top;
hva = gpa2hva(vm, GUEST_CFG_OFFSET);
lowmem_gpa_top = *(uint64_t *)hva;
hva = gpa2hva(vm, lowmem_gpa_top -
MEM_4K - MEM_2K);
vcpu->entry_addr = (void *)(*((uint64_t *)hva));
if (get_vcpu_mode(vcpu) == CPU_MODE_REAL) {
set_bsp_real_mode_entry(vcpu);
} else {
set_bsp_protect_mode_regs(vcpu);
}
vcpu_set_gpreg(vcpu, CPU_REG_RSI, lowmem_gpa_top - MEM_4K);
pr_info("%s, Set config according to predefined offset:",
__func__);
pr_info("VCPU%hu Entry: 0x%llx, RSI: 0x%016llx, cr3: 0x%016llx",
vcpu->vcpu_id, vcpu->entry_addr,
vcpu_get_gpreg(vcpu, CPU_REG_RSI),
vm->arch_vm.guest_init_pml4);
return ret;
}
/*
* @pre vm != NULL
*/
int general_sw_loader(struct vm *vm, struct vcpu *vcpu)
{ {
int32_t ret = 0; int32_t ret = 0;
void *hva; void *hva;
@ -128,17 +94,10 @@ int general_sw_loader(struct vm *vm, struct vcpu *vcpu)
struct zero_page *zeropage; struct zero_page *zeropage;
struct sw_linux *sw_linux = &(vm->sw.linux_info); struct sw_linux *sw_linux = &(vm->sw.linux_info);
struct sw_kernel_info *sw_kernel = &(vm->sw.kernel_info); struct sw_kernel_info *sw_kernel = &(vm->sw.kernel_info);
struct vcpu *vcpu = get_primary_vcpu(vm);
pr_dbg("Loading guest to run-time location"); pr_dbg("Loading guest to run-time location");
/* ACRN in partiton mode boots all VMs without devicemodel */
#ifndef CONFIG_PARTITION_MODE
/* FIXME: set config according to predefined offset */
if (!is_vm0(vm)) {
return load_guest(vm, vcpu);
}
#endif
set_vcpu_regs(vcpu, &vm0_boot_context); set_vcpu_regs(vcpu, &vm0_boot_context);
/* calculate the kernel entry point */ /* calculate the kernel entry point */

5
hypervisor/include/arch/x86/guest/guest.h
View File

@ -135,10 +135,9 @@ void init_msr_emulation(struct vcpu *vcpu);
struct run_context; struct run_context;
int vmx_vmrun(struct run_context *context, int ops, int ibrs); int vmx_vmrun(struct run_context *context, int ops, int ibrs);
int load_guest(struct vm *vm, struct vcpu *vcpu); int general_sw_loader(struct vm *vm);
int general_sw_loader(struct vm *vm, struct vcpu *vcpu);
typedef int (*vm_sw_loader_t)(struct vm *vm, struct vcpu *vcpu); typedef int (*vm_sw_loader_t)(struct vm *vm);
extern vm_sw_loader_t vm_sw_loader; extern vm_sw_loader_t vm_sw_loader;
/* @pre Caller(Guest) should make sure gpa is continuous. /* @pre Caller(Guest) should make sure gpa is continuous.