X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=65b4b496e0ac9fd23055254d2c5628ffa11e04a4;hb=6d6988cc9c8bac21d96afd800076afe0915cf2cd;hp=66ce9c0a2520193018247dfd6d041ff243cc8d65;hpb=65b032e18e7f439d61d682c79884c2d017be6c4d;p=palacios.git diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index 66ce9c0..65b4b49 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -33,6 +33,10 @@ #include #endif +#ifdef CONFIG_VNET +#include +#endif + v3_cpu_arch_t v3_cpu_types[CONFIG_MAX_CPUS]; struct v3_os_hooks * os_hooks = NULL; @@ -59,7 +63,7 @@ static void init_cpu(void * arg) { } else #endif { - PrintError("CPU has no virtualization Extensions\n"); + PrintError("CPU has no virtualizationExtensions\n"); } } @@ -92,6 +96,13 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { v3_init_instrumentation(); #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++) { @@ -100,6 +111,10 @@ 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 + } @@ -108,48 +123,168 @@ v3_cpu_arch_t v3_get_cpu_type(int cpu_id) { } -struct v3_vm_info * v3_create_vm(void * cfg) { - 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; } + 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; } -int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { - int i = 0; - V3_Print("V3 -- Starting VM\n"); +static int start_core(void * p) +{ + struct guest_info * core = (struct guest_info *)p; - for (i = 0; i < vm->num_cores; i++) { - struct guest_info * info = &(vm->cores[i]); + PrintDebug("core %u: in start_core (RIP=%p)\n", + core->cpu_id, (void *)(addr_t)core->rip); - /* GRUESOM HACK... */ - // vm->cpu_id = v3_get_cpu_id(); - switch (v3_cpu_types[info->cpu_id]) { + // JRL: Whoa WTF? cpu_types are tied to the vcoreID???? + switch (v3_cpu_types[core->cpu_id]) { #ifdef CONFIG_SVM - case V3_SVM_CPU: - case V3_SVM_REV3_CPU: - return v3_start_svm_guest(info); - break; + case V3_SVM_CPU: + case V3_SVM_REV3_CPU: + return v3_start_svm_guest(core); + break; #endif #if CONFIG_VMX - case V3_VMX_CPU: - case V3_VMX_EPT_CPU: - return v3_start_vmx_guest(info); - break; + case V3_VMX_CPU: + case V3_VMX_EPT_CPU: + return v3_start_vmx_guest(core); + break; #endif - default: - PrintError("Attemping to enter a guest on an invalid CPU\n"); - return -1; + default: + PrintError("Attempting to enter a guest on an invalid CPU\n"); + return -1; + } + // should not happen + return 0; +} + + +// For the moment very ugly. Eventually we will shift the cpu_mask to an arbitrary sized type... +#define MAX_CORES 32 + + +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; + + + + /// 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; + } + + + // 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]); + + 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 + continue; + } + + PrintDebug("Starting virtual core %u on logical core %u\n", + vcore_id, i); + + 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, core, core->exec_name); + + // TODO: actually manage these threads instead of just launching them + core_thread = V3_CREATE_THREAD_ON_CPU(i, start_core, core, core->exec_name); + + if (core_thread == NULL) { + PrintError("Thread launch failed\n"); + return -1; + } + + vcore_id++; + } + + 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 + + // Wait for all cores to enter CORE_STOPPED state + + + + return 0; +} + + +int v3_free_vm(struct v3_vm_info * vm) { + // deinitialize guest (free memory, etc...) + + v3_dev_mgr_deinit(vm); + return 0; } @@ -196,7 +331,7 @@ v3_cpu_mode_t v3_get_host_cpu_mode() { void v3_yield_cond(struct guest_info * info) { uint64_t cur_cycle; - rdtscll(cur_cycle); + cur_cycle = v3_get_host_time(&info->time_state); if (cur_cycle > (info->yield_start_cycle + info->vm_info->yield_cycle_period)) { @@ -205,7 +340,7 @@ void v3_yield_cond(struct guest_info * info) { (void *)cur_cycle, (void *)info->yield_start_cycle, (void *)info->yield_cycle_period); */ V3_Yield(); - rdtscll(info->yield_start_cycle); + info->yield_start_cycle = v3_get_host_time(&info->time_state); } } @@ -219,7 +354,7 @@ void v3_yield(struct guest_info * info) { V3_Yield(); if (info) { - rdtscll(info->yield_start_cycle); + info->yield_start_cycle = v3_get_host_time(&info->time_state); } } @@ -240,28 +375,16 @@ void v3_print_cond(const char * fmt, ...) { } +#ifdef CONFIG_MULTITHREAD_OS - -void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu) { +void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector) { extern struct v3_os_hooks * os_hooks; if ((os_hooks) && (os_hooks)->interrupt_cpu) { - (os_hooks)->interrupt_cpu(vm, logical_cpu); + (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