From: Patrick G. Bridges Date: Mon, 7 Mar 2011 22:54:11 +0000 (-0800) Subject: Start at support for multiple VMs per core on VMX systems. Minor compile fixup for... X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=9e5edc5349bbd8d3e8e4f0dabe78e6543f32708a;p=palacios.git Start at support for multiple VMs per core on VMX systems. Minor compile fixup for Xed as well --- diff --git a/palacios/include/palacios/vmx.h b/palacios/include/palacios/vmx.h index 9f07886..fd5e6ce 100644 --- a/palacios/include/palacios/vmx.h +++ b/palacios/include/palacios/vmx.h @@ -181,6 +181,11 @@ struct vmx_basic_msr { typedef enum { VMXASSIST_DISABLED, VMXASSIST_ENABLED +} vmxassist_state_t; + +typedef enum { + VMX_UNLAUNCHED, + VMX_LAUNCHED } vmx_state_t; struct tss_descriptor { @@ -218,6 +223,7 @@ struct vmcs_host_state { struct vmx_data { vmx_state_t state; + vmxassist_state_t assist_state; struct vmcs_host_state host_state; addr_t vmcs_ptr_phys; diff --git a/palacios/include/palacios/vmx_handler.h b/palacios/include/palacios/vmx_handler.h index 1fdf98c..2845e21 100644 --- a/palacios/include/palacios/vmx_handler.h +++ b/palacios/include/palacios/vmx_handler.h @@ -217,7 +217,7 @@ struct vmx_exit_info { - +int v3_handle_atomic_vmx_exit(struct guest_info * info, struct vmx_exit_info * exit_info); int v3_handle_vmx_exit(struct guest_info * info, struct vmx_exit_info * exit_info); const char * v3_vmx_exit_code_to_str(vmx_exit_t exit); diff --git a/palacios/src/palacios/vmm_xed.c b/palacios/src/palacios/vmm_xed.c index e23ace0..716ee06 100644 --- a/palacios/src/palacios/vmm_xed.c +++ b/palacios/src/palacios/vmm_xed.c @@ -555,7 +555,7 @@ int v3_decode(struct guest_info * info, addr_t instr_ptr, struct x86_instr * ins } -int v3_encode(struct guest_info * info, struct x86_instr * instr, char * instr_buf) { +int v3_encode(struct guest_info * info, struct x86_instr * instr, uint8_t * instr_buf) { return -1; } diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c index ef0f614..a773191 100644 --- a/palacios/src/palacios/vmx.c +++ b/palacios/src/palacios/vmx.c @@ -42,8 +42,7 @@ static addr_t host_vmcs_ptrs[CONFIG_MAX_CPUS] = { [0 ... CONFIG_MAX_CPUS - 1] = 0}; - - +static addr_t active_vmcs_ptrs[CONFIG_MAX_CPUS] = { [0 ... CONFIG_MAX_CPUS - 1] = 0}; extern int v3_vmx_launch(struct v3_gprs * vm_regs, struct guest_info * info, struct v3_ctrl_regs * ctrl_regs); extern int v3_vmx_resume(struct v3_gprs * vm_regs, struct guest_info * info, struct v3_ctrl_regs * ctrl_regs); @@ -141,9 +140,15 @@ static addr_t allocate_vmcs() { static int init_vmcs_bios(struct guest_info * info, struct vmx_data * vmx_state) { int vmx_ret = 0; + struct vmx_data * vmx_info = (struct vmx_data *)(info->vmm_data); + + // disable global interrupts for vm state initialization + v3_disable_ints(); PrintDebug("Loading VMCS\n"); vmx_ret = vmcs_load(vmx_state->vmcs_ptr_phys); + active_vmcs_ptrs[V3_Get_CPU()] = vmx_info->vmcs_ptr_phys; + vmx_state->state = VMX_UNLAUNCHED; if (vmx_ret != VMX_SUCCESS) { PrintError("VMPTRLD failed\n"); @@ -421,7 +426,12 @@ static int init_vmcs_bios(struct guest_info * info, struct vmx_data * vmx_state) } - vmx_state->state = VMXASSIST_DISABLED; + vmx_state->assist_state = VMXASSIST_DISABLED; + + // reenable global interrupts for vm state initialization now + // that the vm state is initialized. If another VM kicks us off, + // it'll update our vmx state so that we know to reload ourself + v3_disable_ints(); return 0; } @@ -440,6 +450,7 @@ int v3_init_vmx_vmcs(struct guest_info * info, v3_vm_class_t vm_class) { PrintDebug("VMCS pointer: %p\n", (void *)(vmx_state->vmcs_ptr_phys)); info->vmm_data = vmx_state; + vmx_state->state = VMX_UNLAUNCHED; PrintDebug("Initializing VMCS (addr=%p)\n", info->vmm_data); @@ -659,6 +670,7 @@ int v3_vmx_enter(struct guest_info * info) { int ret = 0; uint32_t tsc_offset_low, tsc_offset_high; struct vmx_exit_info exit_info; + struct vmx_data * vmx_info = (struct vmx_data *)(info->vmm_data); // Conditionally yield the CPU if the timeslice has expired v3_yield_cond(info); @@ -697,13 +709,20 @@ int v3_vmx_enter(struct guest_info * info) { check_vmcs_write(VMCS_TSC_OFFSET_HIGH, tsc_offset_high); check_vmcs_write(VMCS_TSC_OFFSET, tsc_offset_low); - if (info->vm_info->run_state == VM_STOPPED) { + if (active_vmcs_ptrs[V3_Get_CPU()] != vmx_info->vmcs_ptr_phys) { + vmcs_load(vmx_info->vmcs_ptr_phys); + active_vmcs_ptrs[V3_Get_CPU()] = vmx_info->vmcs_ptr_phys; + } + + if (vmx_info->state == VMX_UNLAUNCHED) { + vmx_info->state = VMX_LAUNCHED; info->vm_info->run_state = VM_RUNNING; ret = v3_vmx_launch(&(info->vm_regs), info, &(info->ctrl_regs)); } else { + V3_ASSERT(vmx_info->state != VMX_UNLAUNCHED); ret = v3_vmx_resume(&(info->vm_regs), info, &(info->ctrl_regs)); } - + // PrintDebug("VMX Exit: ret=%d\n", ret); if (ret != VMX_SUCCESS) { @@ -750,6 +769,12 @@ int v3_vmx_enter(struct guest_info * info) { update_irq_exit_state(info); #endif + // Handle any exits needed still in the atomic section + if (v3_handle_vmx_exit(info, &exit_info) == -1) { + PrintError("Error in atomic VMX exit handler\n"); + return -1; + } + // reenable global interrupts after vm exit v3_enable_ints(); diff --git a/palacios/src/palacios/vmx_assist.c b/palacios/src/palacios/vmx_assist.c index d836ad2..d59ed0d 100644 --- a/palacios/src/palacios/vmx_assist.c +++ b/palacios/src/palacios/vmx_assist.c @@ -59,7 +59,7 @@ int v3_vmxassist_ctx_switch(struct guest_info * info) { return -1; } - if (vmx_info->state == VMXASSIST_DISABLED) { + if (vmx_info->assist_state == VMXASSIST_DISABLED) { /* Save the old Context */ vmx_save_world_ctx(info, old_ctx); @@ -67,13 +67,13 @@ int v3_vmxassist_ctx_switch(struct guest_info * info) { /* restore new context, vmxassist should launch the bios the first time */ vmx_restore_world_ctx(info, new_ctx); - vmx_info->state = VMXASSIST_ENABLED; + vmx_info->assist_state = VMXASSIST_ENABLED; - } else if (vmx_info->state == VMXASSIST_ENABLED) { + } else if (vmx_info->assist_state == VMXASSIST_ENABLED) { /* restore old context */ vmx_restore_world_ctx(info, old_ctx); - vmx_info->state = VMXASSIST_DISABLED; + vmx_info->assist_state = VMXASSIST_DISABLED; } return 0; diff --git a/palacios/src/palacios/vmx_handler.c b/palacios/src/palacios/vmx_handler.c index 357f0d2..4066bf2 100644 --- a/palacios/src/palacios/vmx_handler.c +++ b/palacios/src/palacios/vmx_handler.c @@ -41,12 +41,27 @@ #include #endif +/* At this point the GPRs are already copied into the guest_info state */ +int v3_handle_atomic_vmx_exit(struct guest_info * info, struct vmx_exit_info * exit_info) { + struct vmx_data * vmx_info = (struct vmx_data *)(info->vmm_data); + switch (exit_info->exit_reason) { + case VMEXIT_INTR_WINDOW: + // This is here because we touch the VMCS + vmcs_read(VMCS_PROC_CTRLS, &(vmx_info->pri_proc_ctrls.value)); + vmx_info->pri_proc_ctrls.int_wndw_exit = 0; + vmcs_write(VMCS_PROC_CTRLS, vmx_info->pri_proc_ctrls.value); + +#ifdef CONFIG_DEBUG_INTERRUPTS + PrintDebug("Interrupts available again! (RIP=%llx)\n", info->rip); +#endif + break; + } + return 0; +} /* At this point the GPRs are already copied into the guest_info state */ int v3_handle_vmx_exit(struct guest_info * info, struct vmx_exit_info * exit_info) { - struct vmx_data * vmx_info = (struct vmx_data *)(info->vmm_data); - /* PrintError("Handling VMEXIT: %s (%u), %lu (0x%lx)\n", v3_vmx_exit_code_to_str(exit_info->exit_reason), @@ -221,15 +236,8 @@ int v3_handle_vmx_exit(struct guest_info * info, struct vmx_exit_info * exit_inf // Interrupts are handled outside switch break; case VMEXIT_INTR_WINDOW: - - vmcs_read(VMCS_PROC_CTRLS, &(vmx_info->pri_proc_ctrls.value)); - vmx_info->pri_proc_ctrls.int_wndw_exit = 0; - vmcs_write(VMCS_PROC_CTRLS, vmx_info->pri_proc_ctrls.value); - -#ifdef CONFIG_DEBUG_INTERRUPTS - PrintDebug("Interrupts available again! (RIP=%llx)\n", info->rip); -#endif - + // This is handled in the atomic part of the vmx code, + // not in the generic (interruptable) vmx handler break; default: PrintError("Unhandled VMEXIT: %s (%u), %lu (0x%lx)\n",