X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=ff5a55cb13180c006124b77c4c6b018519e20ce9;hb=ead1cdbf64d8f8ae39a52abd3c9fedd17ae0408d;hp=ca12fc79db9e712e3fdac68e9271c3d2aff45bb2;hpb=b1128b2a9d269fefc786c60c26878b372d5e39c1;p=palacios.git diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index ca12fc7..ff5a55c 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -25,6 +25,8 @@ #include #include #include +#include + #ifdef V3_CONFIG_SVM #include @@ -39,6 +41,8 @@ v3_cpu_arch_t v3_cpu_types[V3_CONFIG_MAX_CPUS]; +v3_cpu_arch_t v3_mach_type = V3_INVALID_CPU; + struct v3_os_hooks * os_hooks = NULL; int v3_dbg_enable = 0; @@ -96,15 +100,19 @@ static void deinit_cpu(void * arg) { } - -void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { - int i; +void Init_V3(struct v3_os_hooks * hooks, char * cpu_mask, int num_cpus) { + int i = 0; + int minor = 0; + int major = 0; V3_Print("V3 Print statement to fix a Kitten page fault bug\n"); // Set global variables. os_hooks = hooks; + // Determine the global machine type + v3_mach_type = V3_INVALID_CPU; + for (i = 0; i < V3_CONFIG_MAX_CPUS; i++) { v3_cpu_types[i] = V3_INVALID_CPU; } @@ -127,22 +135,26 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) { V3_init_checkpoint(); #endif - - - if ((hooks) && (hooks->call_on_cpu)) { - for (i = 0; i < num_cpus; i++) { - - V3_Print("Initializing VMM extensions on cpu %d\n", i); - hooks->call_on_cpu(i, &init_cpu, (void *)(addr_t)i); - } - } + for (i = 0; i < num_cpus; i++) { + major = i / 8; + minor = i % 8; + if ((cpu_mask == NULL) || (*(cpu_mask + major) & (0x1 << minor))) { + V3_Print("Initializing VMM extensions on cpu %d\n", i); + hooks->call_on_cpu(i, &init_cpu, (void *)(addr_t)i); + if (v3_mach_type == V3_INVALID_CPU) { + v3_mach_type = v3_cpu_types[i]; + } + } + } + } } + void Shutdown_V3() { int i; @@ -210,7 +222,7 @@ static int start_core(void * p) PrintDebug("virtual core %u (on logical core %u): in start_core (RIP=%p)\n", core->vcpu_id, core->pcpu_id, (void *)(addr_t)core->rip); - switch (v3_cpu_types[0]) { + switch (v3_mach_type) { #ifdef V3_CONFIG_SVM case V3_SVM_CPU: case V3_SVM_REV3_CPU: @@ -255,7 +267,11 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { int minor = i % 8; if (core_mask[major] & (0x1 << minor)) { - avail_cores++; + if (v3_cpu_types[i] == V3_INVALID_CPU) { + core_mask[major] &= ~(0x1 << minor); + } else { + avail_cores++; + } } } @@ -266,6 +282,8 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { return -1; } + vm->run_state = VM_RUNNING; + // Spawn off threads for each core. // We work backwards, so that core 0 is always started last. for (i = 0, vcore_id = vm->num_cores - 1; (i < MAX_CORES) && (vcore_id >= 0); i++) { @@ -311,6 +329,7 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { PrintDebug("run: core=%u, func=0x%p, arg=0x%p, name=%s\n", core_idx, start_core, core, core->exec_name); + core->core_run_state = CORE_STOPPED; // core zero will turn itself on core->pcpu_id = core_idx; core->core_thread = V3_CREATE_THREAD_ON_CPU(core_idx, start_core, core, core->exec_name); @@ -323,6 +342,12 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) { vcore_id--; } + if (vcore_id >= 0) { + PrintError("Error starting VM: Not enough available CPU cores\n"); + v3_stop_vm(vm); + return -1; + } + return 0; @@ -387,6 +412,20 @@ int v3_move_vm_core(struct v3_vm_info * vm, int vcore_id, int target_cpu) { V3_Print("Moving Core\n"); + +#ifdef V3_CONFIG_VMX + switch (v3_cpu_types[core->pcpu_id]) { + case V3_VMX_CPU: + case V3_VMX_EPT_CPU: + case V3_VMX_EPT_UG_CPU: + PrintDebug("Flushing VMX Guest CPU %d\n", core->vcpu_id); + V3_Call_On_CPU(core->pcpu_id, (void (*)(void *))v3_flush_vmx_vm_core, (void *)core); + break; + default: + break; + } +#endif + if (V3_MOVE_THREAD_TO_CPU(target_cpu, core->core_thread) != 0) { PrintError("Failed to move Vcore %d to CPU %d\n", core->vcpu_id, target_cpu); @@ -400,13 +439,9 @@ int v3_move_vm_core(struct v3_vm_info * vm, int vcore_id, int target_cpu) { */ core->pcpu_id = target_cpu; - V3_Print("core now at %d\n", core->pcpu_id); - + V3_Print("core now at %d\n", core->pcpu_id); } - - - v3_lower_barrier(vm); return 0; @@ -418,7 +453,12 @@ int v3_stop_vm(struct v3_vm_info * vm) { vm->run_state = VM_STOPPED; - // force exit all cores via a cross call/IPI + // Sanity check to catch any weird execution states + if (v3_wait_for_barrier(vm, NULL) == 0) { + v3_lower_barrier(vm); + } + + // XXX force exit all cores via a cross call/IPI XXX while (1) { int i = 0; @@ -465,11 +505,112 @@ int v3_continue_vm(struct v3_vm_info * vm) { return -1; } + vm->run_state = VM_RUNNING; + v3_lower_barrier(vm); + return 0; +} + + + +static int sim_callback(struct guest_info * core, void * private_data) { + struct v3_bitmap * timeout_map = private_data; + + v3_bitmap_set(timeout_map, core->vcpu_id); + + V3_Print("Simulation callback activated (guest_rip=%p)\n", (void *)core->rip); + + while (v3_bitmap_check(timeout_map, core->vcpu_id) == 1) { + v3_yield(NULL); + } + + return 0; +} + + + + +int v3_simulate_vm(struct v3_vm_info * vm, unsigned int msecs) { + struct v3_bitmap timeout_map; + int i = 0; + int all_blocked = 0; + uint64_t cycles = 0; + uint64_t cpu_khz = V3_CPU_KHZ(); + + if (vm->run_state != VM_PAUSED) { + PrintError("VM must be paused before simulation begins\n"); + return -1; + } + + /* AT this point VM is paused */ + + // initialize bitmap + v3_bitmap_init(&timeout_map, vm->num_cores); + + + + + // calculate cycles from msecs... + // IMPORTANT: Floating point not allowed. + cycles = (msecs * cpu_khz); + + + + V3_Print("Simulating %u msecs (%llu cycles) [CPU_KHZ=%llu]\n", msecs, cycles, cpu_khz); + + // set timeout + + for (i = 0; i < vm->num_cores; i++) { + if (v3_add_core_timeout(&(vm->cores[i]), cycles, sim_callback, &timeout_map) == -1) { + PrintError("Could not register simulation timeout for core %d\n", i); + return -1; + } + } + + V3_Print("timeouts set on all cores\n "); + + + // Run the simulation +// vm->run_state = VM_SIMULATING; vm->run_state = VM_RUNNING; + v3_lower_barrier(vm); + + + V3_Print("Barrier lowered: We are now Simulating!!\n"); + + // block until simulation is complete + while (all_blocked == 0) { + all_blocked = 1; + + for (i = 0; i < vm->num_cores; i++) { + if (v3_bitmap_check(&timeout_map, i) == 0) { + all_blocked = 0; + } + } + + if (all_blocked == 1) { + break; + } + + v3_yield(NULL); + } + + + V3_Print("Simulation is complete\n"); + + // Simulation is complete + // Reset back to PAUSED state + + v3_raise_barrier_nowait(vm, NULL); + vm->run_state = VM_PAUSED; + + v3_bitmap_reset(&timeout_map); + + v3_wait_for_barrier(vm, NULL); return 0; + } #ifdef V3_CONFIG_CHECKPOINT @@ -553,13 +694,12 @@ void v3_yield_cond(struct guest_info * info) { cur_cycle = v3_get_host_time(&info->time_state); 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); - */ + //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(); - info->yield_start_cycle = v3_get_host_time(&info->time_state); + info->yield_start_cycle += info->vm_info->yield_cycle_period; } } @@ -573,7 +713,7 @@ void v3_yield(struct guest_info * info) { V3_Yield(); if (info) { - info->yield_start_cycle = v3_get_host_time(&info->time_state); + info->yield_start_cycle += info->vm_info->yield_cycle_period; } } @@ -606,7 +746,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[0]) { + switch (v3_mach_type) { #ifdef V3_CONFIG_SVM case V3_SVM_CPU: case V3_SVM_REV3_CPU: