reverted host_cpu_id changes because it broke multicore functionality

[palacios.git] / palacios / src / palacios / vmm.c

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index a7e83cc..09b6ff6 100644 (file)
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -21,7 +21,6 @@
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_config.h>
 #include <palacios/vm_guest.h>
-#include <palacios/vmm_instrument.h>
 #include <palacios/vmm_ctrl_regs.h>
 #include <palacios/vmm_lowlevel.h>
 #include <palacios/vmm_sprintf.h>
@@ -40,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;
 
 
@@ -67,29 +65,33 @@ static void init_cpu(void * arg) {
     }
 }
 
-#if 0
+
 static void deinit_cpu(void * arg) {
-//    uint32_t cpu_id = (uint32_t)(addr_t)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 
+    switch (v3_cpu_types[cpu_id]) {
+ #ifdef CONFIG_SVM
+       case V3_VMX_CPU:
+       case V3_VMX_EPT_CPU:
+           PrintDebug("Machine is SVM Capable\n");
+           v3_deinit_svm_cpu(cpu_id);
+           break;
 #endif
 #ifdef CONFIG_VMX
-    if (v3_is_vmx_capable()) {
-       PrintDebug("Machine is VMX Capable\n");
-       //v3_deinit_vmx_cpu(cpu_id);
-
-    } else 
+       case V3_SVM_CPU:
+       case V3_SVM_REV3_CPU:
+           PrintDebug("Machine is VMX Capable\n");
+           v3_deinit_vmx_cpu(cpu_id);
+           break;
 #endif
-    {
-       PrintError("CPU has no virtualization Extensions\n");
+       case V3_INVALID_CPU:
+       default:
+           PrintError("CPU has no virtualization Extensions\n");
+           break;
     }
 }
-#endif
+
 
 
 void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
@@ -115,10 +117,6 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
     V3_init_symmod();
 #endif
 
-#ifdef CONFIG_INSTRUMENT_VMM
-    v3_init_instrumentation();
-#endif
-
 
 #ifdef CONFIG_VNET
     v3_init_vnet();
@@ -142,30 +140,25 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
 
 
 void Shutdown_V3() {
-    //  int i;
+    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)) {
+    if ((os_hooks) && (os_hooks->call_on_cpu)) {
        for (i = 0; i < CONFIG_MAX_CPUS; i++) {
            if (v3_cpu_types[i] != V3_INVALID_CPU) {
-               deinit_cpu(i);
+               deinit_cpu((void *)(addr_t)i);
            }
        }
     }
@@ -173,8 +166,6 @@ void Shutdown_V3() {
     deinit_cpu(0);
 #endif
 
-#endif
-
 }
 
 
@@ -212,12 +203,10 @@ static int start_core(void * p)
     struct guest_info * core = (struct guest_info *)p;
 
 
-    PrintDebug("core %u: in start_core (RIP=%p)\n", 
+    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->cpu_id]) {
+    switch (v3_cpu_types[0]) {
 #ifdef CONFIG_SVM
        case V3_SVM_CPU:
        case V3_SVM_REV3_CPU:
@@ -249,36 +238,32 @@ static int start_core(void * p)
 
 int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
     uint32_t i;
-#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;
-
-
+    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));
 
+
     // 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 (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++) {
@@ -287,14 +272,15 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
        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
+           // We skip the local CPU because it is reserved for vcore 0
            continue;
        }
 
-
        if ((core_mask[major] & (0x1 << minor)) == 0) {
-           // cpuid not set in cpu_mask
+           PrintError("Logical CPU %d not available for virtual core %d; not started\n",
+                      i, vcore_id);
            continue;
        } 
 
@@ -486,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->cpu_id]) {
+    switch (v3_cpu_types[0]) {
 #ifdef CONFIG_SVM
        case V3_SVM_CPU:
        case V3_SVM_REV3_CPU: