#include <palacios/vmm_intr.h>
#include <palacios/vmm_config.h>
#include <palacios/vm_guest.h>
-#include <palacios/vmm_instrument.h>
#include <palacios/vmm_ctrl_regs.h>
#include <palacios/vmm_lowlevel.h>
#include <palacios/vmm_sprintf.h>
} else
#endif
{
- PrintError("CPU has no virtualizationExtensions\n");
+ PrintError("CPU has no virtualization Extensions\n");
+ }
+}
+
+
+static void deinit_cpu(void * arg) {
+ uint32_t cpu_id = (uint32_t)(addr_t)arg;
+
+
+ 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
+ case V3_SVM_CPU:
+ case V3_SVM_REV3_CPU:
+ PrintDebug("Machine is VMX Capable\n");
+ v3_deinit_vmx_cpu(cpu_id);
+ break;
+#endif
+ case V3_INVALID_CPU:
+ default:
+ PrintError("CPU has no virtualization Extensions\n");
+ break;
}
}
}
// Register all the possible device types
- v3_init_devices();
+ V3_init_devices();
// Register all shadow paging handlers
V3_init_shdw_paging();
V3_init_symmod();
#endif
-#ifdef CONFIG_INSTRUMENT_VMM
- v3_init_instrumentation();
-#endif
-
#ifdef CONFIG_VNET
v3_init_vnet();
}
+void Shutdown_V3() {
+ int i;
+
+ V3_deinit_devices();
+ V3_deinit_shdw_paging();
+
+#ifdef CONFIG_SYMMOD
+ V3_deinit_symmod();
+#endif
+
+
+#ifdef CONFIG_VNET
+ v3_deinit_vnet();
+#endif
+
+#ifdef CONFIG_MULTITHREAD_OS
+ 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((void *)(addr_t)i);
+ }
+ }
+ }
+#else
+ deinit_cpu(0);
+#endif
+
+}
+
+
v3_cpu_arch_t v3_get_cpu_type(int cpu_id) {
return v3_cpu_types[cpu_id];
}
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:
// 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);
vm->run_state = VM_STOPPED;
-
// force exit all cores via a cross call/IPI
- // Wait for all cores to enter CORE_STOPPED state
+ while (1) {
+ int i = 0;
+ int still_running = 0;
+
+ for (i = 0; i < vm->num_cores; i++) {
+ if (vm->cores[i].core_run_state != CORE_STOPPED) {
+ still_running = 1;
+ }
+ }
+
+ if (still_running == 0) {
+ break;
+ }
+
+ V3_Print("Yielding\n");
+ v3_yield(NULL);
+ }
+
+ V3_Print("VM stopped. Returning\n");
+
+ return 0;
+}
+
+
+int v3_free_vm(struct v3_vm_info * vm) {
+ int i = 0;
// deinitialize guest (free memory, etc...)
+ v3_free_vm_devices(vm);
+
+ // free cores
+ for (i = 0; i < vm->num_cores; i++) {
+ v3_free_core(&(vm->cores[i]));
+ }
+
+ // free vm
+ v3_free_vm_internal(vm);
+
+ v3_free_config(vm);
+
+ V3_Free(vm);
+
return 0;
}
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:
