X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=6d38fb7cc38bbf79f05d22bbc3b6448056ff5558;hb=a7dc3322984b3c76fe990de506418e180ec1b0de;hp=4d5ce3e46e2684ccc5ae606cf44e36b137290b4b;hpb=0b276ccfe1caf79b6c2752bf26d0e9933e52fb32;p=palacios.git

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index 4d5ce3e..6d38fb7 100644
--- a/palacios/src/palacios/svm_handler.c
+++ b/palacios/src/palacios/svm_handler.c
@@ -32,7 +32,7 @@
 #include <palacios/svm_msr.h>
 #include <palacios/vmm_profiler.h>
 #include <palacios/vmm_hypercall.h>
-
+#include <palacios/vmm_direct_paging.h>
 
 
 
@@ -71,19 +71,28 @@ int v3_handle_svm_exit(struct guest_info * info) {
     exit_code = guest_ctrl->exit_code;
 
 
-    if ((info->intr_state.irq_pending) && (guest_ctrl->guest_ctrl.V_IRQ = 0)) {
-	// Interrupt was taken in the guest
-	v3_injecting_intr(info, info->intr_state.irq_vector, EXTERNAL_IRQ);
-	info->intr_state.irq_pending = 0;
+    if ((info->intr_state.irq_pending == 1) && (guest_ctrl->guest_ctrl.V_IRQ == 0)) {
+
+#ifdef DEBUG_INTERRUPTS
+	PrintDebug("Interrupt %d taken by guest\n", info->intr_state.irq_vector);
+#endif
+	if (!guest_ctrl->exit_int_info.valid) {
+	    info->intr_state.irq_pending = 0;
+	    // PrintDebug("Injected Interrupt %d\n", info->intr_state.irq_vector);
+	    v3_injecting_intr(info, info->intr_state.irq_vector, EXTERNAL_IRQ);
+	} else {
+#ifdef DEBUG_INTERRUPTS
+	    PrintDebug("EXIT INT INFO is set (vec=%d)\n", guest_ctrl->exit_int_info.vector);
+#endif
+	}
     }
 
+
   
 
     // Disable printing io exits due to bochs debug messages
     //if (!((exit_code == VMEXIT_IOIO) && ((ushort_t)(guest_ctrl->exit_info1 >> 16) == 0x402))) {
     
-    
-    //  PrintDebug("SVM Returned: Exit Code: 0x%x \t\t(tsc=%ul)\n",exit_code, (uint_t)info->time_state.guest_tsc); 
   
     if ((0) && (exit_code <= VMEXIT_EXCP14)) {
 	uchar_t instr[32];
@@ -130,7 +139,7 @@ int v3_handle_svm_exit(struct guest_info * info) {
     switch (exit_code) {
 	case VMEXIT_IOIO: {
 	    struct svm_io_info * io_info = (struct svm_io_info *)&(guest_ctrl->exit_info1);
-		
+
 	    if (io_info->type == 0) {
 		if (io_info->str) {
 
@@ -238,12 +247,20 @@ int v3_handle_svm_exit(struct guest_info * info) {
 	    }
 	    break;
 	} 
-	case VMEXIT_NPF: 
+ 	case VMEXIT_NPF: {
+	    addr_t fault_addr = guest_ctrl->exit_info2;
+	    pf_error_t * error_code = (pf_error_t *)&(guest_ctrl->exit_info1);
 
-	    PrintError("Currently unhandled Nested Page Fault\n");
-	    return -1;
-		
+	    if (info->shdw_pg_mode == NESTED_PAGING) {
+		if (v3_handle_nested_pagefault(info, fault_addr, *error_code) == -1) {
+		    return -1;
+		}
+	    } else {
+		PrintError("Currently unhandled Nested Page Fault\n");
+		return -1;
+		    }
 	    break;
+	    }
 	case VMEXIT_INVLPG: 
 	    if (info->shdw_pg_mode == SHADOW_PAGING) {
 #ifdef DEBUG_SHADOW_PAGING
@@ -343,8 +360,36 @@ int v3_handle_svm_exit(struct guest_info * info) {
 
 
     // Update the low level state
+    if (info->intr_state.irq_pending == 1) {
+
+	guest_ctrl->guest_ctrl.V_IRQ = 1;
+	guest_ctrl->guest_ctrl.V_INTR_VECTOR = info->intr_state.irq_vector;
+	guest_ctrl->guest_ctrl.V_IGN_TPR = 1;
+	guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf;
 
-    if (v3_intr_pending(info)) {
+    } else if (v3_excp_pending(info)) {
+	uint_t excp = v3_get_excp_number(info);
+		
+	guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION;
+	
+	if (info->excp_state.excp_error_code_valid) {
+	    guest_ctrl->EVENTINJ.error_code = info->excp_state.excp_error_code;
+	    guest_ctrl->EVENTINJ.ev = 1;
+#ifdef DEBUG_INTERRUPTS
+	    PrintDebug("Injecting exception %d with error code %x\n", excp, guest_ctrl->EVENTINJ.error_code);
+#endif
+	}
+	
+	guest_ctrl->EVENTINJ.vector = excp;
+	
+	guest_ctrl->EVENTINJ.valid = 1;
+#ifdef DEBUG_INTERRUPTS
+	PrintDebug("Injecting Exception %d (EIP=%p)\n", 
+		   guest_ctrl->EVENTINJ.vector, 
+		   (void *)(addr_t)info->rip);
+#endif
+	v3_injecting_excp(info, excp);
+    } else if (v3_intr_pending(info)) {
 
 	switch (v3_get_intr_type(info)) {
 	    case EXTERNAL_IRQ: {
@@ -352,54 +397,26 @@ int v3_handle_svm_exit(struct guest_info * info) {
 		    
 		// check to see if ==-1 (non exists)
 		    
-		/*	
-		  guest_ctrl->EVENTINJ.vector = irq;
-		  guest_ctrl->EVENTINJ.valid = 1;
-		  guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXTERNAL_INTR;
-		*/
 		    
 		guest_ctrl->guest_ctrl.V_IRQ = 1;
 		guest_ctrl->guest_ctrl.V_INTR_VECTOR = irq;
 		guest_ctrl->guest_ctrl.V_IGN_TPR = 1;
 		guest_ctrl->guest_ctrl.V_INTR_PRIO = 0xf;
+
 #ifdef DEBUG_INTERRUPTS
 		PrintDebug("Injecting Interrupt %d (EIP=%p)\n", 
 			   guest_ctrl->guest_ctrl.V_INTR_VECTOR, 
 			   (void *)(addr_t)info->rip);
 #endif
+
 		info->intr_state.irq_pending = 1;
 		info->intr_state.irq_vector = irq;
-
 		    
 		break;
 	    }
 	    case NMI:
 		guest_ctrl->EVENTINJ.type = SVM_INJECTION_NMI;
 		break;
-	    case EXCEPTION: {
-		uint_t excp = v3_get_intr_number(info);
-		
-		guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION;
-		
-		if (info->intr_state.excp_error_code_valid) {  //PAD
-		    guest_ctrl->EVENTINJ.error_code = info->intr_state.excp_error_code;
-		    guest_ctrl->EVENTINJ.ev = 1;
-#ifdef DEBUG_INTERRUPTS
-		    PrintDebug("Injecting error code %x\n", guest_ctrl->EVENTINJ.error_code);
-#endif
-		}
-		
-		guest_ctrl->EVENTINJ.vector = excp;
-		
-		guest_ctrl->EVENTINJ.valid = 1;
-#ifdef DEBUG_INTERRUPTS
-		PrintDebug("Injecting Interrupt %d (EIP=%p)\n", 
-			   guest_ctrl->EVENTINJ.vector, 
-			   (void *)(addr_t)info->rip);
-#endif
-		v3_injecting_intr(info, excp, EXCEPTION);
-		break;
-	    }
 	    case SOFTWARE_INTR:
 		guest_ctrl->EVENTINJ.type = SVM_INJECTION_SOFT_INTR;
 		break;
@@ -413,12 +430,9 @@ int v3_handle_svm_exit(struct guest_info * info) {
 		return -1;
 	}
 	
-    } else {
-#ifdef DEBUG_INTERRUPTS
-	PrintDebug("No interrupts/exceptions pending\n");
-#endif
     }
-    
+
+
     guest_state->cr0 = info->ctrl_regs.cr0;
     guest_state->cr2 = info->ctrl_regs.cr2;
     guest_state->cr3 = info->ctrl_regs.cr3;