Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio...

[palacios.git] / palacios / src / palacios / vmx.c

diff --git a/palacios/src/palacios/vmx.c b/palacios/src/palacios/vmx.c
index e2e6d4b..03dab64 100644 (file)
--- a/palacios/src/palacios/vmx.c
+++ b/palacios/src/palacios/vmx.c
@@ -786,6 +786,31 @@ 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);
 
+
+    /* determine if we need to move to a different physical core */
+    if(info->core_move_state == CORE_MOVE_PENDING) {
+       vmcs_clear(vmx_info->vmcs_ptr_phys);
+       
+       v3_enable_ints();
+
+       if(V3_MOVE_THREAD_TO_CPU(info->target_pcpu_id, info->core_thread) != 0){
+           PrintError("Failed to move vcore %d to CPU %d\n", info->vcpu_id, info->target_pcpu_id);
+       } else {
+           info->pcpu_id = info->target_pcpu_id;
+           PrintDebug("Core move done, vcore %d is running on CPU %d now\n", info->vcpu_id, V3_Get_CPU());
+       }
+
+       /* disable global interrupts, 
+        *  NOTE now it is being running on a different CPU 
+        */
+       v3_disable_ints();
+
+       vmcs_load(vmx_info->vmcs_ptr_phys);
+       vmx_info->state = VMX_UNLAUNCHED;
+       info->core_move_state= CORE_MOVE_DONE;
+    }
+       
+
     if (v3_update_vmcs_host_state(info)) {
        v3_enable_ints();
         PrintError("Could not write host state\n");
@@ -993,6 +1018,7 @@ int v3_reset_vmx_vm_core(struct guest_info * core, addr_t rip) {
 
 
 void v3_init_vmx_cpu(int cpu_id) {
+    addr_t vmx_on_region = 0;
 
     if (cpu_id == 0) {
        if (v3_init_vmx_hw(&hw_info) == -1) {
@@ -1005,17 +1031,18 @@ void v3_init_vmx_cpu(int cpu_id) {
 
 
     // Setup VMXON Region
-    host_vmcs_ptrs[cpu_id] = allocate_vmcs();
+    vmx_on_region = allocate_vmcs();
 
-    PrintDebug("VMXON pointer: 0x%p\n", (void *)host_vmcs_ptrs[cpu_id]);
 
-    if (vmx_on(host_vmcs_ptrs[cpu_id]) == VMX_SUCCESS) {
+    if (vmx_on(vmx_on_region) == VMX_SUCCESS) {
         V3_Print("VMX Enabled\n");
+       host_vmcs_ptrs[cpu_id] = vmx_on_region;
     } else {
-        PrintError("VMX initialization failure\n");
-        return;
+        V3_Print("VMX already enabled\n");
+       V3_FreePages((void *)vmx_on_region, 1);
     }
-    
+
+    PrintDebug("VMXON pointer: 0x%p\n", (void *)host_vmcs_ptrs[cpu_id]);    
 
     {
        struct vmx_sec_proc_ctrls sec_proc_ctrls;
@@ -1038,5 +1065,16 @@ 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);
+
+    if (host_vmcs_ptrs[cpu_id] != 0) {
+       V3_Print("Disabling VMX\n");
+
+       if (vmx_off() != VMX_SUCCESS) {
+           PrintError("Error executing VMXOFF\n");
+       }
+
+       V3_FreePages((void *)host_vmcs_ptrs[cpu_id], 1);
+
+       host_vmcs_ptrs[cpu_id] = 0;
+    }
 }