X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm.c;h=4e362b5bda526bd7d8b24d19521bbf1a60597901;hb=0c31bb41ac41d04a891a6eeff5bae398fa89b419;hp=aeed691b9c1cea440241989a801b747317d4b7f7;hpb=48aeb8816a1633ab97dd145289d5d0acd75387bb;p=palacios.git

diff --git a/palacios/src/palacios/svm.c b/palacios/src/palacios/svm.c
index aeed691..4e362b5 100644
--- a/palacios/src/palacios/svm.c
+++ b/palacios/src/palacios/svm.c
@@ -113,7 +113,7 @@ static void Init_VMCB_BIOS(vmcb_t * vmcb, struct guest_info * core) {
     
 
     ctrl_area->instrs.NMI = 1;
-    ctrl_area->instrs.SMI = 1;
+    ctrl_area->instrs.SMI = 0; // allow SMIs to run in guest
     ctrl_area->instrs.INIT = 1;
     ctrl_area->instrs.PAUSE = 1;
     ctrl_area->instrs.shutdown_evts = 1;
@@ -286,6 +286,9 @@ int v3_init_svm_vmcb(struct guest_info * info, v3_vm_class_t vm_class) {
 static int update_irq_exit_state(struct guest_info * info) {
     vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
 
+    // Fix for QEMU bug using EVENTINJ as an internal cache
+    guest_ctrl->EVENTINJ.valid = 0;
+
     if ((info->intr_core_state.irq_pending == 1) && (guest_ctrl->guest_ctrl.V_IRQ == 0)) {
 	
 #ifdef CONFIG_DEBUG_INTERRUPTS
@@ -441,8 +444,8 @@ int v3_svm_enter(struct guest_info * info) {
     guest_state->rip = info->rip;
     guest_state->rsp = info->vm_regs.rsp;
 
-#ifdef CONFIG_SYMBIOTIC
-    if (info->vm_info->sym_state.symcalls[info->cpu_id].sym_call_active == 0) {
+#ifdef CONFIG_SYMCALL
+    if (info->sym_core_state.symcall_state.sym_call_active == 0) {
 	update_irq_entry_state(info);
     }
 #else 
@@ -458,8 +461,8 @@ int v3_svm_enter(struct guest_info * info) {
       (void *)(addr_t)info->rip);
     */
 
-#ifdef CONFIG_SYMBIOTIC
-    if (info->vm_info->sym_state.symcalls[info->cpu_id].sym_call_active == 1) {
+#ifdef CONFIG_SYMCALL
+    if (info->sym_core_state.symcall_state.sym_call_active == 1) {
 	if (guest_ctrl->guest_ctrl.V_IRQ == 1) {
 	    V3_Print("!!! Injecting Interrupt during Sym call !!!\n");
 	}
@@ -467,10 +470,20 @@ int v3_svm_enter(struct guest_info * info) {
 #endif
 
 
+    rdtscll(tmp_tsc);
+    v3_update_time(info, (tmp_tsc - info->time_state.cached_host_tsc));
     rdtscll(info->time_state.cached_host_tsc);
-    guest_ctrl->TSC_OFFSET = info->time_state.guest_tsc - info->time_state.cached_host_tsc;
+    //    guest_ctrl->TSC_OFFSET = info->time_state.guest_tsc - info->time_state.cached_host_tsc;
 
     //V3_Print("Calling v3_svm_launch\n");
+
+
+#if 0
+    if (info->cpu_id==1) { 
+	V3_Print("Entering Core 1\n");
+	v3_print_guest_state(info);
+    }
+#endif
 	
     v3_svm_launch((vmcb_t *)V3_PAddr(info->vmm_data), &(info->vm_regs), (vmcb_t *)host_vmcbs[info->cpu_id]);
     
@@ -479,13 +492,14 @@ int v3_svm_enter(struct guest_info * info) {
 
     v3_last_exit = (uint32_t)(guest_ctrl->exit_code);
 
-    rdtscll(tmp_tsc);
+    //rdtscll(tmp_tsc);
+    //    v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc);
 
     //PrintDebug("SVM Returned\n");
     
     info->num_exits++;
 
-    v3_update_time(info, tmp_tsc - info->time_state.cached_host_tsc);
+
 
 
     // Save Guest state from VMCB
@@ -517,8 +531,8 @@ int v3_svm_enter(struct guest_info * info) {
     exit_info2 = guest_ctrl->exit_info2;
 
 
-#ifdef CONFIG_SYMBIOTIC
-    if (info->vm_info->sym_state.symcalls[info->cpu_id].sym_call_active == 0) {
+#ifdef CONFIG_SYMCALL
+    if (info->sym_core_state.symcall_state.sym_call_active == 0) {
 	update_irq_exit_state(info);
     }
 #else
@@ -534,12 +548,32 @@ int v3_svm_enter(struct guest_info * info) {
     v3_yield_cond(info);
 
 
+
+#if 0
+    if (info->cpu_id==1) { 
+	V3_Print("Exited Core 1, before handler\n");
+	v3_print_guest_state(info);
+	PrintDebugVMCB((vmcb_t*)(info->vmm_data));
+    }
+#endif
+
+
     if (v3_handle_svm_exit(info, exit_code, exit_info1, exit_info2) != 0) {
 	PrintError("Error in SVM exit handler\n");
 	return -1;
     }
 
 
+#if 0
+    if (info->cpu_id==1) { 
+	V3_Print("Exited Core 1, after handler\n");
+	v3_print_guest_state(info);
+	PrintDebugVMCB((vmcb_t*)(info->vmm_data));
+    }
+#endif
+
+
+
     return 0;
 }
 
@@ -549,8 +583,36 @@ int v3_start_svm_guest(struct guest_info *info) {
     //  vmcb_ctrl_t * guest_ctrl = GET_VMCB_CTRL_AREA((vmcb_t*)(info->vmm_data));
 
 
+    PrintDebug("Starting SVM core %u\n",info->cpu_id);
+    if (info->cpu_mode==INIT) { 
+	PrintDebug("SVM core %u: I am an AP in INIT mode, waiting for that to change\n",info->cpu_id);
+	while (info->cpu_mode==INIT) {
+	    v3_yield(info);
+	    //PrintDebug("SVM core %u: still waiting for INIT\n",info->cpu_id);
+	}
+	PrintDebug("SVM core %u: I am out of INIT\n",info->cpu_id);
+	if (info->cpu_mode==SIPI) { 
+	    PrintDebug("SVM core %u: I am waiting on a SIPI to set my starting address\n",info->cpu_id);
+	    while (info->cpu_mode==SIPI) {
+		v3_yield(info);
+		//PrintDebug("SVM core %u: still waiting for SIPI\n",info->cpu_id);
+	    }
+	}
+	PrintDebug("SVM core %u: I have my SIPI\n", info->cpu_id);
+    }
+
+    if (info->cpu_mode!=REAL) { 
+	PrintError("SVM core %u: I am not in REAL mode at launch!  Huh?!\n", info->cpu_id);
+	return -1;
+    }
+
+    PrintDebug("SVM core %u: I am starting at CS=0x%x (base=0x%p, limit=0x%x),  RIP=0x%p\n", 
+	       info->cpu_id, info->segments.cs.selector, (void*)(info->segments.cs.base), 
+	       info->segments.cs.limit,(void*)(info->rip));
+
+
 
-    PrintDebug("Launching SVM VM (vmcb=%p)\n", (void *)info->vmm_data);
+    PrintDebug("SVM core %u: Launching SVM VM (vmcb=%p)\n", info->cpu_id, (void *)info->vmm_data);
     //PrintDebugVMCB((vmcb_t*)(info->vmm_data));
     
     info->vm_info->run_state = VM_RUNNING;
@@ -565,29 +627,29 @@ int v3_start_svm_guest(struct guest_info *info) {
 	    
 	    info->vm_info->run_state = VM_ERROR;
 	    
-	    V3_Print("SVM ERROR!!\n"); 
+	    V3_Print("SVM core %u: SVM ERROR!!\n", info->cpu_id); 
 	    
 	    v3_print_guest_state(info);
 	    
-	    V3_Print("SVM Exit Code: %p\n", (void *)(addr_t)guest_ctrl->exit_code); 
+	    V3_Print("SVM core %u: SVM Exit Code: %p\n", info->cpu_id, (void *)(addr_t)guest_ctrl->exit_code); 
 	    
-	    V3_Print("exit_info1 low = 0x%.8x\n", *(uint_t*)&(guest_ctrl->exit_info1));
-	    V3_Print("exit_info1 high = 0x%.8x\n", *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info1)) + 4));
+	    V3_Print("SVM core %u: exit_info1 low = 0x%.8x\n", info->cpu_id, *(uint_t*)&(guest_ctrl->exit_info1));
+	    V3_Print("SVM core %u: exit_info1 high = 0x%.8x\n", info->cpu_id, *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info1)) + 4));
 	    
-	    V3_Print("exit_info2 low = 0x%.8x\n", *(uint_t*)&(guest_ctrl->exit_info2));
-	    V3_Print("exit_info2 high = 0x%.8x\n", *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info2)) + 4));
+	    V3_Print("SVM core %u: exit_info2 low = 0x%.8x\n", info->cpu_id, *(uint_t*)&(guest_ctrl->exit_info2));
+	    V3_Print("SVM core %u: exit_info2 high = 0x%.8x\n", info->cpu_id, *(uint_t *)(((uchar_t *)&(guest_ctrl->exit_info2)) + 4));
 	    
 	    linear_addr = get_addr_linear(info, info->rip, &(info->segments.cs));
 	    
 	    if (info->mem_mode == PHYSICAL_MEM) {
-		guest_pa_to_host_va(info, linear_addr, &host_addr);
+		v3_gpa_to_hva(info, linear_addr, &host_addr);
 	    } else if (info->mem_mode == VIRTUAL_MEM) {
-		guest_va_to_host_va(info, linear_addr, &host_addr);
+		v3_gva_to_hva(info, linear_addr, &host_addr);
 	    }
 	    
-	    V3_Print("Host Address of rip = 0x%p\n", (void *)host_addr);
+	    V3_Print("SVM core %u: Host Address of rip = 0x%p\n", info->cpu_id, (void *)host_addr);
 	    
-	    V3_Print("Instr (15 bytes) at %p:\n", (void *)host_addr);
+	    V3_Print("SVM core %u: Instr (15 bytes) at %p:\n", info->cpu_id, (void *)host_addr);
 	    v3_dump_mem((uint8_t *)host_addr, 15);
 	    
 	    v3_print_stack(info);
@@ -602,6 +664,9 @@ int v3_start_svm_guest(struct guest_info *info) {
 */
 	
     }
+
+    // Need to take down the other cores on error... 
+
     return 0;
 }