From: Jack Lange Date: Thu, 22 Sep 2011 16:54:21 +0000 (-0400) Subject: exported functionality for vmcs flushing via vmcs_clear X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=dff987790423249e95487f8754ebe0fbee8dbbdd;p=palacios.git exported functionality for vmcs flushing via vmcs_clear --- diff --git a/palacios/include/palacios/vmx.h b/palacios/include/palacios/vmx.h index c3b3254..06e4df2 100644 --- a/palacios/include/palacios/vmx.h +++ b/palacios/include/palacios/vmx.h @@ -223,6 +223,8 @@ int v3_deinit_vmx_vmcs(struct guest_info * core); int v3_start_vmx_guest(struct guest_info* info); int v3_reset_vmx_vm_core(struct guest_info * core, addr_t rip); +void v3_flush_vmx_vm_core(struct guest_info * core); + int v3_vmx_enter(struct guest_info * info); int v3_vmx_load_core(struct guest_info * core, void * ctx); diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index ca12fc7..87746ef 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -387,6 +387,20 @@ int v3_move_vm_core(struct v3_vm_info * vm, int vcore_id, int target_cpu) { V3_Print("Moving Core\n"); + +#ifdef V3_CONFIG_VMX + switch (v3_cpu_types[core->pcpu_id]) { + case V3_VMX_CPU: + case V3_VMX_EPT_CPU: + case V3_VMX_EPT_UG_CPU: + PrintDebug("Flushing VMX Guest CPU %d\n", core->vcpu_id); + V3_Call_On_CPU(core->pcpu_id, (void (*)(void *))v3_flush_vmx_vm_core, (void *)core); + break; + default: + break; + } +#endif + if (V3_MOVE_THREAD_TO_CPU(target_cpu, core->core_thread) != 0) { PrintError("Failed to move Vcore %d to CPU %d\n", core->vcpu_id, target_cpu); diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c index e733eb5..405bca8 100644 --- a/palacios/src/palacios/vmx.c +++ b/palacios/src/palacios/vmx.c @@ -612,6 +612,14 @@ int v3_vmx_load_core(struct guest_info * core, void * ctx){ #endif +void v3_flush_vmx_vm_core(struct guest_info * core) { + struct vmx_data * vmx_info = (struct vmx_data *)(core->vmm_data); + vmcs_clear(vmx_info->vmcs_ptr_phys); + vmx_info->state = VMX_UNLAUNCHED; +} + + + static int update_irq_exit_state(struct guest_info * info) { struct vmx_exit_idt_vec_info idt_vec_info; @@ -861,19 +869,22 @@ int v3_vmx_enter(struct guest_info * info) { ret = v3_vmx_resume(&(info->vm_regs), info, &(info->ctrl_regs)); } + + // PrintDebug("VMX Exit: ret=%d\n", ret); if (ret != VMX_SUCCESS) { uint32_t error = 0; - vmcs_read(VMCS_INSTR_ERR, &error); v3_enable_ints(); - PrintError("VMENTRY Error: %d\n", error); + PrintError("VMENTRY Error: %d (launch_ret = %d)\n", error, ret); return -1; } + + // Immediate exit from VM time bookkeeping v3_time_exit_vm(info);