X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=1510d7c996fdf16d990324a2d45883a168f18e43;hb=4c4382c3fa7e7e87c260b6bb473220d0081ca1d5;hp=66ce9c0a2520193018247dfd6d041ff243cc8d65;hpb=65b032e18e7f439d61d682c79884c2d017be6c4d;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c
index 66ce9c0..1510d7c 100644
--- a/palacios/src/palacios/vmm.c
+++ b/palacios/src/palacios/vmm.c
@@ -33,6 +33,10 @@
 #include <palacios/vmx.h>
 #endif
 
+#ifdef CONFIG_VNET
+#include <palacios/vmm_vnet.h>
+#endif
+
 
 v3_cpu_arch_t v3_cpu_types[CONFIG_MAX_CPUS];
 struct v3_os_hooks * os_hooks = NULL;
@@ -59,7 +63,7 @@ static void init_cpu(void * arg) {
     } else 
 #endif
     {
-       PrintError("CPU has no virtualization Extensions\n");
+       PrintError("CPU has no virtualizationExtensions\n");
     }
 }
 
@@ -92,6 +96,11 @@ void Init_V3(struct v3_os_hooks * hooks, int num_cpus) {
     v3_init_instrumentation();
 #endif
 
+
+#ifdef CONFIG_VNET
+    v3_init_vnet();
+#endif
+
     if ((hooks) && (hooks->call_on_cpu)) {
 
 	for (i = 0; i < num_cpus; i++) {
@@ -120,37 +129,109 @@ 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("Attempting 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;
+
+	// vm->cores[i].cpu_id=i;
+	// vm->cores[i].physical_cpu_id=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;
 	}
     }
 
+    // vm->cores[0].cpu_id=0;
+    // vm->cores[0].physical_cpu_id=0;
+
+    // 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;
+
 }
 
 
@@ -242,11 +323,11 @@ void v3_print_cond(const char * fmt, ...) {
 
 
 
-void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu) {
+void v3_interrupt_cpu(struct v3_vm_info * vm, int logical_cpu, int vector) {
     extern struct v3_os_hooks * os_hooks;
 
     if ((os_hooks) && (os_hooks)->interrupt_cpu) {
-	(os_hooks)->interrupt_cpu(vm, logical_cpu);
+	(os_hooks)->interrupt_cpu(vm, logical_cpu, vector);
     }
 }