X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=8b4eed596649e70a8009ef7f7dddddbe7bf64b5e;hb=8a3dbb70c29175bad79764a0b2f3961b98138bb2;hp=938105e56eb18242ff23b05e6ff7a99ab19145fa;hpb=07a12ade201ee7c2fe2358084ca079d2facac500;p=palacios.git diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index 938105e..8b4eed5 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -21,41 +21,41 @@ #include #include #include -#include #include #include #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); @@ -63,7 +63,35 @@ static void init_cpu(void * arg) { } else #endif { - PrintError("CPU has no virtualizationExtensions\n"); + PrintError("CPU has no virtualization Extensions\n"); + } +} + + +static void deinit_cpu(void * arg) { + uint32_t cpu_id = (uint32_t)(addr_t)arg; + + + switch (v3_cpu_types[cpu_id]) { +#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 V3_CONFIG_VMX + case V3_VMX_CPU: + case V3_VMX_EPT_CPU: + case V3_VMX_EPT_UG_CPU: + PrintDebug("Deinitializing VMX CPU %d\n", cpu_id); + v3_deinit_vmx_cpu(cpu_id); + break; +#endif + case V3_INVALID_CPU: + default: + PrintError("CPU has no virtualization Extensions\n"); + break; } } @@ -77,32 +105,31 @@ 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; } // Register all the possible device types - v3_init_devices(); + V3_init_devices(); // Register all shadow paging handlers V3_init_shdw_paging(); + // Register all extensions + V3_init_extensions(); + -#ifdef CONFIG_SYMMOD +#ifdef V3_CONFIG_SYMMOD V3_init_symmod(); #endif -#ifdef CONFIG_INSTRUMENT_VMM - v3_init_instrumentation(); +#ifdef V3_CONFIG_CHECKPOINT + V3_init_checkpoint(); #endif -#ifdef CONFIG_VNET - V3_init_vnet(); -#endif -#ifdef CONFIG_MULTITHREAD_OS if ((hooks) && (hooks->call_on_cpu)) { for (i = 0; i < num_cpus; i++) { @@ -111,10 +138,37 @@ 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); + + +} + + +void Shutdown_V3() { + int i; + + V3_deinit_devices(); + V3_deinit_shdw_paging(); + + V3_deinit_extensions(); + +#ifdef V3_CONFIG_SYMMOD + V3_deinit_symmod(); #endif +#ifdef V3_CONFIG_CHECKPOINT + V3_deinit_checkpoint(); +#endif + + + 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) { + V3_Call_On_CPU(i, deinit_cpu, (void *)(addr_t)i); + //deinit_cpu((void *)(addr_t)i); + } + } + } + } @@ -123,42 +177,50 @@ v3_cpu_arch_t v3_get_cpu_type(int cpu_id) { } -struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data) { - struct v3_vm_info * vm = v3_config_guest(cfg); - - V3_Print("CORE 0 RIP=%p\n", (void *)(addr_t)(vm->cores[0].rip)); +struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name) { + struct v3_vm_info * vm = v3_config_guest(cfg, priv_data); if (vm == NULL) { PrintError("Could not configure guest\n"); return NULL; } - vm->host_priv_data = priv_data; + V3_Print("CORE 0 RIP=%p\n", (void *)(addr_t)(vm->cores[0].rip)); + + if (name == NULL) { + name = "[V3_VM]"; + } else if (strlen(name) >= 128) { + PrintError("VM name is too long. Will be truncated to 128 chars.\n"); + } + + memset(vm->name, 0, 128); + strncpy(vm->name, name, 127); return vm; } + + static int start_core(void * p) { struct guest_info * core = (struct guest_info *)p; - PrintDebug("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); - // JRL: Whoa WTF? cpu_types are tied to the vcoreID???? - switch (v3_cpu_types[core->cpu_id]) { -#ifdef CONFIG_SVM + switch (v3_cpu_types[0]) { +#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: return v3_start_vmx_guest(core); break; #endif @@ -170,98 +232,288 @@ static int start_core(void * p) return 0; } -#ifdef CONFIG_MULTITHREAD_OS + // For the moment very ugly. Eventually we will shift the cpu_mask to an arbitrary sized type... #define MAX_CORES 32 -static int start_vm_multicore(struct v3_vm_info * vm, unsigned int cpu_mask) { +int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { uint32_t i; - char tname[16]; - int vcore_id = 0; uint8_t * core_mask = (uint8_t *)&cpu_mask; // This is to make future expansion easier uint32_t avail_cores = 0; - - + int vcore_id = 0; /// CHECK IF WE ARE MULTICORE ENABLED.... V3_Print("V3 -- Starting VM (%u cores)\n", vm->num_cores); V3_Print("CORE 0 RIP=%p\n", (void *)(addr_t)(vm->cores[0].rip)); + // Check that enough cores are present in the mask to handle vcores for (i = 0; i < MAX_CORES; i++) { int major = i / 8; int minor = i % 8; - + if (core_mask[major] & (0x1 << minor)) { avail_cores++; } - } - + + if (vm->num_cores > avail_cores) { - PrintError("Attempted to start a VM with too many cores (MAX=%d)\n", MAX_CORES); + PrintError("Attempted to start a VM with too many cores (vm->num_cores = %d, avail_cores = %d, MAX=%d)\n", + vm->num_cores, avail_cores, MAX_CORES); return -1; } + // 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; + 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; + + if (specified_cpu != NULL) { + core_idx = atoi(specified_cpu); + + if ((core_idx < 0) || (core_idx >= MAX_CORES)) { + PrintError("Target CPU out of bounds (%d) (MAX_CORES=%d)\n", core_idx, MAX_CORES); + } + + i--; // We reset the logical core idx. Not strictly necessary I guess... + } else { + core_idx = i; + } - for (i = 0; (i < MAX_CORES) && (vcore_id < vm->num_cores); i++) { - int major = i / 8; - int minor = i % 8; - void * core_thread = NULL; + major = core_idx / 8; + minor = core_idx % 8; if ((core_mask[major] & (0x1 << minor)) == 0) { - // cpuid not set in cpu_mask + PrintError("Logical CPU %d not available for virtual core %d; not started\n", + core_idx, vcore_id); + + if (specified_cpu != NULL) { + PrintError("CPU was specified explicitly (%d). HARD ERROR\n", core_idx); + v3_stop_vm(vm); + return -1; + } + continue; - } + } PrintDebug("Starting virtual core %u on logical core %u\n", - vcore_id, i); + vcore_id, core_idx); - sprintf(tname, "core%u", vcore_id); + sprintf(core->exec_name, "%s-%u", vm->name, vcore_id); PrintDebug("run: core=%u, func=0x%p, arg=0x%p, name=%s\n", - i, start_core, &(vm->cores[vcore_id]), tname); + 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(i, start_core, - &(vm->cores[vcore_id]), tname); + 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; } - 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; +} -int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { -#ifdef CONFIG_MULTITHREAD_OS - return start_vm_multicore(vm, cpu_mask); -#else - return start_core(&(vm->cores[0])); + + +/* 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"); + + +#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; } + int v3_stop_vm(struct v3_vm_info * vm) { vm->run_state = VM_STOPPED; - // force exit all cores via a cross call/IPI - // Wait for all cores to enter CORE_STOPPED state + while (1) { + int i = 0; + int still_running = 0; + + for (i = 0; i < vm->num_cores; i++) { + if (vm->cores[i].core_run_state != CORE_STOPPED) { + still_running = 1; + } + } + + if (still_running == 0) { + break; + } + + v3_yield(NULL); + } + + V3_Print("VM stopped. Returning\n"); + + return 0; +} + + +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...) + v3_free_vm_devices(vm); + + // free cores + for (i = 0; i < vm->num_cores; i++) { + v3_free_core(&(vm->cores[i])); + } + + // free vm + v3_free_vm_internal(vm); + + v3_free_config(vm); + + V3_Free(vm); + return 0; } @@ -311,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); } @@ -352,7 +603,6 @@ void v3_print_cond(const char * fmt, ...) { } -#ifdef CONFIG_MULTITHREAD_OS void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector) { extern struct v3_os_hooks * os_hooks; @@ -361,21 +611,21 @@ void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector) { (os_hooks)->interrupt_cpu(vm, logical_cpu, vector); } } -#endif int v3_vm_enter(struct guest_info * info) { - switch (v3_cpu_types[info->cpu_id]) { -#ifdef CONFIG_SVM + switch (v3_cpu_types[0]) { +#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: return v3_vmx_enter(info); break; #endif