X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_handler.c;h=f4311cbb0557c41bab8ad297d71445c93ddcd3d8;hb=c535b3199977444c3aa2c44b852cc82ce659c5ff;hp=7c278d36ab0b52dad396eda88aee153c3042a9e5;hpb=4db5b116275d135e67c67b0781fc8c184e884001;p=palacios.git

diff --git a/palacios/src/palacios/svm_handler.c b/palacios/src/palacios/svm_handler.c
index 7c278d3..f4311cb 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>
 
 
 
@@ -73,13 +73,25 @@ int v3_handle_svm_exit(struct guest_info * info) {
 
     if ((info->intr_state.irq_pending == 1) && (guest_ctrl->guest_ctrl.V_IRQ == 0)) {
 	// Interrupt was taken in the guest
+	if (exit_code == VMEXIT_EXCP14) {
+	    PrintError("Page fault immeidately after interrupt injection (%d)\n", info->intr_state.irq_vector);
+	}
+
 #ifdef DEBUG_INTERRUPTS
-	    PrintDebug("Interrupt %d taken by guest\n", info->intr_state.irq_vector);
+	PrintDebug("Interrupt %d taken by guest\n", info->intr_state.irq_vector);
 #endif
-	v3_injecting_intr(info, info->intr_state.irq_vector, EXTERNAL_IRQ);
+	if (!guest_ctrl->exit_int_info.valid) {
+	    info->intr_state.irq_pending = 0;
+	    // PrintDebug("Injecting 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
+	}
     }
 
-    info->intr_state.irq_pending = 0;
+
   
 
     // Disable printing io exits due to bochs debug messages
@@ -241,12 +253,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
@@ -346,8 +366,14 @@ 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_excp_pending(info)) {
+    } else if (v3_excp_pending(info)) {
 	uint_t excp = v3_get_excp_number(info);
 		
 	guest_ctrl->EVENTINJ.type = SVM_INJECTION_EXCEPTION;