#include <palacios/vmx.h>
#endif
+#ifdef V3_CONFIG_CHECKPOINT
+#include <palacios/vmm_checkpoint.h>
+#endif
+
v3_cpu_arch_t v3_cpu_types[V3_CONFIG_MAX_CPUS];
struct v3_os_hooks * os_hooks = NULL;
V3_init_symmod();
#endif
+#ifdef V3_CONFIG_CHECKPOINT
+ V3_init_checkpoint();
+#endif
+
+
-#ifdef V3_CONFIG_MULTITHREAD_OS
if ((hooks) && (hooks->call_on_cpu)) {
for (i = 0; i < num_cpus; i++) {
hooks->call_on_cpu(i, &init_cpu, (void *)(addr_t)i);
}
}
-#else
- init_cpu(0);
-#endif
+
}
V3_deinit_symmod();
#endif
+#ifdef V3_CONFIG_CHECKPOINT
+ V3_deinit_checkpoint();
+#endif
+
-#ifdef V3_CONFIG_MULTITHREAD_OS
if ((os_hooks) && (os_hooks->call_on_cpu)) {
for (i = 0; i < V3_CONFIG_MAX_CPUS; i++) {
if (v3_cpu_types[i] != V3_INVALID_CPU) {
- deinit_cpu((void *)(addr_t)i);
+ V3_Call_On_CPU(i, deinit_cpu, (void *)(addr_t)i);
+ //deinit_cpu((void *)(addr_t)i);
}
}
}
-#else
- deinit_cpu(0);
-#endif
}
// For the moment very ugly. Eventually we will shift the cpu_mask to an arbitrary sized type...
-#ifdef V3_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) {
return -1;
}
-#ifdef V3_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++) {
+ // 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++) {
int major = 0;
int minor = 0;
struct guest_info * core = &(vm->cores[vcore_id]);
i--; // We reset the logical core idx. Not strictly necessary I guess...
} else {
-
- if (i == V3_Get_CPU()) {
- // We skip the local CPU because it is reserved for vcore 0
- continue;
- }
-
core_idx = i;
}
major = core_idx / 8;
minor = core_idx % 8;
-
if ((core_mask[major] & (0x1 << minor)) == 0) {
PrintError("Logical CPU %d not available for virtual core %d; not started\n",
core_idx, vcore_id);
PrintDebug("run: core=%u, func=0x%p, arg=0x%p, name=%s\n",
core_idx, start_core, core, core->exec_name);
- // TODO: actually manage these threads instead of just launching them
core->pcpu_id = core_idx;
core->core_thread = V3_CREATE_THREAD_ON_CPU(core_idx, start_core, core, core->exec_name);
return -1;
}
- vcore_id++;
- }
-#endif
-
- sprintf(vm->cores[0].exec_name, "%s", vm->name);
-
- vm->cores[0].pcpu_id = V3_Get_CPU();
-
- if (start_core(&(vm->cores[0])) != 0) {
- PrintError("Error starting VM core 0\n");
- v3_stop_vm(vm);
- return -1;
+ vcore_id--;
}
int v3_move_vm_core(struct v3_vm_info * vm, int vcore_id, int target_cpu) {
struct guest_info * core = NULL;
- if(vcore_id < 0 || vcore_id > vm->num_cores) {
+ if ((vcore_id < 0) || (vcore_id >= vm->num_cores)) {
+ PrintError("Attempted to migrate invalid virtual core (%d)\n", vcore_id);
return -1;
}
core = &(vm->cores[vcore_id]);
- if(target_cpu != core->pcpu_id &&
- core->core_move_state != CORE_MOVE_PENDING){
- core->core_move_state = CORE_MOVE_PENDING;
- core->target_pcpu_id = target_cpu;
- v3_interrupt_cpu(vm, core->pcpu_id, 0);
+ if (target_cpu == core->pcpu_id) {
+ PrintError("Attempted to migrate to local core (%d)\n", target_cpu);
+ // well that was pointless
+ return 0;
+ }
- while(core->core_move_state != CORE_MOVE_DONE){
- v3_yield(NULL);
- }
+ if (core->core_thread == NULL) {
+ PrintError("Attempted to migrate a core without a valid thread context\n");
+ return -1;
}
+ while (v3_raise_barrier(vm, NULL) == -1);
+
+ V3_Print("Performing Migration from %d to %d\n", core->pcpu_id, target_cpu);
+
+ // Double check that we weren't preemptively migrated
+ if (target_cpu != core->pcpu_id) {
+
+ 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);
+ v3_lower_barrier(vm);
+ return -1;
+ }
+ /* There will be a benign race window here:
+ core->pcpu_id will be set to the target core before its fully "migrated"
+ However the core will NEVER run on the old core again, its just in flight to the new core
+ */
+ core->pcpu_id = target_cpu;
+
+ V3_Print("core now at %d\n", core->pcpu_id);
+ }
+
+ v3_lower_barrier(vm);
+
return 0;
}
return 0;
}
+#ifdef V3_CONFIG_CHECKPOINT
+#include <palacios/vmm_checkpoint.h>
+
+int v3_save_vm(struct v3_vm_info * vm, char * store, char * url) {
+ return v3_chkpt_save_vm(vm, store, url);
+}
+
+
+int v3_load_vm(struct v3_vm_info * vm, char * store, char * url) {
+ return v3_chkpt_load_vm(vm, store, url);
+}
+#endif
+
int v3_free_vm(struct v3_vm_info * vm) {
int i = 0;
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);
}
}
-#ifdef V3_CONFIG_MULTITHREAD_OS
void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector) {
extern struct v3_os_hooks * os_hooks;
(os_hooks)->interrupt_cpu(vm, logical_cpu, vector);
}
}
-#endif
