X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=823652ac0d0b1e62c24d37c79ab2cf26549ef762;hb=4b93282ac2e60cd4d74b1e0be8ac758933140413;hp=ca42f017a99aefbd8e2424259aa65fbaff1bb3b0;hpb=fa7a42a55338e5fa49ec760b367225ca752df4fd;p=palacios-OLD.git

diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c
index ca42f01..823652a 100644
--- a/palacios/src/palacios/vmm_intr.c
+++ b/palacios/src/palacios/vmm_intr.c
@@ -3,13 +3,25 @@
 
 #include <palacios/vm_guest.h>
 
-
+#ifndef DEBUG_INTERRUPTS
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
+
+#ifdef DEBUG_RAMDISK
+#define Ramdisk_Print_Intr(_f, _a...) PrintTrace("\nvmm_intr.c(%d) "_f, __LINE__, ## _a)
+#else
+#define Ramdisk_Print_Intr(_f, _a...)
+#endif
+
+/*Zheng 07/30/2008*/
 void init_interrupt_state(struct guest_info * info) {
   info->intr_state.excp_pending = 0;
   info->intr_state.excp_num = 0;
   info->intr_state.excp_error_code = 0;
 
   info->vm_ops.raise_irq = &v3_raise_irq;
+  info->vm_ops.lower_irq = &v3_lower_irq; //Zheng added
 }
 
 void set_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state) {
@@ -19,19 +31,86 @@ void set_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, v
 
 
 
+// This structure is used to dispatch
+// interrupts delivered to vmm via deliver interrupt to vmm 
+// it is what we put into the opaque field given to 
+// the host os when we install the handler
+struct vmm_intr_decode { 
+  void              (*handler)(struct vmm_intr_state *state);
+  // This opaque is user supplied by the caller
+  // of hook_irq_new
+  void              *opaque;
+};
+
+int v3_hook_irq(uint_t irq,
+	     void (*handler)(struct vmm_intr_state *state),
+	     void  *opaque)
+{
+  struct vmm_intr_decode *d = (struct vmm_intr_decode *)V3_Malloc(sizeof(struct vmm_intr_decode));
+
+  if (!d) { return -1; }
+
+  d->handler = handler;
+  d->opaque = opaque;
+  
+  if (V3_Hook_Interrupt(irq,d)) { 
+    PrintError("hook_irq: failed to hook irq 0x%x to decode 0x%x\n", irq,d);
+    return -1;
+  } else {
+    PrintDebug("hook_irq: hooked irq 0x%x to decode 0x%x\n", irq,d);
+    return 0;
+  }
+}
+
+
+void deliver_interrupt_to_vmm(struct vmm_intr_state *state)
+{
+
+  PrintDebug("deliver_interrupt_to_vmm: state=0x%x\n",state);
+
+  struct vmm_intr_decode *d = (struct vmm_intr_decode *)(state->opaque);
+  
+  void *temp = state->opaque;
+  state->opaque = d->opaque;
 
+  d->handler(state);
+  
+  state->opaque=temp;
+}
+
+
+static void guest_injection_irq_handler(struct vmm_intr_state *state)
+{
+  PrintDebug("guest_irq_injection: state=0x%x\n",state);
 
+  struct guest_info *guest = (struct guest_info *)(state->opaque);
 
+  PrintDebug("guest_irq_injection: injecting irq 0x%x into guest 0x%x\n",state->irq,guest);
+  Ramdisk_Print_Intr("[guest_injection_irq_handler] raise_irq = %x\n", state->irq);
+  guest->vm_ops.raise_irq(guest,state->irq);
+}
 
 
+int v3_hook_irq_for_guest_injection(struct guest_info *info, int irq)
+{
 
-int hook_irq(struct guest_info * info, int irq) {
-  extern struct vmm_os_hooks * os_hooks;
+  int rc = v3_hook_irq(irq,
+		       guest_injection_irq_handler,
+		       info);
 
-  return os_hooks->hook_interrupt(info, irq);
+  if (rc) { 
+    PrintError("guest_irq_injection: failed to hook irq 0x%x for guest 0x%x\n", irq,info);
+    return -1;
+  } else {
+    PrintDebug("guest_irq_injection: hooked irq 0x%x for guest 0x%x\n", irq,info);
+    return 0;
+  }
 }
 
-int raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t error_code) {
+
+
+
+int v3_raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t error_code) {
   struct vm_intr * intr_state = &(info->intr_state);
 
   if (intr_state->excp_pending == 0) {
@@ -40,40 +119,45 @@ int raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t err
     intr_state->excp_error_code = error_code;
     intr_state->excp_error_code_valid = 1;
     PrintDebug("Raising exception with error code: %x\n", error_code);
+    Ramdisk_Print_Intr("[v3_raise_exception_with_error] error code: %x\n", error_code);
   } else {
-    PrintDebug("exception already pending, currently not implemented\n");
+    PrintError("exception already pending, currently not implemented\n");
+    Ramdisk_Print_Intr("[v3_raise_exception_with_error] not implemented\n");
     return -1;
   }
 
   return 0;
 }
 
-int raise_exception(struct guest_info * info, uint_t excp) {
+int v3_raise_exception(struct guest_info * info, uint_t excp) {
   struct vm_intr * intr_state = &(info->intr_state);
-
+  Ramdisk_Print_Intr("[v3_raise_exception]\n");
   if (intr_state->excp_pending == 0) {
     intr_state->excp_pending = 1;
     intr_state->excp_num = excp;
     intr_state->excp_error_code = 0;
     intr_state->excp_error_code_valid = 0;
   } else {
-    PrintDebug("exception already pending, currently not implemented\n");
+    PrintError("exception already pending, currently not implemented\n");
     return -1;
   }
 
   return 0;
 }
 
+/*Zheng 07/30/2008*/
 
-int v3_raise_irq(struct guest_info * info, int irq) {
+int v3_lower_irq(struct guest_info * info, int irq) {
   // Look up PIC and resend
   V3_ASSERT(info);
   V3_ASSERT(info->intr_state.controller);
   V3_ASSERT(info->intr_state.controller->raise_intr);
 
+  Ramdisk_Print_Intr("[v3_lower_irq]\n");
+
   //  if ((info->intr_state.controller) && 
   //  (info->intr_state.controller->raise_intr)) {
-    info->intr_state.controller->raise_intr(info->intr_state.controller_state, irq);
+    info->intr_state.controller->lower_intr(info->intr_state.controller_state, irq);
     //} else {
     // PrintDebug("There is no registered Interrupt Controller... (NULL POINTER)\n");
     // return -1;
@@ -81,19 +165,30 @@ int v3_raise_irq(struct guest_info * info, int irq) {
   return 0;
 }
 
+int v3_raise_irq(struct guest_info * info, int irq) {
+  // Look up PIC and resend
+  V3_ASSERT(info);
+  V3_ASSERT(info->intr_state.controller);
+  V3_ASSERT(info->intr_state.controller->raise_intr);
 
+  Ramdisk_Print_Intr("[v3_raise_irq]\n");
 
+  //  if ((info->intr_state.controller) && 
+  //  (info->intr_state.controller->raise_intr)) {
+    info->intr_state.controller->raise_intr(info->intr_state.controller_state, irq);
+    //} else {
+    // PrintDebug("There is no registered Interrupt Controller... (NULL POINTER)\n");
+    // return -1;
+    //}
+  return 0;
+}
 
-
-
-
-
-
-
+ 
 
 int intr_pending(struct guest_info * info) {
   struct vm_intr * intr_state = &(info->intr_state);
 
+  //  Ramdisk_Print_Intr("[intr_pending]\n");
   if (intr_state->excp_pending == 1) {
     return 1;
   } else if (intr_state->controller->intr_pending(intr_state->controller_state) == 1) {
@@ -112,6 +207,7 @@ uint_t get_intr_number(struct guest_info * info) {
   if (intr_state->excp_pending == 1) {
     return intr_state->excp_num;
   } else if (intr_state->controller->intr_pending(intr_state->controller_state)) {
+    Ramdisk_Print_Intr("[get_intr_number] intr_number = %d\n", intr_state->controller->get_intr_number(intr_state->controller_state));
     return intr_state->controller->get_intr_number(intr_state->controller_state);
   }
 
@@ -125,11 +221,13 @@ intr_type_t get_intr_type(struct guest_info * info) {
  struct vm_intr * intr_state = &(info->intr_state);
 
   if (intr_state->excp_pending) {
+    Ramdisk_Print_Intr("[get_intr_type] Exception\n");
     return EXCEPTION;
   } else if (intr_state->controller->intr_pending(intr_state->controller_state)) {
+    Ramdisk_Print_Intr("[get_intr_type] External_irq\n");
     return EXTERNAL_IRQ;
   }
-
+    Ramdisk_Print_Intr("[get_intr_type] Invalid_Intr\n");
   return INVALID_INTR;
 }
 
@@ -142,13 +240,14 @@ int injecting_intr(struct guest_info * info, uint_t intr_num, intr_type_t type)
   struct vm_intr * intr_state = &(info->intr_state);
 
   if (type == EXCEPTION) {
-
+    Ramdisk_Print_Intr("[injecting_intr] Exception\n");
     intr_state->excp_pending = 0;
     intr_state->excp_num = 0;
     intr_state->excp_error_code = 0;
     intr_state->excp_error_code_valid = 0;
     
   } else if (type == EXTERNAL_IRQ) {
+    Ramdisk_Print_Intr("[injecting_intr] External_Irq with intr_num = %x\n", intr_num);
     return intr_state->controller->begin_irq(intr_state->controller_state, intr_num);
   }