} else
#endif
{
- PrintError("CPU has no virtualizationExtensions\n");
+ PrintError("CPU has no virtualization Extensions\n");
}
}
+#if 0
+static void deinit_cpu(void * 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
+#endif
+#ifdef CONFIG_VMX
+ if (v3_is_vmx_capable()) {
+ PrintDebug("Machine is VMX Capable\n");
+ //v3_deinit_vmx_cpu(cpu_id);
+
+ } else
+#endif
+ {
+ PrintError("CPU has no virtualization Extensions\n");
+ }
+}
+#endif
void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
}
// Register all the possible device types
- v3_init_devices();
+ V3_init_devices();
// Register all shadow paging handlers
V3_init_shdw_paging();
#ifdef CONFIG_VNET
- V3_init_vnet();
+ v3_init_vnet();
#endif
+
+#ifdef 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
+
+}
+
+
+void Shutdown_V3() {
+ // 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)) {
+ for (i = 0; i < CONFIG_MAX_CPUS; i++) {
+ if (v3_cpu_types[i] != V3_INVALID_CPU) {
+ deinit_cpu(i);
+ }
+ }
+ }
+#else
+ deinit_cpu(0);
+#endif
+
+#endif
+
}
}
-struct v3_vm_info * v3_create_vm(void * cfg) {
- struct v3_vm_info * vm = v3_config_guest(cfg);
+struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name) {
+ struct v3_vm_info * vm = v3_config_guest(cfg, priv_data);
+
+ V3_Print("CORE 0 RIP=%p\n", (void *)(addr_t)(vm->cores[0].rip));
+
if (vm == NULL) {
PrintError("Could not configure guest\n");
return NULL;
}
+ if (name == NULL) {
+ name = "[V3_VM]";
+ } else if (strlen(name) >= 128) {
+ PrintError("VM name is too long. Will be truncated to 128 chars.\n");
+ }
+
+ memset(vm->name, 0, 128);
+ strncpy(vm->name, name, 127);
+
return vm;
}
-static int start_core(void *p)
+static int start_core(void * p)
{
- struct guest_info * info = (struct guest_info*)p;
+ struct guest_info * core = (struct guest_info *)p;
- PrintDebug("core %u: in start_core\n",info->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
+ PrintDebug("core %u: in start_core (RIP=%p)\n",
+ core->cpu_id, (void *)(addr_t)core->rip);
- switch (v3_cpu_types[info->cpu_id]) {
+ // JRL: Whoa WTF? cpu_types are tied to the vcoreID????
+ switch (v3_cpu_types[core->cpu_id]) {
#ifdef CONFIG_SVM
case V3_SVM_CPU:
case V3_SVM_REV3_CPU:
- return v3_start_svm_guest(info);
+ return v3_start_svm_guest(core);
break;
#endif
#if CONFIG_VMX
case V3_VMX_CPU:
case V3_VMX_EPT_CPU:
- return v3_start_vmx_guest(info);
+ return v3_start_vmx_guest(core);
break;
#endif
default:
}
-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);
+// 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
- 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];
+#ifdef CONFIG_MULTITHREAD_OS
+ int vcore_id = 0;
+#endif
+ uint8_t * core_mask = (uint8_t *)&cpu_mask; // This is to make future expansion easier
+ uint32_t avail_cores = 0;
+
- 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;
+ /// CHECK IF WE ARE MULTICORE ENABLED....
- // We will fork off cores 1..n first, then boot core zero
+ 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++;
+ }
+
+ }
- // 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;
+ if (vm->num_cores > avail_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;
+ }
+
+
+#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;
+ 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;
}
- 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;
+ if ((core_mask[major] & (0x1 << minor)) == 0) {
+ // cpuid not set in cpu_mask
+ continue;
+ }
- PrintDebug("Starting virtual core %u on logical core %u\n",i,proc_to_use);
+ PrintDebug("Starting virtual core %u on logical core %u\n",
+ vcore_id, i);
- sprintf(tname,"core%u",i);
+ sprintf(core->exec_name, "%s-%u", vm->name, vcore_id);
PrintDebug("run: core=%u, func=0x%p, arg=0x%p, name=%s\n",
- proc_to_use, start_core, &(vm->cores[i]), tname);
+ i, start_core, core, core->exec_name);
// 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))) {
+ core_thread = V3_CREATE_THREAD_ON_CPU(i, start_core, core, core->exec_name);
+
+ if (core_thread == NULL) {
PrintError("Thread launch failed\n");
return -1;
}
- }
- // vm->cores[0].cpu_id=0;
- // vm->cores[0].physical_cpu_id=0;
+ vcore_id++;
+ }
+#endif
- // Finally launch the BSP on core 0
- sprintf(tname,"core%u",0);
+ sprintf(vm->cores[0].exec_name, "%s", vm->name);
- if (!os_hooks->start_thread_on_cpu(0,start_core,&(vm->cores[0]),tname)) {
- PrintError("Thread launch failed\n");
+ if (start_core(&(vm->cores[0])) != 0) {
+ PrintError("Error starting VM core 0\n");
return -1;
}
+
return 0;
}
+
+
+int v3_stop_vm(struct v3_vm_info * vm) {
+
+ vm->run_state = VM_STOPPED;
+
+ // force exit all cores via a cross call/IPI
+
+ 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;
+}
+
+
#ifdef __V3_32BIT__
v3_cpu_mode_t v3_get_host_cpu_mode() {
void v3_yield_cond(struct guest_info * info) {
uint64_t cur_cycle;
- rdtscll(cur_cycle);
+ cur_cycle = v3_get_host_time(&info->time_state);
if (cur_cycle > (info->yield_start_cycle + info->vm_info->yield_cycle_period)) {
(void *)cur_cycle, (void *)info->yield_start_cycle, (void *)info->yield_cycle_period);
*/
V3_Yield();
- rdtscll(info->yield_start_cycle);
+ info->yield_start_cycle = v3_get_host_time(&info->time_state);
}
}
V3_Yield();
if (info) {
- rdtscll(info->yield_start_cycle);
+ info->yield_start_cycle = v3_get_host_time(&info->time_state);
}
}
}
-
+#ifdef 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);
}
}
-
-
-
-unsigned int v3_get_cpu_id() {
- extern struct v3_os_hooks * os_hooks;
- unsigned int ret = (unsigned int)-1;
-
- if ((os_hooks) && (os_hooks)->get_cpu) {
- ret = os_hooks->get_cpu();
- }
-
- return ret;
-}
+#endif
