Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Implemented SMP, still not functional
[palacios.git] / palacios / src / palacios / vmm.c
index 5811cba..dae7d34 100644 (file)
@@ -129,37 +129,103 @@ struct v3_vm_info * v3_create_vm(void * cfg) {
 }
 
 
-int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
-    int i = 0;
-    V3_Print("V3 --  Starting VM\n");
+static int start_core(void *p)
+{
+    struct guest_info * info = (struct guest_info*)p;
 
 
-    for (i = 0; i < vm->num_cores; i++) {
-       struct guest_info * info = &(vm->cores[i]);
+    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
 
-       /* GRUESOM HACK... */
-       //      vm->cpu_id = v3_get_cpu_id();
 
-       switch (v3_cpu_types[info->cpu_id]) {
+    switch (v3_cpu_types[info->cpu_id]) {
 #ifdef CONFIG_SVM
-           case V3_SVM_CPU:
-           case V3_SVM_REV3_CPU:
-               return v3_start_svm_guest(info);
-               break;
+       case V3_SVM_CPU:
+       case V3_SVM_REV3_CPU:
+           return v3_start_svm_guest(info);
+           break;
 #endif
 #if CONFIG_VMX
-           case V3_VMX_CPU:
-           case V3_VMX_EPT_CPU:
-               return v3_start_vmx_guest(info);
-               break;
+       case V3_VMX_CPU:
+       case V3_VMX_EPT_CPU:
+           return v3_start_vmx_guest(info);
+           break;
 #endif
-           default:
-               PrintError("Attemping to enter a guest on an invalid CPU\n");
-               return -1;
+       default:
+           PrintError("Attemping to enter a guest on an invalid CPU\n");
+           return -1;
+    }
+    // should not happen
+    return 0;
+}
+
+
+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;
+}
+
+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];
+
+    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;
        }
+
+       proc_to_use=get_next_core(cpu_mask,last_proc);
+       last_proc=proc_to_use;
+
+       PrintDebug("Starting virtual core %u on logical core %u\n",i,proc_to_use);
+       
+       sprintf(tname,"core%u",i);
+
+       PrintDebug("run: core=%u, func=0x%p, arg=0x%p, name=%s\n",
+                  proc_to_use, start_core, &(vm->cores[i]), 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))) { 
+           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;
     }
 
     return 0;
+
 }