X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx.c;h=eb79fa352c65dce90fcef02facbf41f3470341a8;hb=374b2d6d22a0e0dc6ed8d3d628e635ab935072e0;hp=3334d2f7277db4cbaed754e927c4fb9306185023;hpb=46113012016d5064ca8617dbb39f04c9763fd911;p=palacios.git diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c index 3334d2f..eb79fa3 100644 --- a/palacios/src/palacios/vmx.c +++ b/palacios/src/palacios/vmx.c @@ -28,15 +28,22 @@ #include #include #include +#include #include #include #include #include -static addr_t host_vmcs_ptrs[CONFIG_MAX_CPUS] = { [0 ... CONFIG_MAX_CPUS - 1] = 0}; +#ifndef CONFIG_DEBUG_VMX +#undef PrintDebug +#define PrintDebug(fmt, args...) +#endif +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); @@ -65,51 +72,8 @@ static int inline check_vmcs_read(vmcs_field_t field, void * val) { return ret; } -#if 0 -// For the 32 bit reserved bit fields -// MB1s are in the low 32 bits, MBZs are in the high 32 bits of the MSR -static uint32_t sanitize_bits1(uint32_t msr_num, uint32_t val) { - v3_msr_t mask_msr; - - PrintDebug("sanitize_bits1 (MSR:%x)\n", msr_num); - - v3_get_msr(msr_num, &mask_msr.hi, &mask_msr.lo); - - PrintDebug("MSR %x = %x : %x \n", msr_num, mask_msr.hi, mask_msr.lo); - - val |= mask_msr.lo; - val |= mask_msr.hi; - - return val; -} - - - -static addr_t sanitize_bits2(uint32_t msr_num0, uint32_t msr_num1, addr_t val) { - v3_msr_t msr0, msr1; - addr_t msr0_val, msr1_val; - - PrintDebug("sanitize_bits2 (MSR0=%x, MSR1=%x)\n", msr_num0, msr_num1); - - v3_get_msr(msr_num0, &msr0.hi, &msr0.lo); - v3_get_msr(msr_num1, &msr1.hi, &msr1.lo); - - // This generates a mask that is the natural bit width of the CPU - msr0_val = msr0.value; - msr1_val = msr1.value; - - PrintDebug("MSR %x = %p, %x = %p \n", msr_num0, (void*)msr0_val, msr_num1, (void*)msr1_val); - - val |= msr0_val; - val |= msr1_val; - - return val; -} - -#endif - static addr_t allocate_vmcs() { reg_ex_t msr; @@ -133,9 +97,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"); @@ -218,6 +188,10 @@ static int init_vmcs_bios(struct guest_info * info, struct vmx_data * vmx_state) vmx_state->pri_proc_ctrls.invlpg_exit = 1; vmx_state->pri_proc_ctrls.use_msr_bitmap = 1; vmx_state->pri_proc_ctrls.pause_exit = 1; + vmx_state->pri_proc_ctrls.tsc_offset = 1; +#ifdef CONFIG_TIME_VIRTUALIZE_TSC + vmx_state->pri_proc_ctrls.rdtsc_exit = 1; +#endif vmx_ret |= check_vmcs_write(VMCS_IO_BITMAP_A_ADDR, (addr_t)V3_PAddr(info->vm_info->io_map.arch_data)); vmx_ret |= check_vmcs_write(VMCS_IO_BITMAP_B_ADDR, @@ -341,7 +315,7 @@ static int init_vmcs_bios(struct guest_info * info, struct vmx_data * vmx_state) #define VMXASSIST_GDT 0x10000 addr_t vmxassist_gdt = 0; - if (guest_pa_to_host_va(info, VMXASSIST_GDT, &vmxassist_gdt) == -1) { + if (v3_gpa_to_hva(info, VMXASSIST_GDT, &vmxassist_gdt) == -1) { PrintError("Could not find VMXASSIST GDT destination\n"); return -1; } @@ -375,7 +349,7 @@ static int init_vmcs_bios(struct guest_info * info, struct vmx_data * vmx_state) extern uint8_t v3_vmxassist_end[]; addr_t vmxassist_dst = 0; - if (guest_pa_to_host_va(info, VMXASSIST_START, &vmxassist_dst) == -1) { + if (v3_gpa_to_hva(info, VMXASSIST_START, &vmxassist_dst) == -1) { PrintError("Could not find VMXASSIST destination\n"); return -1; } @@ -391,8 +365,12 @@ static int init_vmcs_bios(struct guest_info * info, struct vmx_data * vmx_state) info->dbg_regs.dr7 = 0x400; +#ifdef __V3_64BIT__ vmx_ret |= check_vmcs_write(VMCS_LINK_PTR, (addr_t)0xffffffffffffffffULL); - +#else + vmx_ret |= check_vmcs_write(VMCS_LINK_PTR, (addr_t)0xffffffffUL); + vmx_ret |= check_vmcs_write(VMCS_LINK_PTR_HIGH, (addr_t)0xffffffffUL); +#endif if (v3_update_vmcs_ctrl_fields(info)) { PrintError("Could not write control fields!\n"); @@ -405,7 +383,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; } @@ -424,6 +407,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); @@ -448,6 +432,18 @@ int v3_init_vmx_vmcs(struct guest_info * info, v3_vm_class_t vm_class) { return 0; } + +int v3_deinit_vmx_vmcs(struct guest_info * core) { + struct vmx_data * vmx_state = core->vmm_data; + + V3_FreePages((void *)(vmx_state->vmcs_ptr_phys), 1); + + V3_Free(vmx_state); + + return 0; +} + + static int update_irq_exit_state(struct guest_info * info) { struct vmx_exit_idt_vec_info idt_vec_info; @@ -629,14 +625,18 @@ static void print_exit_log(struct guest_info * info) { */ int v3_vmx_enter(struct guest_info * info) { int ret = 0; - uint64_t tmp_tsc = 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); + // Perform any additional yielding needed for time adjustment + v3_adjust_time(info); - // v3_print_guest_state(info); + // Update timer devices prior to entering VM. + v3_update_timers(info); // disable global interrupts for vm state transition v3_disable_ints(); @@ -658,19 +658,28 @@ int v3_vmx_enter(struct guest_info * info) { vmcs_write(VMCS_GUEST_CR3, guest_cr3); } - // We do timer injection here to track real host time. - rdtscll(tmp_tsc); - v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc - info->time_state.cached_hlt_tsc); - info->time_state.cached_hlt_tsc = 0; - rdtscll(info->time_state.cached_host_tsc); + // Perform last-minute time bookkeeping prior to entering the VM + v3_time_enter_vm(info); + + tsc_offset_high = (uint32_t)((v3_tsc_host_offset(&info->time_state) >> 32) & 0xffffffff); + tsc_offset_low = (uint32_t)(v3_tsc_host_offset(&info->time_state) & 0xffffffff); + check_vmcs_write(VMCS_TSC_OFFSET_HIGH, tsc_offset_high); + check_vmcs_write(VMCS_TSC_OFFSET, tsc_offset_low); + + 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 (info->vm_info->run_state == VM_STOPPED) { + 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) { @@ -682,12 +691,11 @@ int v3_vmx_enter(struct guest_info * info) { return -1; } - // rdtscll(tmp_tsc); - // v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc); + // Immediate exit from VM time bookkeeping + v3_time_exit_vm(info); info->num_exits++; - /* Update guest state */ v3_vmx_save_vmcs(info); @@ -718,6 +726,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_atomic_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(); @@ -733,21 +747,54 @@ int v3_vmx_enter(struct guest_info * info) { } -int v3_start_vmx_guest(struct guest_info* info) { +int v3_start_vmx_guest(struct guest_info * info) { + + PrintDebug("Starting VMX core %u\n", info->cpu_id); + + if (info->cpu_id == 0) { + info->core_run_state = CORE_RUNNING; + info->vm_info->run_state = VM_RUNNING; + } else { + + PrintDebug("VMX core %u: Waiting for core initialization\n", info->cpu_id); + while (info->core_run_state == CORE_STOPPED) { + v3_yield(info); + //PrintDebug("VMX core %u: still waiting for INIT\n",info->cpu_id); + } + + PrintDebug("VMX core %u initialized\n", info->cpu_id); + } - PrintDebug("Launching VMX guest\n"); - rdtscll(info->time_state.cached_host_tsc); + PrintDebug("VMX core %u: I am starting at CS=0x%x (base=0x%p, limit=0x%x), RIP=0x%p\n", + info->cpu_id, info->segments.cs.selector, (void *)(info->segments.cs.base), + info->segments.cs.limit, (void *)(info->rip)); + PrintDebug("VMX core %u: Launching VMX VM\n", info->cpu_id); + + v3_start_time(info); + while (1) { + + if (info->vm_info->run_state == VM_STOPPED) { + info->core_run_state = CORE_STOPPED; + break; + } + if (v3_vmx_enter(info) == -1) { v3_print_vmcs(); print_exit_log(info); return -1; } + + + if (info->vm_info->run_state == VM_STOPPED) { + info->core_run_state = CORE_STOPPED; + break; + } /* if ((info->num_exits % 5000) == 0) { V3_Print("VMX Exit number %d\n", (uint32_t)info->num_exits); @@ -797,7 +844,8 @@ void v3_init_vmx_cpu(int cpu_id) { struct v3_msr tmp_msr; uint64_t ret = 0; - v3_get_msr(VMX_CR4_FIXED0_MSR,&(tmp_msr.hi),&(tmp_msr.lo)); + v3_get_msr(VMX_CR4_FIXED0_MSR, &(tmp_msr.hi), &(tmp_msr.lo)); + #ifdef __V3_64BIT__ __asm__ __volatile__ ( "movq %%cr4, %%rbx;" @@ -884,3 +932,9 @@ void v3_init_vmx_cpu(int cpu_id) { } + +void v3_deinit_vmx_cpu(int cpu_id) { + extern v3_cpu_arch_t v3_cpu_types[]; + v3_cpu_types[cpu_id] = V3_INVALID_CPU; + V3_FreePages((void *)host_vmcs_ptrs[cpu_id], 1); +}