Palacios Public Git Repository

To checkout Palacios execute 

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute 
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.

projects / palacios.git / blobdiff
? search: re
summary | shortlog | log | commit | commitdiff | tree
raw
I think I might have fixed the SHUTDOWN bug...
[palacios.git] / palacios / src / palacios / vmm_intr.c
diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c
index 6bdca1a..e29285a 100644 (file)
--- a/palacios/src/palacios/vmm_intr.c
+++ b/palacios/src/palacios/vmm_intr.c
@@ -22,6 +22,7 @@
 #include <palacios/vmm.h>
 
 #include <palacios/vm_guest.h>
+#include <palacios/vmm_ctrl_regs.h>
 
 #ifndef DEBUG_INTERRUPTS
 #undef PrintDebug
@@ -31,28 +32,40 @@
 
 
 
-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;
+struct intr_controller {
+    struct intr_ctrl_ops * ctrl_ops;
 
-  memset((uchar_t *)(info->intr_state.hooks), 0, sizeof(struct v3_irq_hook *) * 256);
+    void * priv_data;
+    struct list_head ctrl_node;
+};
 
-  info->vm_ops.raise_irq = &v3_raise_irq;
-  info->vm_ops.lower_irq = &v3_lower_irq; 
+
+void v3_init_interrupt_state(struct guest_info * info) {
+
+    info->intr_state.irq_pending = 0;
+    info->intr_state.irq_vector = 0;
+
+    INIT_LIST_HEAD(&(info->intr_state.controller_list));
+
+    memset((uchar_t *)(info->intr_state.hooks), 0, sizeof(struct v3_irq_hook *) * 256);
 }
 
-void set_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state) {
-  info->intr_state.controller = ops;
-  info->intr_state.controller_state = state;
+void v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state) {
+    struct intr_controller * ctrlr = (struct intr_controller *)V3_Malloc(sizeof(struct intr_controller));
+
+    ctrlr->priv_data = state;
+    ctrlr->ctrl_ops = ops;
+
+    list_add(&(ctrlr->ctrl_node), &(info->intr_state.controller_list));
+
 }
 
 
 
 
 static inline struct v3_irq_hook * get_irq_hook(struct guest_info * info, uint_t irq) {
-  V3_ASSERT(irq <= 256);
-  return info->intr_state.hooks[irq];
+    V3_ASSERT(irq <= 256);
+    return info->intr_state.hooks[irq];
 }
 
 
@@ -61,56 +74,50 @@ int v3_hook_irq(struct guest_info * info,
                int (*handler)(struct guest_info * info, struct v3_interrupt * intr, void * priv_data),
                void  * priv_data) 
 {
-  struct v3_irq_hook * hook = (struct v3_irq_hook *)V3_Malloc(sizeof(struct v3_irq_hook));
+    struct v3_irq_hook * hook = (struct v3_irq_hook *)V3_Malloc(sizeof(struct v3_irq_hook));
 
-  if (hook == NULL) { 
-    return -1; 
-  }
+    if (hook == NULL) { 
+       return -1; 
+    }
 
-  if (get_irq_hook(info, irq) != NULL) {
-    PrintError("IRQ %d already hooked\n", irq);
-    return -1;
-  }
+    if (get_irq_hook(info, irq) != NULL) {
+       PrintError("IRQ %d already hooked\n", irq);
+       return -1;
+    }
 
-  hook->handler = handler;
-  hook->priv_data = priv_data;
+    hook->handler = handler;
+    hook->priv_data = priv_data;
   
-  info->intr_state.hooks[irq] = hook;
-
-  if (V3_Hook_Interrupt(info, irq)) { 
-    PrintError("hook_irq: failed to hook irq %d\n", irq);
-    return -1;
-  } else {
-    PrintDebug("hook_irq: hooked irq %d\n", irq);
-    return 0;
-  }
+    info->intr_state.hooks[irq] = hook;
+
+    if (V3_Hook_Interrupt(info, irq)) { 
+       PrintError("hook_irq: failed to hook irq %d\n", irq);
+       return -1;
+    } else {
+       PrintDebug("hook_irq: hooked irq %d\n", irq);
+       return 0;
+    }
 }
 
 
 
-static int passthrough_irq_handler(struct guest_info * info, struct v3_interrupt * intr, void * priv_data)
-{
-
-  PrintDebug("[passthrough_irq_handler] raise_irq=%d (guest=0x%x)\n", intr->irq, info);
-  return v3_raise_irq(info, intr->irq);
+static int passthrough_irq_handler(struct guest_info * info, struct v3_interrupt * intr, void * priv_data) {
+    PrintDebug("[passthrough_irq_handler] raise_irq=%d (guest=0x%p)\n", 
+              intr->irq, (void *)info);
 
+    return v3_raise_irq(info, intr->irq);
 }
 
-int v3_hook_passthrough_irq(struct guest_info * info, uint_t irq)
-{
+int v3_hook_passthrough_irq(struct guest_info * info, uint_t irq) {
+    int rc = v3_hook_irq(info, irq, passthrough_irq_handler, NULL);
 
-  int rc = v3_hook_irq(info, 
-                      irq,
-                      passthrough_irq_handler,
-                      NULL);
-
-  if (rc) { 
-    PrintError("guest_irq_injection: failed to hook irq 0x%x (guest=0x%x)\n", irq, info);
-    return -1;
-  } else {
-    PrintDebug("guest_irq_injection: hooked irq 0x%x (guest=0x%x)\n", irq, info);
-    return 0;
-  }
+    if (rc) { 
+       PrintError("guest_irq_injection: failed to hook irq 0x%x (guest=0x%p)\n", irq, (void *)info);
+       return -1;
+    } else {
+       PrintDebug("guest_irq_injection: hooked irq 0x%x (guest=0x%p)\n", irq, (void *)info);
+       return 0;
+    }
 }
 
 
@@ -118,16 +125,16 @@ int v3_hook_passthrough_irq(struct guest_info * info, uint_t irq)
 
 
 int v3_deliver_irq(struct guest_info * info, struct v3_interrupt * intr) {
-  PrintDebug("v3_deliver_irq: irq=%d state=0x%x, \n", intr->irq, intr);
+    PrintDebug("v3_deliver_irq: irq=%d state=0x%p, \n", intr->irq, (void *)intr);
   
-  struct v3_irq_hook * hook = get_irq_hook(info, intr->irq);
+    struct v3_irq_hook * hook = get_irq_hook(info, intr->irq);
 
-  if (hook == NULL) {
-    PrintError("Attempting to deliver interrupt to non registered hook(irq=%d)\n", intr->irq);
-    return -1;
-  }
+    if (hook == NULL) {
+       PrintError("Attempting to deliver interrupt to non registered hook(irq=%d)\n", intr->irq);
+       return -1;
+    }
   
-  return hook->handler(info, intr, hook->priv_data);
+    return hook->handler(info, intr, hook->priv_data);
 }
 
 
@@ -137,124 +144,87 @@ int v3_deliver_irq(struct guest_info * info, struct v3_interrupt * intr) {
 
 
 
-int v3_raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t error_code) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
 
-  if (intr_state->excp_pending == 0) {
-    intr_state->excp_pending = 1;
-    intr_state->excp_num = excp;
-    intr_state->excp_error_code = error_code;
-    intr_state->excp_error_code_valid = 1;
-    PrintDebug("[v3_raise_exception_with_error] error code: %x\n", error_code);
-  } else {
-    PrintError("exception already pending, currently not implemented\n");
-    return -1;
-  }
+int v3_lower_irq(struct guest_info * info, int irq) {
+    struct intr_controller * ctrl = NULL;
+    struct v3_intr_state * intr_state = &(info->intr_state);
 
-  return 0;
-}
+    //    PrintDebug("[v3_lower_irq]\n");
 
-int v3_raise_exception(struct guest_info * info, uint_t excp) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
-  PrintDebug("[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 {
-    PrintError("exception already pending, currently not implemented\n");
-    return -1;
-  }
-
-  return 0;
+    list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+       ctrl->ctrl_ops->lower_intr(ctrl->priv_data, irq);
+    }
+ 
+    return 0;
 }
 
+int v3_raise_irq(struct guest_info * info, int irq) {
+    struct intr_controller * ctrl = NULL;
+    struct v3_intr_state * intr_state = &(info->intr_state);
 
-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->lower_intr);
-
-  PrintDebug("[v3_lower_irq]\n");
-
-  if ((info->intr_state.controller) && 
-      (info->intr_state.controller->lower_intr)) {
-    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;
-  }
-
-  return 0;
-}
+    //  PrintDebug("[v3_raise_irq (%d)]\n", irq);
 
-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);
-
-  PrintDebug("[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;
+    list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+       ctrl->ctrl_ops->raise_intr(ctrl->priv_data, irq);
+    }
+
+    return 0;
 }
 
- 
 
-int intr_pending(struct guest_info * info) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
 
-  //  PrintDebug("[intr_pending]\n");
-  if (intr_state->excp_pending == 1) {
-    return 1;
-  } else if (intr_state->controller->intr_pending(intr_state->controller_state) == 1) {
-    return 1;
-  }
+int v3_intr_pending(struct guest_info * info) {
+    struct v3_intr_state * intr_state = &(info->intr_state);
+    struct intr_controller * ctrl = NULL;
+    struct rflags * flags = (struct rflags *)&(info->ctrl_regs.rflags);
+    //  PrintDebug("[intr_pending]\n");
+    
+    // Check if the guest has interrupts enabled
+    if (flags->intr == 0) {
+       return 0;
+    }
 
-  /* Check [A]PIC */
+    list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+       if (ctrl->ctrl_ops->intr_pending(ctrl->priv_data) == 1) {
+           return 1;
+       }
+    }
 
-  return 0;
-}
 
+    return 0;
+}
 
-uint_t get_intr_number(struct guest_info * info) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
-
-  if (intr_state->excp_pending == 1) {
-    return intr_state->excp_num;
-  } else if (intr_state->controller->intr_pending(intr_state->controller_state)) {
-    PrintDebug("[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);
-  }
 
-  /* someway to get the [A]PIC intr */
+uint_t v3_get_intr_number(struct guest_info * info) {
+    struct v3_intr_state * intr_state = &(info->intr_state);
+    struct intr_controller * ctrl = NULL;
 
-  return 0;
+    list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+       if (ctrl->ctrl_ops->intr_pending(ctrl->priv_data)) {
+           uint_t intr_num = ctrl->ctrl_ops->get_intr_number(ctrl->priv_data);
+           
+           //  PrintDebug("[get_intr_number] intr_number = %d\n", intr_num);
+           
+           return intr_num;
+       }
+    }
+    return 0;
 }
 
 
-intr_type_t get_intr_type(struct guest_info * info) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
+intr_type_t v3_get_intr_type(struct guest_info * info) {
+    struct v3_intr_state * intr_state = &(info->intr_state);
+    struct intr_controller * ctrl = NULL;
 
-  if (intr_state->excp_pending) {
-    PrintDebug("[get_intr_type] Exception\n");
-    return EXCEPTION;
-  } else if (intr_state->controller->intr_pending(intr_state->controller_state)) {
-    PrintDebug("[get_intr_type] External_irq\n");
-    return EXTERNAL_IRQ;
-  }
-    PrintDebug("[get_intr_type] Invalid_Intr\n");
-  return INVALID_INTR;
+    list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+       if (ctrl->ctrl_ops->intr_pending(ctrl->priv_data) == 1) {
+           //PrintDebug("[get_intr_type] External_irq\n");
+           return EXTERNAL_IRQ;
+       }
+    }
+
+    PrintError("[get_intr_type] Invalid_Intr\n");
+    return INVALID_INTR;
 }
 
 
@@ -262,20 +232,17 @@ intr_type_t get_intr_type(struct guest_info * info) {
 
 
 
-int injecting_intr(struct guest_info * info, uint_t intr_num, intr_type_t type) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
+int v3_injecting_intr(struct guest_info * info, uint_t intr_num, intr_type_t type) {
+    struct v3_intr_state * intr_state = &(info->intr_state);
 
-  if (type == EXCEPTION) {
-    PrintDebug("[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) {
-    PrintDebug("[injecting_intr] External_Irq with intr_num = %x\n", intr_num);
-    return intr_state->controller->begin_irq(intr_state->controller_state, intr_num);
-  }
+    if (type == EXTERNAL_IRQ) {
+       struct intr_controller * ctrl = NULL;
 
-  return 0;
+       //      PrintDebug("[injecting_intr] External_Irq with intr_num = %x\n", intr_num);
+       list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+           ctrl->ctrl_ops->begin_irq(ctrl->priv_data, intr_num);
+       }
+    }
+
+    return 0;
 }
Public Palacios Development Repository for the V3VEE Project