X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx.c;h=16fc5cd602b7520ae71119b14bbc0607a3204d49;hb=40e3dd3f222e2638dbdae0eadaf505e1f7a82ecc;hp=4c37ddf4d2ecd7318e1707e5021f59ee067fc159;hpb=ee1279646a778613b23a42350b903ebb57c068f8;p=palacios.releases.git

diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index 4c37ddf..16fc5cd 100644
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -33,6 +33,13 @@
 #include <palacios/vmx_io.h>
 #include <palacios/vmx_msr.h>
 
+
+#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,9 @@ 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;
+#ifdef CONFIG_TIME_TSC_OFFSET
+    vmx_state->pri_proc_ctrls.tsc_offset = 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 +351,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 +385,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;
 	}
@@ -494,7 +504,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 +546,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 +639,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,8 +667,19 @@ 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);
+    v3_resume_time(info);
 
+    tsc_offset_high = 
+	(uint32_t)((info->time_state.host_offset >> 32) & 0xffffffff);
+    tsc_offset_low = (uint32_t)(info->time_state.host_offset & 0xffffffff);
+#ifdef CONFIG_TIME_TSC_OFFSET
+    check_vmcs_write(VMCS_TSC_OFFSET_HIGH, tsc_offset_high);
+    check_vmcs_write(VMCS_TSC_OFFSET, tsc_offset_low);
+#endif
+
+    PrintDebug("Stored 0x %x %x into vmcs TSC offset.\n", 
+	       tsc_offset_high, tsc_offset_low);
     if (info->vm_info->run_state == VM_STOPPED) {
 	info->vm_info->run_state = VM_RUNNING;
 	ret = v3_vmx_launch(&(info->vm_regs), info, &(info->ctrl_regs));
@@ -678,12 +698,13 @@ int v3_vmx_enter(struct guest_info * info) {
 	return -1;
     }
 
-    rdtscll(tmp_tsc);
+    v3_pause_time(info);
+#ifdef CONFIG_TIME_MASK_OVERHEAD
+    v3_offset_time(info, -VMX_ENTRY_OVERHEAD);
+#endif
 
     info->num_exits++;
 
-    v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc);
-
     /* Update guest state */
     v3_vmx_save_vmcs(info);
 
@@ -734,8 +755,7 @@ int v3_start_vmx_guest(struct guest_info* info) {
 
     PrintDebug("Launching VMX guest\n");
 
-    rdtscll(info->time_state.cached_host_tsc);
-
+    v3_start_time(info);
 
     while (1) {
 	if (v3_vmx_enter(info) == -1) {
@@ -825,9 +845,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 +855,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 +865,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"