Added updated sleep/wakeup functionality

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

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 30fa2e6..de77277 100644 (file)
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -256,13 +256,27 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
     int vcore_id = 0;
 
 
-    if (vm->run_state == VM_RUNNING ||
-        vm->run_state == VM_INVALID ||
-        vm->run_state == VM_ERROR) {
+    if (vm->run_state != VM_STOPPED) {
         PrintError("VM has already been launched (state=%d)\n", (int)vm->run_state);
         return -1;
     }
 
+    
+    // Do not run if any core is using shadow paging and we are out of 4 GB bounds
+    for (i=0;i<vm->num_cores;i++) { 
+       if (vm->cores[i].shdw_pg_mode == SHADOW_PAGING) {
+           if ((vm->mem_map.base_region.host_addr + vm->mem_size ) >= 0x100000000ULL) {
+               PrintError("Base memory region exceeds 4 GB boundary with shadow paging enabled on core %d.\n",i);
+               PrintError("Any use of non-64 bit mode in the guest is likely to fail in this configuration.\n");
+               PrintError("If you would like to proceed anyway, remove this check and recompile Palacios.\n");
+               PrintError("Alternatively, change this VM to use nested paging.\n");
+               return -1;
+           }
+       }
+    }
+
+
+
     /// CHECK IF WE ARE MULTICORE ENABLED....
 
     V3_Print("V3 --  Starting VM (%u cores)\n", vm->num_cores);
@@ -459,6 +473,12 @@ int v3_move_vm_core(struct v3_vm_info * vm, int vcore_id, int target_cpu) {
 
 int v3_stop_vm(struct v3_vm_info * vm) {
 
+    if ((vm->run_state != VM_RUNNING) && 
+       (vm->run_state != VM_SIMULATING)) {
+       PrintError("Tried to stop VM in invalid runstate (%d)\n", vm->run_state);
+       return -1;
+    }
+
     vm->run_state = VM_STOPPED;
 
     // Sanity check to catch any weird execution states
@@ -482,7 +502,7 @@ int v3_stop_vm(struct v3_vm_info * vm) {
            break;
        }
 
-       v3_yield(NULL);
+       v3_yield(NULL,-1);
     }
     
     V3_Print("VM stopped. Returning\n");
@@ -530,7 +550,7 @@ static int sim_callback(struct guest_info * core, void * private_data) {
     V3_Print("Simulation callback activated (guest_rip=%p)\n", (void *)core->rip);
 
     while (v3_bitmap_check(timeout_map, core->vcpu_id) == 1) {
-       v3_yield(NULL);
+       v3_yield(NULL,-1);
     }
 
     return 0;
@@ -601,7 +621,7 @@ int v3_simulate_vm(struct v3_vm_info * vm, unsigned int msecs) {
            break;
        }
 
-       v3_yield(NULL);
+       v3_yield(NULL,-1);
     }
 
 
@@ -632,6 +652,18 @@ int v3_save_vm(struct v3_vm_info * vm, char * store, char * url) {
 int v3_load_vm(struct v3_vm_info * vm, char * store, char * url) {
     return v3_chkpt_load_vm(vm, store, url);
 }
+
+#ifdef V3_CONFIG_LIVE_MIGRATION
+int v3_send_vm(struct v3_vm_info * vm, char * store, char * url) {
+    return v3_chkpt_send_vm(vm, store, url);
+}
+
+
+int v3_receive_vm(struct v3_vm_info * vm, char * store, char * url) {
+    return v3_chkpt_receive_vm(vm, store, url);
+}
+#endif
+
 #endif
 
 
@@ -639,6 +671,12 @@ int v3_free_vm(struct v3_vm_info * vm) {
     int i = 0;
     // deinitialize guest (free memory, etc...)
 
+    if ((vm->run_state != VM_STOPPED) &&
+       (vm->run_state != VM_ERROR)) {
+       PrintError("Tried to Free VM in invalid runstate (%d)\n", vm->run_state);
+       return -1;
+    }
+
     v3_free_vm_devices(vm);
 
     // free cores
@@ -690,7 +728,7 @@ v3_cpu_mode_t v3_get_host_cpu_mode() {
 
 
 
-void v3_yield_cond(struct guest_info * info) {
+void v3_yield_cond(struct guest_info * info, int usec) {
     uint64_t cur_cycle;
     cur_cycle = v3_get_host_time(&info->time_state);
 
@@ -699,19 +737,31 @@ void v3_yield_cond(struct guest_info * info) {
        //           (void *)cur_cycle, (void *)info->yield_start_cycle, 
        //         (void *)info->yield_cycle_period);
        
-       V3_Yield();
+       if (usec < 0) { 
+           V3_Yield();
+       } else {
+           V3_Sleep(usec);
+       }
+
         info->yield_start_cycle +=  info->vm_info->yield_cycle_period;
     }
 }
-
+ 
 
 /* 
  * unconditional cpu yield 
  * if the yielding thread is a guest context, the guest quantum is reset on resumption 
  * Non guest context threads should call this function with a NULL argument
- */
-void v3_yield(struct guest_info * info) {
-    V3_Yield();
+ *
+ * usec <0  => the non-timed yield is used
+ * usec >=0 => the timed yield is used, which also usually implies interruptible
+ */ 
+void v3_yield(struct guest_info * info, int usec) {
+    if (usec < 0) { 
+       V3_Yield();
+    } else {
+       V3_Sleep(usec);
+    }
 
     if (info) {
         info->yield_start_cycle +=  info->vm_info->yield_cycle_period;
@@ -719,18 +769,6 @@ void v3_yield(struct guest_info * info) {
 }
 
 
-/*
- * unconditional cpu yield for a period of time
- * Otherwise identical to v3_yield
- */
-void v3_yield_timed(struct guest_info *info, unsigned int usec)
-{
-    V3_Yield_Timed(usec);
-    
-    if (info) { 
-       info->yield_start_cycle += info->vm_info->yield_cycle_period;
-    }
-}
 
 
 void v3_print_cond(const char * fmt, ...) {