} else
#endif
{
- PrintError("CPU has no virtualization Extensions\n");
+ PrintError("CPU has no virtualizationExtensions\n");
}
}
}
-struct v3_vm_info * v3_create_vm(void * cfg) {
+struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data) {
struct v3_vm_info * vm = v3_config_guest(cfg);
+ 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;
}
+ vm->host_priv_data = priv_data;
+
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:
- PrintError("Attemping to enter a guest on an invalid CPU\n");
+ PrintError("Attempting to enter a guest on an invalid CPU\n");
return -1;
}
// should not happen
}
-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);
-
- 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;
-}
+// For the moment very ugly. Eventually we will shift the cpu_mask to an arbitrary sized type...
+#define MAX_CORES 32
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];
+ int vcore_id = 0;
+ 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;
- // We will fork off cores 1..n first, then boot core zero
-
- // 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;
+ /// 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) {
+ PrintError("Attempted to start a VM with too many cores (MAX=%d)\n", MAX_CORES);
+ return -1;
+ }
+
- proc_to_use=get_next_core(cpu_mask,last_proc);
- last_proc=proc_to_use;
+ for (i = 0; (i < MAX_CORES) && (vcore_id < vm->num_cores); i++) {
+ int major = i / 8;
+ int minor = i % 8;
+ void * core_thread = NULL;
- PrintDebug("Starting virtual core %u on logical core %u\n",i,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",
+ vcore_id, i);
- sprintf(tname,"core%u",i);
+ sprintf(tname, "core%u", 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, &(vm->cores[vcore_id]), tname);
// 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,
+ &(vm->cores[vcore_id]), tname);
+
+ if (core_thread == NULL) {
PrintError("Thread launch failed\n");
return -1;
}
- }
- // Finally launch the BSP on core 0
- sprintf(tname,"core%u",0);
- if (!os_hooks->start_thread_on_cpu(0,start_core,&(vm->cores[0]),tname)) {
- PrintError("Thread launch failed\n");
- return -1;
+ vcore_id++;
}
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
+
+ // Wait for all cores to enter CORE_STOPPED state
+
+ // deinitialize guest (free memory, etc...)
+
+ 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);
}
}
