v3_cpu_arch_t v3_cpu_types[CONFIG_MAX_CPUS];
struct v3_os_hooks * os_hooks = NULL;
-
int v3_dbg_enable = 0;
struct guest_info * core = (struct guest_info *)p;
- 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);
-
+ PrintDebug("virtual core %u: in start_core (RIP=%p)\n",
+ core->cpu_id, (void *)(addr_t)core->rip);
- // JRL: Whoa WTF? cpu_types are tied to the vcoreID????
- switch (v3_cpu_types[core->host_cpu_id]) {
+ switch (v3_cpu_types[0]) {
#ifdef CONFIG_SVM
case V3_SVM_CPU:
case V3_SVM_REV3_CPU:
uint32_t i;
uint8_t * core_mask = (uint8_t *)&cpu_mask; // This is to make future expansion easier
uint32_t avail_cores = 0;
+ int vcore_id = 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));
- 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;
+
+ // 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->cores[0].host_cpu_id != 0) {
- PrintError("First virtual core must run on host core 0.\n");
+
+ 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 = 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;
+ 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]);
+
+ /* This assumes that the core 0 thread has been mapped to physical core 0 */
+ 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) {
- PrintError("Host CPU %d not available for virtual core %d; not started\n",
- core->host_cpu_id, i);
+ PrintError("Logical CPU %d not available for virtual core %d; not started\n",
+ i, vcore_id);
continue;
}
PrintDebug("Starting virtual core %u on logical core %u\n",
- i, core->host_cpu_id);
+ vcore_id, i);
- sprintf(core->exec_name, "%s-%u", vm->name, i);
+ sprintf(core->exec_name, "%s-%u", vm->name, vcore_id);
PrintDebug("run: core=%u, func=0x%p, arg=0x%p, name=%s\n",
- core->host_cpu_id, start_core, core, core->exec_name);
+ i, start_core, core, core->exec_name);
// TODO: actually manage these threads instead of just launching them
- core_thread = V3_CREATE_THREAD_ON_CPU(core->host_cpu_id, start_core,
- core, core->exec_name);
+ 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;
}
+
+ vcore_id++;
}
#endif
int v3_vm_enter(struct guest_info * info) {
- switch (v3_cpu_types[info->host_cpu_id]) {
+ switch (v3_cpu_types[0]) {
#ifdef CONFIG_SVM
case V3_SVM_CPU:
case V3_SVM_REV3_CPU:
if (pg_mode) {
if ((strcasecmp(pg_mode, "nested") == 0)) {
- if (v3_cpu_types[info->host_cpu_id] == V3_SVM_REV3_CPU) {
+ // we assume symmetric cores, so if core 0 has nested paging they all do
+ if (v3_cpu_types[0] == V3_SVM_REV3_CPU) {
info->shdw_pg_mode = NESTED_PAGING;
} else {
PrintError("Nested paging not supported on this hardware. Defaulting to shadow paging\n");
}
static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
- char *hcpu;
- if (determine_paging_mode(info, core_cfg))
+ if (determine_paging_mode(info, core_cfg) != 0) {
return -1;
-
- hcpu = v3_cfg_val(core_cfg, "hostcpu");
- if (hcpu) {
- int req_id = atoi(hcpu);
- if (req_id < 0) {
- PrintError("Invalid host core %d requested by"
- " virtual cpu %d - ignored.\n", req_id, info->cpu_id);
- } else {
- PrintDebug("Assigned host core %d to virtual core %d.\n", info->cpu_id, req_id);
- info->host_cpu_id = req_id;
- }
- }
+ }
v3_init_core(info);
info->cpu_id = i;
info->vm_info = vm;
info->core_cfg_data = per_core_cfg;
- info->host_cpu_id = i; // may be overriden by core config
if (pre_config_core(info, per_core_cfg) == -1) {
PrintError("Error in core %d preconfiguration\n", i);
