added support for Intel EPT with(?) and without unrestricted guest support

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

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index c890fda..ab26a6f 100644 (file)
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -72,17 +72,18 @@ static void deinit_cpu(void * arg) {
 
 
     switch (v3_cpu_types[cpu_id]) {
- #ifdef CONFIG_SVM
-       case V3_VMX_CPU:
-       case V3_VMX_EPT_CPU:
-           PrintDebug("Machine is SVM Capable\n");
+#ifdef CONFIG_SVM
+       case V3_SVM_CPU:
+       case V3_SVM_REV3_CPU:
+           PrintDebug("Deinitializing SVM CPU %d\n", cpu_id);
            v3_deinit_svm_cpu(cpu_id);
            break;
 #endif
 #ifdef CONFIG_VMX
-       case V3_SVM_CPU:
-       case V3_SVM_REV3_CPU:
-           PrintDebug("Machine is VMX Capable\n");
+       case V3_VMX_CPU:
+       case V3_VMX_EPT_CPU:
+       case V3_VMX_EPT_UG_CPU:
+           PrintDebug("Deinitializing VMX CPU %d\n", cpu_id);
            v3_deinit_vmx_cpu(cpu_id);
            break;
 #endif
@@ -183,14 +184,13 @@ v3_cpu_arch_t v3_get_cpu_type(int cpu_id) {
 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;
     }
 
+    V3_Print("CORE 0 RIP=%p\n", (void *)(addr_t)(vm->cores[0].rip));
+
     if (name == NULL) {
        name = "[V3_VM]";
     } else if (strlen(name) >= 128) {
@@ -222,6 +222,7 @@ static int start_core(void * p)
 #if CONFIG_VMX
        case V3_VMX_CPU:
        case V3_VMX_EPT_CPU:
+       case V3_VMX_EPT_UG_CPU:
            return v3_start_vmx_guest(core);
            break;
 #endif
@@ -266,43 +267,71 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
 
 
     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);
+       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;
+       int major = 0;
+       int minor = 0;
        void * core_thread = NULL;
        struct guest_info * core = &(vm->cores[vcore_id]);
+       char * specified_cpu = v3_cfg_val(core->core_cfg_data, "target_cpu");
+       uint32_t core_idx = 0;
+
+       if (specified_cpu != NULL) {
+           core_idx = atoi(specified_cpu);
+           
+           if ((core_idx < 0) || (core_idx >= MAX_CORES)) {
+               PrintError("Target CPU out of bounds (%d) (MAX_CORES=%d)\n", core_idx, MAX_CORES);
+           }
 
-       /* 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;
+           i--; // We reset the logical core idx. Not strictly necessary I guess... 
+       } else {
+
+           /* 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;
+           }
+           
+           core_idx = i;
        }
 
+       major = core_idx / 8;
+       minor = core_idx % 8;
+
+
        if ((core_mask[major] & (0x1 << minor)) == 0) {
            PrintError("Logical CPU %d not available for virtual core %d; not started\n",
-                      i, vcore_id);
+                      core_idx, vcore_id);
+
+           if (specified_cpu != NULL) {
+               PrintError("CPU was specified explicitly (%d). HARD ERROR\n", core_idx);
+               v3_stop_vm(vm);
+               return -1;
+           }
+
            continue;
-       } 
+       }
 
        PrintDebug("Starting virtual core %u on logical core %u\n", 
-                  vcore_id, i);
+                  vcore_id, core_idx);
        
        sprintf(core->exec_name, "%s-%u", vm->name, vcore_id);
 
        PrintDebug("run: core=%u, func=0x%p, arg=0x%p, name=%s\n",
-                  i, start_core, core, core->exec_name);
+                  core_idx, start_core, core, core->exec_name);
 
        // TODO: actually manage these threads instead of just launching them
-       core_thread = V3_CREATE_THREAD_ON_CPU(i, start_core, core, core->exec_name);
+       core_thread = V3_CREATE_THREAD_ON_CPU(core_idx, start_core, core, core->exec_name);
 
        if (core_thread == NULL) {
            PrintError("Thread launch failed\n");
+           v3_stop_vm(vm);
            return -1;
        }
 
@@ -314,6 +343,7 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
 
     if (start_core(&(vm->cores[0])) != 0) {
        PrintError("Error starting VM core 0\n");
+       v3_stop_vm(vm);
        return -1;
     }
 
@@ -345,8 +375,6 @@ int v3_stop_vm(struct v3_vm_info * vm) {
            break;
        }
 
-       V3_Print("Yielding\n");
-
        v3_yield(NULL);
     }
     
@@ -488,6 +516,7 @@ int v3_vm_enter(struct guest_info * info) {
 #if CONFIG_VMX
        case V3_VMX_CPU:
        case V3_VMX_EPT_CPU:
+       case V3_VMX_EPT_UG_CPU:
            return v3_vmx_enter(info);
            break;
 #endif