X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=8e45d5b86a8c0de21f595af9d182d6d8087afd2c;hb=e531d13b53ac8b32bca19131dd7a2824cb17eff9;hp=7077d664f93d31a985e7cae9b66d0d766bc2aab6;hpb=cfcc5717f659b3ed2954f41cf363d3bceae8dc84;p=palacios.git diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index 7077d66..8e45d5b 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; @@ -40,12 +44,6 @@ 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; -} - static void init_cpu(void * arg) { uint32_t cpu_id = (uint32_t)(addr_t)arg; @@ -65,7 +63,7 @@ static void init_cpu(void * arg) { } else #endif { - PrintError("CPU has no virtualization Extensions\n"); + PrintError("CPU has no virtualizationExtensions\n"); } } @@ -74,6 +72,8 @@ static void init_cpu(void * arg) { void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { int i; + V3_Print("V3 Print statement to fix a Kitten page fault bug\n"); + // Set global variables. os_hooks = hooks; @@ -84,10 +84,23 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { // Register all the possible device types v3_init_devices(); -#ifdef INSTRUMENT_VMM + // Register all shadow paging handlers + V3_init_shdw_paging(); + + +#ifdef CONFIG_SYMMOD + V3_init_symmod(); +#endif + +#ifdef CONFIG_INSTRUMENT_VMM v3_init_instrumentation(); #endif + +#ifdef CONFIG_VNET + V3_init_vnet(); +#endif + if ((hooks) && (hooks->call_on_cpu)) { for (i = 0; i < num_cpus; i++) { @@ -104,28 +117,30 @@ v3_cpu_arch_t v3_get_cpu_type(int cpu_id) { } -struct guest_info * v3_create_vm(void * cfg) { - struct guest_info * info = allocate_guest(); - - if (!info) { - PrintError("Could not allocate Guest\n"); - return NULL; - } +struct v3_vm_info * v3_create_vm(void * cfg) { + struct v3_vm_info * vm = v3_config_guest(cfg); - if (v3_config_guest(info, cfg) == -1) { + if (vm == NULL) { PrintError("Could not configure guest\n"); return NULL; } - return info; + return vm; } -int v3_start_vm(struct guest_info * info, unsigned int cpu_mask) { +static int start_core(void *p) +{ + struct guest_info * info = (struct guest_info*)p; + + + PrintDebug("core %u: in start_core\n",info->cpu_id); - info->cpu_id = v3_get_cpu_id(); + // we assume here that the APs are in INIT mode + // and only the BSP is in REAL + // the per-architecture code will rely on this + // assumption - V3_Print("V3 -- Starting VM\n"); switch (v3_cpu_types[info->cpu_id]) { #ifdef CONFIG_SVM @@ -141,11 +156,82 @@ int v3_start_vm(struct guest_info * info, unsigned int cpu_mask) { break; #endif default: - PrintError("Attemping to enter a guest on an invalid CPU\n"); + PrintError("Attempting to enter a guest on an invalid CPU\n"); + return -1; + } + // should not happen + return 0; +} + + +static uint32_t get_next_core(unsigned int cpu_mask, uint32_t last_proc) +{ + uint32_t proc_to_use; + + PrintDebug("In get_next_core cpu_mask=0x%x last_proc=%u\n",cpu_mask,last_proc); + + proc_to_use=(last_proc+1) % 32; // only 32 procs + // This will wrap around, and eventually we can use proc 0, + // since that's clearly available + while (!((cpu_mask >> proc_to_use)&0x1)) { + proc_to_use=(proc_to_use+1)%32; + } + return proc_to_use; +} + +int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { + uint32_t i; + uint32_t last_proc; + uint32_t proc_to_use; + char tname[16]; + + V3_Print("V3 -- Starting VM (%u cores)\n",vm->num_cores); + + // We assume that we are running on CPU 0 of the underlying system + last_proc=0; + + // We will fork off cores 1..n first, then boot core zero + + // for the AP, we need to create threads + + for (i = 1; i < vm->num_cores; i++) { + if (!os_hooks->start_thread_on_cpu) { + PrintError("Host OS does not support start_thread_on_cpu - FAILING\n"); return -1; + } + + proc_to_use=get_next_core(cpu_mask,last_proc); + last_proc=proc_to_use; + + // vm->cores[i].cpu_id=i; + // vm->cores[i].physical_cpu_id=proc_to_use; + + PrintDebug("Starting virtual core %u on logical core %u\n",i,proc_to_use); + + sprintf(tname,"core%u",i); + + PrintDebug("run: core=%u, func=0x%p, arg=0x%p, name=%s\n", + proc_to_use, start_core, &(vm->cores[i]), tname); + + // TODO: actually manage these threads instead of just launching them + if (!(os_hooks->start_thread_on_cpu(proc_to_use,start_core,&(vm->cores[i]),tname))) { + PrintError("Thread launch failed\n"); + return -1; + } + } + + // vm->cores[0].cpu_id=0; + // vm->cores[0].physical_cpu_id=0; + + // Finally launch the BSP on core 0 + sprintf(tname,"core%u",0); + if (!os_hooks->start_thread_on_cpu(0,start_core,&(vm->cores[0]),tname)) { + PrintError("Thread launch failed\n"); + return -1; } return 0; + } @@ -193,7 +279,7 @@ void v3_yield_cond(struct guest_info * info) { uint64_t cur_cycle; rdtscll(cur_cycle); - 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", @@ -237,11 +323,11 @@ void v3_print_cond(const char * fmt, ...) { -void v3_interrupt_cpu(struct guest_info * info, 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(info, logical_cpu); + (os_hooks)->interrupt_cpu(vm, logical_cpu, vector); } }