X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=4b9083b141122111de14eb55dd95b913de94dac7;hb=a9a6c3664c8fdbdb9841a55d1a2fca7f4fa8f5de;hp=0597be115e45f50cc4099c11e40319ca35de2a41;hpb=9a9c14099c09e9ed86d8ac2f73f7406d0ac8a90b;p=palacios.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 0597be1..4b9083b 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -33,6 +33,10 @@
 #include <palacios/vmx.h>
 #endif
 
+#ifdef V3_CONFIG_CHECKPOINT
+#include <palacios/vmm_checkpoint.h>
+#endif
+
 
 v3_cpu_arch_t v3_cpu_types[V3_CONFIG_MAX_CPUS];
 struct v3_os_hooks * os_hooks = NULL;
@@ -119,6 +123,10 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
     V3_init_symmod();
 #endif
 
+#ifdef V3_CONFIG_CHECKPOINT
+    V3_init_checkpoint();
+#endif
+
 
 
 #ifdef V3_CONFIG_MULTITHREAD_OS
@@ -149,12 +157,17 @@ void Shutdown_V3() {
     V3_deinit_symmod();
 #endif
 
+#ifdef V3_CONFIG_CHECKPOINT
+    V3_deinit_checkpoint();
+#endif
+
 
 #ifdef V3_CONFIG_MULTITHREAD_OS
     if ((os_hooks) && (os_hooks->call_on_cpu)) {
 	for (i = 0; i < V3_CONFIG_MAX_CPUS; i++) {
 	    if (v3_cpu_types[i] != V3_INVALID_CPU) {
-		deinit_cpu((void *)(addr_t)i);
+		V3_Call_On_CPU(i, deinit_cpu, (void *)(addr_t)i);
+		//deinit_cpu((void *)(addr_t)i);
 	    }
 	}
     }
@@ -268,7 +281,6 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
     for (i = 0, vcore_id = 1; (i < MAX_CORES) && (vcore_id < vm->num_cores); i++) {
 	int major = 0;
  	int minor = 0;
-	void * core_thread = NULL;
 	struct guest_info * core = &(vm->cores[vcore_id]);
 	char * specified_cpu = v3_cfg_val(core->core_cfg_data, "target_cpu");
 	uint32_t core_idx = 0;
@@ -318,9 +330,9 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
 
 	// TODO: actually manage these threads instead of just launching them
 	core->pcpu_id = core_idx;
-	core_thread = V3_CREATE_THREAD_ON_CPU(core_idx, start_core, core, core->exec_name);
+	core->core_thread = V3_CREATE_THREAD_ON_CPU(core_idx, start_core, core, core->exec_name);
 
-	if (core_thread == NULL) {
+	if (core->core_thread == NULL) {
 	    PrintError("Thread launch failed\n");
 	    v3_stop_vm(vm);
 	    return -1;
@@ -373,6 +385,62 @@ int v3_reset_vm_core(struct guest_info * core, addr_t rip) {
 
 
 
+/* move a virtual core to different physical core */
+int v3_move_vm_core(struct v3_vm_info * vm, int vcore_id, int target_cpu) {
+    struct guest_info * core = NULL;
+
+    if ((vcore_id < 0) || (vcore_id >= vm->num_cores)) {
+	PrintError("Attempted to migrate invalid virtual core (%d)\n", vcore_id);
+	return -1;
+    }
+
+    core = &(vm->cores[vcore_id]);
+
+    if (target_cpu == core->pcpu_id) {
+	PrintError("Attempted to migrate to local core (%d)\n", target_cpu);
+	// well that was pointless
+	return 0;
+    }
+
+    if (core->core_thread == NULL) {
+	PrintError("Attempted to migrate a core without a valid thread context\n");
+	return -1;
+    }
+
+    while (v3_raise_barrier(vm, NULL) == -1);
+
+    V3_Print("Performing Migration from %d to %d\n", core->pcpu_id, target_cpu);
+
+    // Double check that we weren't preemptively migrated
+    if (target_cpu != core->pcpu_id) {    
+
+	V3_Print("Moving Core\n");
+
+	if (V3_MOVE_THREAD_TO_CPU(target_cpu, core->core_thread) != 0) {
+	    PrintError("Failed to move Vcore %d to CPU %d\n", 
+		       core->vcpu_id, target_cpu);
+	    v3_lower_barrier(vm);
+	    return -1;
+	} 
+	
+	/* There will be a benign race window here:
+	   core->pcpu_id will be set to the target core before its fully "migrated"
+	   However the core will NEVER run on the old core again, its just in flight to the new core
+	*/
+	core->pcpu_id = target_cpu;
+
+	V3_Print("core now at %d\n", core->pcpu_id);
+	
+    }
+
+
+
+
+    v3_lower_barrier(vm);
+
+    return 0;
+}
+
 
 
 int v3_stop_vm(struct v3_vm_info * vm) {
@@ -413,22 +481,39 @@ int v3_pause_vm(struct v3_vm_info * vm) {
 
     while (v3_raise_barrier(vm, NULL) == -1);
 
+    vm->run_state = VM_PAUSED;
+
     return 0;
 }
 
 
 int v3_continue_vm(struct v3_vm_info * vm) {
 
-    if (vm->run_state != VM_RUNNING) {
-	PrintError("Tried to continue a VM that was not already running\n");
+    if (vm->run_state != VM_PAUSED) {
+	PrintError("Tried to continue a VM that was not paused\n");
 	return -1;
     }
 
     v3_lower_barrier(vm);
 
+    vm->run_state = VM_RUNNING;
+
     return 0;
 }
 
+#ifdef V3_CONFIG_CHECKPOINT
+#include <palacios/vmm_checkpoint.h>
+
+int v3_save_vm(struct v3_vm_info * vm, char * store, char * url) {
+    return v3_chkpt_save_vm(vm, store, url);
+}
+
+
+int v3_load_vm(struct v3_vm_info * vm, char * store, char * url) {
+    return v3_chkpt_load_vm(vm, store, url);
+}
+#endif
+
 
 int v3_free_vm(struct v3_vm_info * vm) {
     int i = 0;