From: Jack Lange <jacklange@cs.pitt.edu>
Date: Tue, 1 Mar 2011 18:35:57 +0000 (-0600)
Subject: reverted host_cpu_id changes because it broke multicore functionality
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=95c3bb063747b4d70a24464d3d67e9c16799d9f9;p=palacios.git

reverted host_cpu_id changes because it broke multicore functionality
---

diff --git a/palacios/include/palacios/vm_guest.h b/palacios/include/palacios/vm_guest.h
index 8e91634..078bbb9 100644
--- a/palacios/include/palacios/vm_guest.h
+++ b/palacios/include/palacios/vm_guest.h
@@ -125,9 +125,7 @@ struct guest_info {
 
     /* the logical cpu on which this core runs */
     uint32_t cpu_id;
-    /* the physical cpu on which this core runs */
-    uint32_t host_cpu_id;
-       
+     
 };
 
 
diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index 89e33d3..9b89e6c 100644
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -514,7 +514,7 @@ int v3_svm_enter(struct guest_info * info) {
 
     //V3_Print("Calling v3_svm_launch\n");
 
-    v3_svm_launch((vmcb_t *)V3_PAddr(info->vmm_data), &(info->vm_regs), (vmcb_t *)host_vmcbs[info->host_cpu_id]);
+    v3_svm_launch((vmcb_t *)V3_PAddr(info->vmm_data), &(info->vm_regs), (vmcb_t *)host_vmcbs[V3_Get_CPU()]);
 
     //V3_Print("SVM Returned: Exit Code: %x, guest_rip=%lx\n", (uint32_t)(guest_ctrl->exit_code), (unsigned long)guest_state->rip);
 
diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 9acfbd0..09b6ff6 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -39,7 +39,6 @@
 
 v3_cpu_arch_t v3_cpu_types[CONFIG_MAX_CPUS];
 struct v3_os_hooks * os_hooks = NULL;
-
 int v3_dbg_enable = 0;
 
 
@@ -204,12 +203,10 @@ static int start_core(void * p)
     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:
@@ -243,52 +240,67 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
     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
 
@@ -460,7 +472,7 @@ void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector) {
 
 
 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:
diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 8844dee..d97beac 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -292,7 +292,8 @@ static int determine_paging_mode(struct guest_info * info, v3_cfg_tree_t * core_
 
     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");
@@ -338,21 +339,9 @@ static int determine_paging_mode(struct guest_info * info, v3_cfg_tree_t * core_
 }
 
 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);
 
@@ -505,7 +494,6 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob, void * priv_data) {
 	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);
diff --git a/palacios/src/palacios/vmm_symbiotic.c b/palacios/src/palacios/vmm_symbiotic.c
index 3b41305..32ef348 100644
--- a/palacios/src/palacios/vmm_symbiotic.c
+++ b/palacios/src/palacios/vmm_symbiotic.c
@@ -32,11 +32,11 @@ static int cpuid_fn(struct guest_info * core, uint32_t cpuid,
 
     *eax = *(uint32_t *)"V3V";
 
-    if ((v3_cpu_types[core->host_cpu_id] == V3_SVM_CPU) || 
-	(v3_cpu_types[core->host_cpu_id] == V3_SVM_REV3_CPU)) {
+    if ((v3_cpu_types[0] == V3_SVM_CPU) || 
+	(v3_cpu_types[0] == V3_SVM_REV3_CPU)) {
 	*ebx = *(uint32_t *)"SVM";
-    } else if ((v3_cpu_types[core->host_cpu_id] == V3_VMX_CPU) || 
-	       (v3_cpu_types[core->host_cpu_id] == V3_VMX_EPT_CPU)) {
+    } else if ((v3_cpu_types[0] == V3_VMX_CPU) || 
+	       (v3_cpu_types[0] == V3_VMX_EPT_CPU)) {
 	*ebx = *(uint32_t *)"VMX";
     }