X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx.c;h=3417767192ca41bcc1b403f18952535cc700c6ae;hb=862392a8cadf9e2a2fa0e395bb33835356ad0f36;hp=4c37ddf4d2ecd7318e1707e5021f59ee067fc159;hpb=ee1279646a778613b23a42350b903ebb57c068f8;p=palacios.git diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c index 4c37ddf..3417767 100644 --- a/palacios/src/palacios/vmx.c +++ b/palacios/src/palacios/vmx.c @@ -33,6 +33,13 @@ #include #include + +#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}; @@ -218,6 +225,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 +352,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 +386,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 +402,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"); @@ -494,7 +509,7 @@ static int update_irq_entry_state(struct guest_info * info) { int_info.valid = 1; #ifdef CONFIG_DEBUG_INTERRUPTS - PrintDebug("Injecting exception %d (EIP=%p)\n", int_info.vector, (void *)info->rip); + PrintDebug("Injecting exception %d (EIP=%p)\n", int_info.vector, (void *)(addr_t)info->rip); #endif check_vmcs_write(VMCS_ENTRY_INT_INFO, int_info.value); @@ -536,7 +551,7 @@ static int update_irq_entry_state(struct guest_info * info) { PrintDebug("Injecting Interrupt %d at exit %u(EIP=%p)\n", info->intr_core_state.irq_vector, (uint32_t)info->num_exits, - (void *)info->rip); + (void *)(addr_t)info->rip); #endif check_vmcs_write(VMCS_ENTRY_INT_INFO, ent_int.value); @@ -629,13 +644,12 @@ 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; // Conditionally yield the CPU if the timeslice has expired v3_yield_cond(info); - // v3_print_guest_state(info); // disable global interrupts for vm state transition @@ -658,7 +672,16 @@ int v3_vmx_enter(struct guest_info * info) { vmcs_write(VMCS_GUEST_CR3, guest_cr3); } - rdtscll(info->time_state.cached_host_tsc); + v3_update_timers(info); + + /* If this guest is frequency-lagged behind host time, wait + * for the appropriate host time before resuming the guest. */ + v3_adjust_time(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 (info->vm_info->run_state == VM_STOPPED) { info->vm_info->run_state = VM_RUNNING; @@ -678,12 +701,8 @@ int v3_vmx_enter(struct guest_info * info) { return -1; } - rdtscll(tmp_tsc); - info->num_exits++; - v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc); - /* Update guest state */ v3_vmx_save_vmcs(info); @@ -729,13 +748,34 @@ 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("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("Launching VMX guest\n"); - rdtscll(info->time_state.cached_host_tsc); + PrintDebug("VMX core %u: Launching VMX VM\n", info->cpu_id); + v3_start_time(info); while (1) { if (v3_vmx_enter(info) == -1) { @@ -825,9 +865,9 @@ void v3_init_vmx_cpu(int cpu_id) { ); #elif __V3_32BIT__ __asm__ __volatile__ ( - "movq %%cr4, %%ecx;" - "orq $0x00002000, %%ecx;" - "movq %%ecx, %0;" + "movl %%cr4, %%ecx;" + "orl $0x00002000, %%ecx;" + "movl %%ecx, %0;" : "=m"(ret) : : "%ecx" @@ -835,7 +875,7 @@ void v3_init_vmx_cpu(int cpu_id) { if ((~ret & tmp_msr.value) == 0) { __asm__ __volatile__ ( - "movq %0, %%cr4;" + "movl %0, %%cr4;" : : "q"(ret) ); @@ -845,9 +885,9 @@ void v3_init_vmx_cpu(int cpu_id) { } __asm__ __volatile__ ( - "movq %%cr0, %%ecx; " - "orq $0x00000020,%%ecx; " - "movq %%ecx, %%cr0;" + "movl %%cr0, %%ecx; " + "orl $0x00000020,%%ecx; " + "movl %%ecx, %%cr0;" : : : "%ecx"