X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=938105e56eb18242ff23b05e6ff7a99ab19145fa;hb=07a12ade201ee7c2fe2358084ca079d2facac500;hp=1571c4871fc966941ad869315659fd2173a5e2ba;hpb=28cfe68985ef4360c9bd7428a19c222b295e9d85;p=palacios.git diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index 1571c48..938105e 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -24,6 +24,7 @@ #include #include #include +#include #ifdef CONFIG_SVM #include @@ -32,37 +33,26 @@ #include #endif +#ifdef CONFIG_VNET +#include +#endif + v3_cpu_arch_t v3_cpu_types[CONFIG_MAX_CPUS]; struct v3_os_hooks * os_hooks = NULL; +int v3_dbg_enable = 0; -static struct guest_info * allocate_guest() { - void * info = V3_Malloc(sizeof(struct guest_info)); - memset(info, 0, sizeof(struct guest_info)); - return info; -} - - -struct vmm_init_arg { - int cpu_id; - struct v3_ctrl_ops * vmm_ops; -}; static void init_cpu(void * arg) { - struct vmm_init_arg * vmm_arg = (struct vmm_init_arg *)arg; - int cpu_id = vmm_arg->cpu_id; - struct v3_ctrl_ops * vmm_ops = vmm_arg->vmm_ops; + uint32_t cpu_id = (uint32_t)(addr_t)arg; #ifdef CONFIG_SVM if (v3_is_svm_capable()) { PrintDebug("Machine is SVM Capable\n"); v3_init_svm_cpu(cpu_id); - if (cpu_id == 0) { - v3_init_svm_hooks(vmm_ops); - } } else #endif #ifdef CONFIG_VMX @@ -70,22 +60,19 @@ static void init_cpu(void * arg) { PrintDebug("Machine is VMX Capable\n"); v3_init_vmx_cpu(cpu_id); - if (cpu_id == 0) { - v3_init_vmx_hooks(vmm_ops); - } } else #endif { - PrintError("CPU has no virtualization Extensions\n"); + PrintError("CPU has no virtualizationExtensions\n"); } } -void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops, int num_cpus) { +void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { int i; - struct vmm_init_arg arg; - arg.vmm_ops = vmm_ops; + + V3_Print("V3 Print statement to fix a Kitten page fault bug\n"); // Set global variables. os_hooks = hooks; @@ -97,27 +84,186 @@ void Init_V3(struct v3_os_hooks * hooks, struct v3_ctrl_ops * vmm_ops, int num_c // Register all the possible device types v3_init_devices(); + // Register all shadow paging handlers + V3_init_shdw_paging(); + + +#ifdef CONFIG_SYMMOD + V3_init_symmod(); +#endif -#ifdef INSTRUMENT_VMM +#ifdef CONFIG_INSTRUMENT_VMM v3_init_instrumentation(); #endif - vmm_ops->allocate_guest = &allocate_guest; + +#ifdef CONFIG_VNET + V3_init_vnet(); +#endif +#ifdef CONFIG_MULTITHREAD_OS if ((hooks) && (hooks->call_on_cpu)) { for (i = 0; i < num_cpus; i++) { - arg.cpu_id = i; V3_Print("Initializing VMM extensions on cpu %d\n", i); - hooks->call_on_cpu(i, &init_cpu, &arg); + hooks->call_on_cpu(i, &init_cpu, (void *)(addr_t)i); + } + } +#else + init_cpu(0); +#endif + +} + + +v3_cpu_arch_t v3_get_cpu_type(int cpu_id) { + return v3_cpu_types[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)); + + if (vm == NULL) { + PrintError("Could not configure guest\n"); + return NULL; + } + + vm->host_priv_data = priv_data; + + 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); + + + // 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(core); + break; +#endif +#if CONFIG_VMX + case V3_VMX_CPU: + case V3_VMX_EPT_CPU: + return v3_start_vmx_guest(core); + break; +#endif + default: + PrintError("Attempting to enter a guest on an invalid CPU\n"); + return -1; + } + // should not happen + 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) { + 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; + + + + /// 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); + return -1; + } + + + for (i = 0; (i < MAX_CORES) && (vcore_id < vm->num_cores); i++) { + int major = i / 8; + int minor = i % 8; + void * core_thread = NULL; + + 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(tname, "core%u", vcore_id); + + PrintDebug("run: core=%u, func=0x%p, arg=0x%p, name=%s\n", + i, start_core, &(vm->cores[vcore_id]), tname); + + // 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); + + if (core_thread == NULL) { + PrintError("Thread launch failed\n"); + return -1; } + + vcore_id++; } + return 0; } +#endif + + +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])); +#endif +} + +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 + + // deinitialize guest (free memory, etc...) + + return 0; +} #ifdef __V3_32BIT__ @@ -159,21 +305,23 @@ v3_cpu_mode_t v3_get_host_cpu_mode() { } while (0) \ + 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->yield_cycle_period)) { + 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); */ V3_Yield(); - rdtscll(info->yield_start_cycle); + info->yield_start_cycle = v3_get_host_time(&info->time_state); } } + /* * unconditional cpu yield * if the yielding thread is a guest context, the guest quantum is reset on resumption @@ -183,19 +331,37 @@ 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); } } -void v3_interrupt_cpu(struct guest_info * info, int logical_cpu) { + +void v3_print_cond(const char * fmt, ...) { + if (v3_dbg_enable == 1) { + char buf[2048]; + va_list ap; + + va_start(ap, fmt); + vsnprintf(buf, 2048, fmt, ap); + va_end(ap); + + V3_Print("%s", buf); + } +} + + +#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; if ((os_hooks) && (os_hooks)->interrupt_cpu) { - (os_hooks)->interrupt_cpu(info, logical_cpu); + (os_hooks)->interrupt_cpu(vm, logical_cpu, vector); } } +#endif @@ -207,7 +373,7 @@ int v3_vm_enter(struct guest_info * info) { return v3_svm_enter(info); break; #endif -#if CONFIG_VMX && 0 +#if CONFIG_VMX case V3_VMX_CPU: case V3_VMX_EPT_CPU: return v3_vmx_enter(info);