X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=c890fda1ed92d8d818512705daaf8756e0d3af3d;hb=adee0fafaa51f4bf28abe7461006be9b9d3dbceb;hp=65b4b496e0ac9fd23055254d2c5628ffa11e04a4;hpb=6d6988cc9c8bac21d96afd800076afe0915cf2cd;p=palacios-OLD.git diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index 65b4b49..c890fda 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -21,10 +21,10 @@ #include #include #include -#include #include #include #include +#include #ifdef CONFIG_SVM #include @@ -40,7 +40,6 @@ v3_cpu_arch_t v3_cpu_types[CONFIG_MAX_CPUS]; struct v3_os_hooks * os_hooks = NULL; - int v3_dbg_enable = 0; @@ -63,7 +62,34 @@ 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 CONFIG_SVM + case V3_VMX_CPU: + case V3_VMX_EPT_CPU: + PrintDebug("Machine is SVM Capable\n"); + v3_deinit_svm_cpu(cpu_id); + break; +#endif +#ifdef CONFIG_VMX + case V3_SVM_CPU: + case V3_SVM_REV3_CPU: + PrintDebug("Machine is VMX Capable\n"); + v3_deinit_vmx_cpu(cpu_id); + break; +#endif + case V3_INVALID_CPU: + default: + PrintError("CPU has no virtualization Extensions\n"); + break; } } @@ -82,20 +108,19 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { } // 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 V3_init_symmod(); #endif -#ifdef CONFIG_INSTRUMENT_VMM - v3_init_instrumentation(); -#endif - #ifdef CONFIG_VNET v3_init_vnet(); @@ -118,6 +143,38 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { } +void Shutdown_V3() { + int i; + + V3_deinit_devices(); + V3_deinit_shdw_paging(); + + V3_deinit_extensions(); + +#ifdef CONFIG_SYMMOD + V3_deinit_symmod(); +#endif + + +#ifdef CONFIG_VNET + v3_deinit_vnet(); +#endif + +#ifdef CONFIG_MULTITHREAD_OS + if ((os_hooks) && (os_hooks->call_on_cpu)) { + for (i = 0; i < CONFIG_MAX_CPUS; i++) { + if (v3_cpu_types[i] != V3_INVALID_CPU) { + deinit_cpu((void *)(addr_t)i); + } + } + } +#else + deinit_cpu(0); +#endif + +} + + v3_cpu_arch_t v3_get_cpu_type(int cpu_id) { return v3_cpu_types[cpu_id]; } @@ -152,12 +209,10 @@ static int start_core(void * p) struct guest_info * core = (struct guest_info *)p; - PrintDebug("core %u: in start_core (RIP=%p)\n", + PrintDebug("virtual core %u: in start_core (RIP=%p)\n", core->cpu_id, (void *)(addr_t)core->rip); - - // JRL: Whoa WTF? cpu_types are tied to the vcoreID???? - switch (v3_cpu_types[core->cpu_id]) { + switch (v3_cpu_types[0]) { #ifdef CONFIG_SVM case V3_SVM_CPU: case V3_SVM_REV3_CPU: @@ -180,39 +235,42 @@ 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 #define MAX_CORES 32 +#else +#define MAX_CORES 1 +#endif int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { uint32_t i; - 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 (vm->num_cores = %d, avail_cores = %d, MAX=%d)\n", vm->num_cores, avail_cores, MAX_CORES); return -1; } - +#ifdef 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 = i / 8; @@ -220,14 +278,15 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { void * core_thread = NULL; struct guest_info * core = &(vm->cores[vcore_id]); + /* 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 + // We skip the local CPU because it is reserved for vcore 0 continue; } - 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", + i, vcore_id); continue; } @@ -249,6 +308,7 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { vcore_id++; } +#endif sprintf(vm->cores[0].exec_name, "%s", vm->name); @@ -269,21 +329,50 @@ 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_Print("Yielding\n"); + v3_yield(NULL); + } + + V3_Print("VM stopped. Returning\n"); return 0; } int v3_free_vm(struct v3_vm_info * vm) { + int i = 0; // deinitialize guest (free memory, etc...) - v3_dev_mgr_deinit(vm); + 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; } @@ -389,7 +478,7 @@ 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[info->cpu_id]) { + switch (v3_cpu_types[0]) { #ifdef CONFIG_SVM case V3_SVM_CPU: case V3_SVM_REV3_CPU: