X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=8b4eed596649e70a8009ef7f7dddddbe7bf64b5e;hb=8a3dbb70c29175bad79764a0b2f3961b98138bb2;hp=7e77412a312762589b4aab35cf7ca15e048a0cab;hpb=a8627ddaccf49073eb04286c5ea4767e2903c351;p=palacios.git diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index 7e77412..8b4eed5 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -33,8 +33,8 @@ #include #endif -#ifdef V3_CONFIG_VNET -#include +#ifdef V3_CONFIG_CHECKPOINT +#include #endif @@ -44,6 +44,7 @@ int v3_dbg_enable = 0; + static void init_cpu(void * arg) { uint32_t cpu_id = (uint32_t)(addr_t)arg; @@ -122,13 +123,13 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { V3_init_symmod(); #endif - -#ifdef V3_CONFIG_VNET - v3_init_vnet(); +#ifdef V3_CONFIG_CHECKPOINT + V3_init_checkpoint(); #endif -#ifdef V3_CONFIG_MULTITHREAD_OS + + if ((hooks) && (hooks->call_on_cpu)) { for (i = 0; i < num_cpus; i++) { @@ -137,9 +138,7 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { hooks->call_on_cpu(i, &init_cpu, (void *)(addr_t)i); } } -#else - init_cpu(0); -#endif + } @@ -156,22 +155,19 @@ void Shutdown_V3() { V3_deinit_symmod(); #endif - -#ifdef V3_CONFIG_VNET - v3_deinit_vnet(); +#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); } } } -#else - deinit_cpu(0); -#endif } @@ -204,6 +200,8 @@ 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; @@ -236,11 +234,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 V3_CONFIG_MULTITHREAD_OS #define MAX_CORES 32 -#else -#define MAX_CORES 1 -#endif int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { @@ -272,12 +266,11 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { return -1; } -#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++) { + // Spawn off threads for each core. + // We work backwards, so that core 0 is always started last. + for (i = 0, vcore_id = vm->num_cores - 1; (i < MAX_CORES) && (vcore_id >= 0); 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; @@ -291,19 +284,12 @@ 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 { - - if (i == V3_Get_CPU()) { - // We skip the local CPU because it is reserved for vcore 0 - continue; - } - core_idx = i; } major = core_idx / 8; minor = core_idx % 8; - if ((core_mask[major] & (0x1 << minor)) == 0) { PrintError("Logical CPU %d not available for virtual core %d; not started\n", core_idx, vcore_id); @@ -325,35 +311,116 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { PrintDebug("run: core=%u, func=0x%p, arg=0x%p, name=%s\n", core_idx, start_core, core, core->exec_name); - // 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; } - vcore_id++; + vcore_id--; } + + + return 0; + +} + + +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; +} - 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); +/* 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]); - return 0; + 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"); + + +#ifdef V3_CONFIG_VMX + switch (v3_cpu_types[core->pcpu_id]) { + case V3_VMX_CPU: + case V3_VMX_EPT_CPU: + case V3_VMX_EPT_UG_CPU: + PrintDebug("Flushing VMX Guest CPU %d\n", core->vcpu_id); + V3_Call_On_CPU(core->pcpu_id, (void (*)(void *))v3_flush_vmx_vm_core, (void *)core); + break; + default: + break; + } +#endif + + 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; +} @@ -386,6 +453,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...) @@ -453,11 +563,10 @@ void v3_yield_cond(struct guest_info * info) { cur_cycle = v3_get_host_time(&info->time_state); if (cur_cycle > (info->yield_start_cycle + info->vm_info->yield_cycle_period)) { - - /* - PrintDebug("Conditional Yield (cur_cyle=%p, start_cycle=%p, period=%p)\n", - (void *)cur_cycle, (void *)info->yield_start_cycle, (void *)info->yield_cycle_period); - */ + //PrintDebug("Conditional Yield (cur_cyle=%p, start_cycle=%p, period=%p)\n", + // (void *)cur_cycle, (void *)info->yield_start_cycle, + // (void *)info->yield_cycle_period); + V3_Yield(); info->yield_start_cycle = v3_get_host_time(&info->time_state); } @@ -494,7 +603,6 @@ void v3_print_cond(const char * fmt, ...) { } -#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; @@ -503,7 +611,6 @@ void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector) { (os_hooks)->interrupt_cpu(vm, logical_cpu, vector); } } -#endif