X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=dca1018e2ac731a6e2eef6f43fc119b461144bc1;hb=22c7f98617f63f097b08e8159383c23aa6d9ad33;hp=92fbcbf61d9ef9e323dd46c63fb9423345b10884;hpb=b91af04aa542bc3837f88c576c26f5c6ed946197;p=palacios.git diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index 92fbcbf..dca1018 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -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,7 +108,7 @@ 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(); @@ -92,15 +118,13 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { V3_init_symmod(); #endif -#ifdef CONFIG_INSTRUMENT_VMM - v3_init_instrumentation(); -#endif - #ifdef CONFIG_VNET - V3_init_vnet(); + v3_init_vnet(); #endif + +#ifdef CONFIG_MULTITHREAD_OS if ((hooks) && (hooks->call_on_cpu)) { for (i = 0; i < num_cpus; i++) { @@ -109,6 +133,40 @@ 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 + +} + + +void Shutdown_V3() { + int i; + + V3_deinit_devices(); + V3_deinit_shdw_paging(); + +#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 + } @@ -117,17 +175,25 @@ 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); +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); V3_Print("CORE 0 RIP=%p\n", (void *)(addr_t)(vm->cores[0].rip)); + if (vm == NULL) { PrintError("Could not configure guest\n"); return NULL; } - vm->host_priv_data = priv_data; + 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; } @@ -166,12 +232,18 @@ 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; - char tname[16]; +#ifdef CONFIG_MULTITHREAD_OS int vcore_id = 0; +#endif uint8_t * core_mask = (uint8_t *)&cpu_mask; // This is to make future expansion easier uint32_t avail_cores = 0; @@ -194,15 +266,25 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { } 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; } - for (i = 0; (i < MAX_CORES) && (vcore_id < vm->num_cores); i++) { +#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; int minor = i % 8; 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 + continue; + } + if ((core_mask[major] & (0x1 << minor)) == 0) { // cpuid not set in cpu_mask @@ -212,14 +294,13 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { PrintDebug("Starting virtual core %u on logical core %u\n", vcore_id, i); - 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); + i, 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_thread = V3_CREATE_THREAD_ON_CPU(i, start_core, core, core->exec_name); if (core_thread == NULL) { PrintError("Thread launch failed\n"); @@ -228,12 +309,76 @@ 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); + + if (start_core(&(vm->cores[0])) != 0) { + PrintError("Error starting VM core 0\n"); + return -1; + } + 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 + + 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_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; +} + + #ifdef __V3_32BIT__ v3_cpu_mode_t v3_get_host_cpu_mode() { @@ -320,7 +465,7 @@ 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; @@ -329,19 +474,7 @@ void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector) { (os_hooks)->interrupt_cpu(vm, logical_cpu, vector); } } - - - -unsigned int v3_get_cpu_id() { - extern struct v3_os_hooks * os_hooks; - unsigned int ret = (unsigned int)-1; - - if ((os_hooks) && (os_hooks)->get_cpu) { - ret = os_hooks->get_cpu(); - } - - return ret; -} +#endif