OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

HV: Refine 'hv_main()' function usage 

'hv_main()' wraps several logic which has no dependencies
   each other(enable VMX, prepare to create service os VM..),
   in this case, split this function to make code logic clear.

   remove 'is_vm0_bsp()' & 'hv_main()'
Signed-off-by: Yonghua Huang <yonghua.huang@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Yonghua Huang 2018-08-03 21:58:02 +08:00 committed by lijinxia
parent 9d9c97d668
commit 2299926a88
5 changed files with 11 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hypervisor/arch/x86/cpu.c
View File

@ -546,10 +546,11 @@ static void bsp_boot_post(void)
console_setup_timer(); console_setup_timer();
/* Start initializing the VM for this CPU */ exec_vmxon_instr(BOOT_CPU_ID);
if (hv_main(BOOT_CPU_ID) != 0) {
panic("failed to start VM for bsp\n"); prepare_vm0();
}
default_idle();
/* Control should not come here */ /* Control should not come here */
cpu_dead(BOOT_CPU_ID); cpu_dead(BOOT_CPU_ID);
@ -621,13 +622,12 @@ static void cpu_secondary_post(void)
/* Wait for boot processor to signal all secondary cores to continue */ /* Wait for boot processor to signal all secondary cores to continue */
pcpu_sync_sleep(&pcpu_sync, 0UL); pcpu_sync_sleep(&pcpu_sync, 0UL);
ret = hv_main(get_cpu_id()); exec_vmxon_instr(get_cpu_id());
if (ret != 0) {
panic("hv_main ret = %d\n", ret);
}
/* Control will only come here for secondary CPUs not configured for default_idle();
* use or if an error occurs in hv_main
/* Control will only come here for secondary
* CPUs not configured for use.
*/ */
cpu_dead(get_cpu_id()); cpu_dead(get_cpu_id());
} }

2
hypervisor/arch/x86/idt.S
View File

@ -393,7 +393,7 @@ external_interrupt_save_frame:
/* /*
* We disable softirq path from interrupt IRET, since right now all IRQ * We disable softirq path from interrupt IRET, since right now all IRQ
* are for Guest, and we can execute softirq in hv_main() loop * are for Guest.
*/ */
popq %rax popq %rax

42
hypervisor/common/hv_main.c
View File

@ -107,48 +107,6 @@ void vcpu_thread(struct vcpu *vcpu)
} while (1); } while (1);
} }
static bool is_vm0_bsp(uint16_t pcpu_id)
{
#ifdef CONFIG_VM0_DESC
return pcpu_id == vm0_desc.vm_pcpu_ids[0];
#else
return pcpu_id == BOOT_CPU_ID;
#endif
}
int32_t hv_main(uint16_t pcpu_id)
{
int32_t ret;
pr_info("%s, Starting common entry point for CPU %hu",
__func__, pcpu_id);
if (pcpu_id != get_cpu_id()) {
pr_err("%s, cpu_id %hu mismatch\n", __func__, pcpu_id);
return -EINVAL;
}
/* Enable virtualization extensions */
ret = exec_vmxon_instr(pcpu_id);
if (ret != 0) {
return ret;
}
/* X2APIC mode is disabled by default. */
x2apic_enabled = false;
if (is_vm0_bsp(pcpu_id)) {
ret = prepare_vm0();
if (ret != 0) {
return ret;
}
}
default_idle();
return 0;
}
#ifdef HV_DEBUG #ifdef HV_DEBUG
void get_vmexit_profile(char *str_arg, int str_max) void get_vmexit_profile(char *str_arg, int str_max)
{ {

3
hypervisor/common/hypercall.c
View File

@ -161,9 +161,6 @@ int32_t hcall_create_vm(struct vm *vm, uint64_t param)
{ {
int32_t ret = 0; int32_t ret = 0;
struct vm *target_vm = NULL; struct vm *target_vm = NULL;
/* VM are created from hv_main() directly
* Here we just return the vmid for DM
*/
struct acrn_create_vm cv; struct acrn_create_vm cv;
struct vm_description vm_desc; struct vm_description vm_desc;

1
hypervisor/include/arch/x86/cpu.h
View File

@ -261,7 +261,6 @@ extern struct cpuinfo_x86 boot_cpu_data;
/* Function prototypes */ /* Function prototypes */
void cpu_dead(uint16_t pcpu_id); void cpu_dead(uint16_t pcpu_id);
void trampoline_start16(void); void trampoline_start16(void);
int32_t hv_main(uint16_t cpu_id);
bool is_vapic_supported(void); bool is_vapic_supported(void);
bool is_vapic_intr_delivery_supported(void); bool is_vapic_intr_delivery_supported(void);
bool is_vapic_virt_reg_supported(void); bool is_vapic_virt_reg_supported(void);