X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=4b9083b141122111de14eb55dd95b913de94dac7;hb=a9a6c3664c8fdbdb9841a55d1a2fca7f4fa8f5de;hp=ab26a6f1af40001aa9f7efa0264e123f8c736aec;hpb=fcc9962fe5d3b877f8f25de8745d0d4d1eaf394e;p=palacios.git diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index ab26a6f..4b9083b 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -26,35 +26,36 @@ #include #include -#ifdef CONFIG_SVM +#ifdef V3_CONFIG_SVM #include #endif -#ifdef CONFIG_VMX +#ifdef V3_CONFIG_VMX #include #endif -#ifdef CONFIG_VNET -#include +#ifdef V3_CONFIG_CHECKPOINT +#include #endif -v3_cpu_arch_t v3_cpu_types[CONFIG_MAX_CPUS]; +v3_cpu_arch_t v3_cpu_types[V3_CONFIG_MAX_CPUS]; struct v3_os_hooks * os_hooks = NULL; int v3_dbg_enable = 0; + static void init_cpu(void * arg) { uint32_t cpu_id = (uint32_t)(addr_t)arg; -#ifdef CONFIG_SVM +#ifdef V3_CONFIG_SVM if (v3_is_svm_capable()) { PrintDebug("Machine is SVM Capable\n"); v3_init_svm_cpu(cpu_id); } else #endif -#ifdef CONFIG_VMX +#ifdef V3_CONFIG_VMX if (v3_is_vmx_capable()) { PrintDebug("Machine is VMX Capable\n"); v3_init_vmx_cpu(cpu_id); @@ -72,14 +73,14 @@ static void deinit_cpu(void * arg) { switch (v3_cpu_types[cpu_id]) { -#ifdef CONFIG_SVM +#ifdef V3_CONFIG_SVM case V3_SVM_CPU: case V3_SVM_REV3_CPU: PrintDebug("Deinitializing SVM CPU %d\n", cpu_id); v3_deinit_svm_cpu(cpu_id); break; #endif -#ifdef CONFIG_VMX +#ifdef V3_CONFIG_VMX case V3_VMX_CPU: case V3_VMX_EPT_CPU: case V3_VMX_EPT_UG_CPU: @@ -104,7 +105,7 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { // Set global variables. os_hooks = hooks; - for (i = 0; i < CONFIG_MAX_CPUS; i++) { + for (i = 0; i < V3_CONFIG_MAX_CPUS; i++) { v3_cpu_types[i] = V3_INVALID_CPU; } @@ -118,17 +119,17 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { V3_init_extensions(); -#ifdef CONFIG_SYMMOD +#ifdef V3_CONFIG_SYMMOD V3_init_symmod(); #endif - -#ifdef CONFIG_VNET - v3_init_vnet(); +#ifdef V3_CONFIG_CHECKPOINT + V3_init_checkpoint(); #endif -#ifdef CONFIG_MULTITHREAD_OS + +#ifdef V3_CONFIG_MULTITHREAD_OS if ((hooks) && (hooks->call_on_cpu)) { for (i = 0; i < num_cpus; i++) { @@ -152,20 +153,21 @@ void Shutdown_V3() { V3_deinit_extensions(); -#ifdef CONFIG_SYMMOD +#ifdef V3_CONFIG_SYMMOD V3_deinit_symmod(); #endif - -#ifdef CONFIG_VNET - v3_deinit_vnet(); +#ifdef V3_CONFIG_CHECKPOINT + V3_deinit_checkpoint(); #endif -#ifdef CONFIG_MULTITHREAD_OS + +#ifdef V3_CONFIG_MULTITHREAD_OS if ((os_hooks) && (os_hooks->call_on_cpu)) { - for (i = 0; i < CONFIG_MAX_CPUS; i++) { + 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); } } } @@ -204,22 +206,24 @@ struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name) { } + + static int start_core(void * p) { struct guest_info * core = (struct guest_info *)p; - PrintDebug("virtual core %u: in start_core (RIP=%p)\n", - core->cpu_id, (void *)(addr_t)core->rip); + PrintDebug("virtual core %u (on logical core %u): in start_core (RIP=%p)\n", + core->vcpu_id, core->pcpu_id, (void *)(addr_t)core->rip); switch (v3_cpu_types[0]) { -#ifdef CONFIG_SVM +#ifdef V3_CONFIG_SVM case V3_SVM_CPU: case V3_SVM_REV3_CPU: return v3_start_svm_guest(core); break; #endif -#if CONFIG_VMX +#if V3_CONFIG_VMX case V3_VMX_CPU: case V3_VMX_EPT_CPU: case V3_VMX_EPT_UG_CPU: @@ -236,7 +240,7 @@ static int start_core(void * p) // For the moment very ugly. Eventually we will shift the cpu_mask to an arbitrary sized type... -#ifdef CONFIG_MULTITHREAD_OS +#ifdef V3_CONFIG_MULTITHREAD_OS #define MAX_CORES 32 #else #define MAX_CORES 1 @@ -272,12 +276,11 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { return -1; } -#ifdef CONFIG_MULTITHREAD_OS +#ifdef V3_CONFIG_MULTITHREAD_OS // spawn off new threads, for other cores 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; @@ -292,7 +295,6 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { i--; // We reset the logical core idx. Not strictly necessary I guess... } else { - /* This assumes that the core 0 thread has been mapped to physical core 0 */ if (i == V3_Get_CPU()) { // We skip the local CPU because it is reserved for vcore 0 continue; @@ -327,9 +329,10 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { core_idx, start_core, core, core->exec_name); // TODO: actually manage these threads instead of just launching them - core_thread = V3_CREATE_THREAD_ON_CPU(core_idx, start_core, core, core->exec_name); + core->pcpu_id = core_idx; + 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; @@ -341,6 +344,8 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { sprintf(vm->cores[0].exec_name, "%s", vm->name); + vm->cores[0].pcpu_id = V3_Get_CPU(); + if (start_core(&(vm->cores[0])) != 0) { PrintError("Error starting VM core 0\n"); v3_stop_vm(vm); @@ -353,6 +358,89 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { } +int v3_reset_vm_core(struct guest_info * core, addr_t rip) { + + switch (v3_cpu_types[core->pcpu_id]) { +#ifdef V3_CONFIG_SVM + case V3_SVM_CPU: + case V3_SVM_REV3_CPU: + PrintDebug("Resetting SVM Guest CPU %d\n", core->vcpu_id); + return v3_reset_svm_vm_core(core, rip); +#endif +#ifdef V3_CONFIG_VMX + case V3_VMX_CPU: + case V3_VMX_EPT_CPU: + case V3_VMX_EPT_UG_CPU: + PrintDebug("Resetting VMX Guest CPU %d\n", core->vcpu_id); + return v3_reset_vmx_vm_core(core, rip); +#endif + case V3_INVALID_CPU: + default: + PrintError("CPU has no virtualization Extensions\n"); + break; + } + + return -1; +} + + + +/* 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) { @@ -384,6 +472,49 @@ int v3_stop_vm(struct v3_vm_info * vm) { } +int v3_pause_vm(struct v3_vm_info * vm) { + + if (vm->run_state != VM_RUNNING) { + PrintError("Tried to pause a VM that was not running\n"); + return -1; + } + + 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_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 + +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; // deinitialize guest (free memory, etc...) @@ -492,7 +623,7 @@ void v3_print_cond(const char * fmt, ...) { } -#ifdef CONFIG_MULTITHREAD_OS +#ifdef V3_CONFIG_MULTITHREAD_OS void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector) { extern struct v3_os_hooks * os_hooks; @@ -507,13 +638,13 @@ void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector) { int v3_vm_enter(struct guest_info * info) { switch (v3_cpu_types[0]) { -#ifdef CONFIG_SVM +#ifdef V3_CONFIG_SVM case V3_SVM_CPU: case V3_SVM_REV3_CPU: return v3_svm_enter(info); break; #endif -#if CONFIG_VMX +#if V3_CONFIG_VMX case V3_VMX_CPU: case V3_VMX_EPT_CPU: case V3_VMX_EPT_UG_CPU: