X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmx.c;h=20c0c5f9ac3e56f6abe648cde0047f5c677ed3e6;hb=51e81a720ed4c05dba61e9475a310d88f4f32e40;hp=5aec9d5b8f3c52ec42fa9629a42001b4a239b72b;hpb=ad78e7627af59b2ebbfebdd05b479a021174efe4;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index 5aec9d5..20c0c5f 100644
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -47,7 +47,6 @@ static struct vmx_hw_info hw_info;
 
 extern v3_cpu_arch_t v3_cpu_types[];
 
-static addr_t active_vmcs_ptrs[V3_CONFIG_MAX_CPUS] = { [0 ... V3_CONFIG_MAX_CPUS - 1] = 0};
 static addr_t host_vmcs_ptrs[V3_CONFIG_MAX_CPUS] = { [0 ... V3_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);
@@ -106,7 +105,6 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state)
 
     PrintDebug("Loading VMCS\n");
     vmx_ret = vmcs_load(vmx_state->vmcs_ptr_phys);
-    active_vmcs_ptrs[V3_Get_CPU()] = vmx_state->vmcs_ptr_phys;
     vmx_state->state = VMX_UNLAUNCHED;
 
     if (vmx_ret != VMX_SUCCESS) {
@@ -214,23 +212,25 @@ static int init_vmcs_bios(struct guest_info * core, struct vmx_data * vmx_state)
 
 
 #ifdef __V3_64BIT__
+    // Ensure host runs in 64-bit mode at each VM EXIT
     vmx_state->exit_ctrls.host_64_on = 1;
 #endif
 
-
-    /* Not sure how exactly to handle this... */
+    // Hook all accesses to EFER register
     v3_hook_msr(core->vm_info, EFER_MSR, 
 		&v3_handle_efer_read,
 		&v3_handle_efer_write, 
 		core);
 
-    // Or is it this??? 
-    vmx_state->entry_ctrls.ld_efer = 1;
+    // Restore host's EFER register on each VM EXIT
     vmx_state->exit_ctrls.ld_efer = 1;
+
+    // Save/restore guest's EFER register to/from VMCS on VM EXIT/ENTRY
     vmx_state->exit_ctrls.save_efer = 1;
-    /*   ***   */
+    vmx_state->entry_ctrls.ld_efer  = 1;
 
-    vmx_ret |= check_vmcs_write(VMCS_CR4_MASK, CR4_VMXE);
+    // Cause VM_EXIT whenever CR4.VMXE or CR4.PAE bits are written
+    vmx_ret |= check_vmcs_write(VMCS_CR4_MASK, CR4_VMXE | CR4_PAE);
 
 
     /* Setup paging */
@@ -538,6 +538,9 @@ int v3_init_vmx_vmcs(struct guest_info * core, v3_vm_class_t vm_class) {
 	return -1;
     }
 
+    PrintDebug("Serializing VMCS: %p\n", (void *)vmx_state->vmcs_ptr_phys);
+    vmx_ret = vmcs_clear(vmx_state->vmcs_ptr_phys);
+
     return 0;
 }
 
@@ -745,19 +748,19 @@ int v3_vmx_enter(struct guest_info * info) {
     // Perform any additional yielding needed for time adjustment
     v3_adjust_time(info);
 
-    // Update timer devices prior to entering VM.
-    v3_update_timers(info);
-
     // disable global interrupts for vm state transition
     v3_disable_ints();
 
+    // Update timer devices late after being in the VM so that as much 
+    // of hte time in the VM is accounted for as possible. Also do it before
+    // updating IRQ entry state so that any interrupts the timers raise get 
+    // handled on the next VM entry. Must be done with interrupts disabled.
+    v3_update_timers(info);
 
-    if (active_vmcs_ptrs[V3_Get_CPU()] != vmx_info->vmcs_ptr_phys) {
+    if (vmcs_store() != vmx_info->vmcs_ptr_phys) {
 	vmcs_load(vmx_info->vmcs_ptr_phys);
-	active_vmcs_ptrs[V3_Get_CPU()] = vmx_info->vmcs_ptr_phys;
     }
 
-
     v3_vmx_restore_vmcs(info);
 
 
@@ -842,7 +845,6 @@ int v3_vmx_enter(struct guest_info * info) {
 
     exit_log[info->num_exits % 10] = exit_info;
 
-
 #ifdef V3_CONFIG_SYMCALL
     if (info->sym_core_state.symcall_state.sym_call_active == 0) {
 	update_irq_exit_state(info);
@@ -970,7 +972,7 @@ int v3_is_vmx_capable() {
 }
 
 
-int v3_reset_vmx_cpu(struct guest_info * core, addr_t rip) {
+int v3_reset_vmx_vm_core(struct guest_info * core, addr_t rip) {
     // init vmcs bios
     
     if ((core->shdw_pg_mode == NESTED_PAGING) &&