X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=9acfbd0492f23b200a9f7dcaea9ad1d44e91f467;hb=e02cc15e36e8f5d7ee66390986351748dd9a16a1;hp=9fc99fd438d5640f4cf3f40818cf12d9dac29b05;hpb=c0e8207d10b6b077c3fac4fb013ba7485f3a6391;p=palacios-OLD.git diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index 9fc99fd..9acfbd0 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -67,29 +66,33 @@ static void init_cpu(void * arg) { } } -#if 0 + static void deinit_cpu(void * arg) { -// uint32_t cpu_id = (uint32_t)(addr_t)arg; + uint32_t cpu_id = (uint32_t)(addr_t)arg; - #ifdef CONFIG_SVM - if (v3_is_svm_capable()) { - PrintDebug("Machine is SVM Capable\n"); - //v3_deinit_svm_cpu(cpu_id); - } else + 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 - if (v3_is_vmx_capable()) { - PrintDebug("Machine is VMX Capable\n"); - //v3_deinit_vmx_cpu(cpu_id); - - } else + case V3_SVM_CPU: + case V3_SVM_REV3_CPU: + PrintDebug("Machine is VMX Capable\n"); + v3_deinit_vmx_cpu(cpu_id); + break; #endif - { - PrintError("CPU has no virtualization Extensions\n"); + case V3_INVALID_CPU: + default: + PrintError("CPU has no virtualization Extensions\n"); + break; } } -#endif + void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { @@ -115,10 +118,6 @@ 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(); @@ -142,30 +141,25 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { void Shutdown_V3() { - // int i; + int i; V3_deinit_devices(); V3_deinit_shdw_paging(); -#if 0 - #ifdef CONFIG_SYMMOD V3_deinit_symmod(); #endif -#ifdef CONFIG_INSTRUMENT_VMM - v3_deinit_instrumentation(); -#endif #ifdef CONFIG_VNET v3_deinit_vnet(); #endif #ifdef CONFIG_MULTITHREAD_OS - if ((hooks) && (hooks->call_on_cpu)) { + 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(i); + deinit_cpu((void *)(addr_t)i); } } } @@ -173,8 +167,6 @@ void Shutdown_V3() { deinit_cpu(0); #endif -#endif - } @@ -212,12 +204,12 @@ 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); + PrintDebug("virtual core %u/physical core %u: in start_core (RIP=%p)\n", + core->cpu_id, core->host_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[core->host_cpu_id]) { #ifdef CONFIG_SVM case V3_SVM_CPU: case V3_SVM_REV3_CPU: @@ -240,75 +232,65 @@ 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; - - /// 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) { + if (vm->num_cores > 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; } + if (vm->cores[0].host_cpu_id != 0) { + PrintError("First virtual core must run on host core 0.\n"); + 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; - int minor = i % 8; + for (i = 1; i < vm->num_cores; i++) { + struct guest_info *core = &(vm->cores[i]); + int major = core->host_cpu_id / 8; + int minor = core->host_cpu_id % 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 + PrintError("Host CPU %d not available for virtual core %d; not started\n", + core->host_cpu_id, i); continue; } PrintDebug("Starting virtual core %u on logical core %u\n", - vcore_id, i); + i, core->host_cpu_id); - sprintf(core->exec_name, "%s-%u", vm->name, vcore_id); + sprintf(core->exec_name, "%s-%u", vm->name, i); PrintDebug("run: core=%u, func=0x%p, arg=0x%p, name=%s\n", - i, start_core, core, core->exec_name); + core->host_cpu_id, 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); + core_thread = V3_CREATE_THREAD_ON_CPU(core->host_cpu_id, start_core, + core, core->exec_name); if (core_thread == NULL) { PrintError("Thread launch failed\n"); return -1; } - - vcore_id++; } +#endif sprintf(vm->cores[0].exec_name, "%s", vm->name); @@ -478,7 +460,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[info->host_cpu_id]) { #ifdef CONFIG_SVM case V3_SVM_CPU: case V3_SVM_REV3_CPU: