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.


Added ability to hook execution of arbitrary binary files. Added ability to add arbit...
[palacios.git] / palacios / src / palacios / vmm_intr.c
index a7f7924..46e2c70 100644 (file)
 #include <palacios/vmm.h>
 
 #include <palacios/vm_guest.h>
+#include <palacios/vmm_ctrl_regs.h>
 
-#ifndef DEBUG_INTERRUPTS
+#include <palacios/vmm_lock.h>
+#include <palacios/vm_guest_mem.h>
+#include <palacios/vmm_decoder.h>
+
+#ifndef CONFIG_DEBUG_INTERRUPTS
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
 
 
 
+struct intr_controller {
+    struct intr_ctrl_ops * ctrl_ops;
+    
+    void * priv_data;
+    struct list_head ctrl_node;
+};
+
+
+struct intr_router {
+    struct intr_router_ops * router_ops;
+
+    void * priv_data;
+    struct list_head router_node;
+
+};
+
+
+
+void v3_init_intr_controllers(struct guest_info * info) {
+    struct v3_intr_core_state * intr_state = &(info->intr_core_state);
+
+    intr_state->irq_pending = 0;
+    intr_state->irq_started = 0;
+    intr_state->irq_vector = 0;
+
+    v3_lock_init(&(intr_state->irq_lock));
+
+    INIT_LIST_HEAD(&(intr_state->controller_list));
+}
+
+
+void v3_deinit_intr_controllers(struct guest_info * core) {
+    struct v3_intr_core_state * intr_state = &(core->intr_core_state);
+    struct intr_controller * ctrlr;
+    struct intr_controller * tmp;
+
+    // clear out any controllers that were left around
+    list_for_each_entry_safe(ctrlr, tmp, &(intr_state->controller_list), ctrl_node) {
+       v3_remove_intr_controller(core, ctrlr);
+    }
+}
+
+
+void v3_init_intr_routers(struct v3_vm_info * vm) {
+    
+    INIT_LIST_HEAD(&(vm->intr_routers.router_list));
+    
+    v3_lock_init(&(vm->intr_routers.irq_lock));
+
+    memset((uchar_t *)(vm->intr_routers.hooks), 0, sizeof(struct v3_irq_hook *) * 256);
+}
+
+
+void v3_deinit_intr_routers(struct v3_vm_info * vm) {
+    struct intr_router * rtr = NULL;
+    struct intr_router * tmp = NULL;
+
+    // clear out any controllers that were left around
+    list_for_each_entry_safe(rtr, tmp, &(vm->intr_routers.router_list), router_node) {
+       v3_remove_intr_router(vm, rtr);
+    }  
+}
+
 
-void v3_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;
+void * v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * priv_data) {
+    struct intr_controller * ctrlr = (struct intr_controller *)V3_Malloc(sizeof(struct intr_controller));
 
-  memset((uchar_t *)(info->intr_state.hooks), 0, sizeof(struct v3_irq_hook *) * 256);
+    ctrlr->priv_data = priv_data;
+    ctrlr->ctrl_ops = ops;
 
-  info->vm_ops.raise_irq = &v3_raise_irq;
-  info->vm_ops.lower_irq = &v3_lower_irq; 
+    list_add(&(ctrlr->ctrl_node), &(info->intr_core_state.controller_list));
+    
+    return (void *)ctrlr;
 }
 
-void v3_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_remove_intr_controller(struct guest_info * core, void * handle) {
+    struct v3_intr_core_state * intr_state = &(core->intr_core_state);
+    struct intr_controller * ctrlr = handle;
+    struct intr_controller * tmp = NULL;
+    int found = 0;
+
+    // search for the entry in the router list
+    list_for_each_entry(tmp, &(intr_state->controller_list), ctrl_node) {
+       if (tmp == ctrlr) {
+           found = 1;
+       }
+    }
+
+    if (found == 0) {
+       PrintError("Attempted to remove invalid interrupt controller handle\n");
+       return;
+    }
+
+    list_del(&(ctrlr->ctrl_node));
+    V3_Free(ctrlr);
 }
 
 
+void * v3_register_intr_router(struct v3_vm_info * vm, struct intr_router_ops * ops, void * priv_data) {
+    struct intr_router * router = (struct intr_router *)V3_Malloc(sizeof(struct intr_router));
 
+    router->priv_data = priv_data;
+    router->router_ops = ops;
 
-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];
+    list_add(&(router->router_node), &(vm->intr_routers.router_list));
+    
+    return (void *)router;
 }
 
 
-int v3_hook_irq(struct guest_info * info, 
+void v3_remove_intr_router(struct v3_vm_info * vm, void * handle) {
+    struct intr_router * router = handle;
+    struct intr_router * tmp = NULL;
+    int found = 0;
+
+    // search for the entry in the router list
+    list_for_each_entry(tmp, &(vm->intr_routers.router_list), router_node) {
+       if (tmp == router) {
+           found = 1;
+       }
+    }
+
+    if (found == 0) {
+       PrintError("Attempted to remove invalid interrupt router\n");
+       return;
+    }
+
+    list_del(&(router->router_node));
+    V3_Free(router);
+}
+
+
+static inline struct v3_irq_hook * get_irq_hook(struct v3_vm_info * vm, uint8_t irq) {
+    return vm->intr_routers.hooks[irq];
+}
+
+
+int v3_hook_irq(struct v3_vm_info * vm,
                uint_t irq,
-               int (*handler)(struct guest_info * info, struct v3_interrupt * intr, void * priv_data),
+               int (*handler)(struct v3_vm_info * vm, 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(vm, 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;
+    vm->intr_routers.hooks[irq] = hook;
+
+    if (V3_Hook_Interrupt(vm, irq)) { 
+       PrintError("hook_irq: failed to hook irq %d\n", irq);
+       return -1;
+    } else {
+       PrintDebug("hook_irq: hooked irq %d\n", irq);
+       return 0;
+    }
+}
 
-  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 v3_vm_info * vm, struct v3_interrupt * intr, void * priv_data) {
+    PrintDebug("[passthrough_irq_handler] raise_irq=%d (guest=0x%p)\n", 
+              intr->irq, (void *)vm);
+
+    return v3_raise_irq(vm, intr->irq);
 }
 
 
+int v3_hook_passthrough_irq(struct v3_vm_info * vm, uint_t irq) {
+    int rc = v3_hook_irq(vm, irq, passthrough_irq_handler, NULL);
 
-static int passthrough_irq_handler(struct guest_info * info, struct v3_interrupt * intr, void * priv_data)
-{
+    if (rc) { 
+       PrintError("guest_irq_injection: failed to hook irq 0x%x (guest=0x%p)\n", irq, (void *)vm);
+       return -1;
+    } else {
+       PrintDebug("guest_irq_injection: hooked irq 0x%x (guest=0x%p)\n", irq, (void *)vm);
+       return 0;
+    }
+}
 
-  PrintDebug("[passthrough_irq_handler] raise_irq=%d (guest=0x%x)\n", intr->irq, info);
-  return v3_raise_irq(info, intr->irq);
 
+int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr) {
+    PrintDebug("v3_deliver_irq: irq=%d state=0x%p, \n", intr->irq, (void *)intr);
+  
+    struct v3_irq_hook * hook = get_irq_hook(vm, intr->irq);
+
+    if (hook == NULL) {
+       PrintError("Attempting to deliver interrupt to non registered hook(irq=%d)\n", intr->irq);
+       return -1;
+    }
+  
+    return hook->handler(vm, intr, hook->priv_data);
 }
 
-int v3_hook_passthrough_irq(struct guest_info * info, uint_t irq)
-{
 
-  int rc = v3_hook_irq(info, 
-                      irq,
-                      passthrough_irq_handler,
-                      NULL);
+int v3_raise_virq(struct guest_info * info, int irq) {
+    struct v3_intr_core_state * intr_state = &(info->intr_core_state);
+    int major = irq / 8;
+    int minor = irq % 8;
 
-  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);
+    intr_state->virq_map[major] |= (1 << minor);
+   
     return 0;
-  }
 }
 
 
+int v3_lower_virq(struct guest_info * info, int irq) {
+    struct v3_intr_core_state * intr_state = &(info->intr_core_state);
+    int major = irq / 8;
+    int minor = irq % 8;
+
+    intr_state->virq_map[major] &= ~(1 << minor);
 
+    return 0;
+}
 
 
-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);
-  
-  struct v3_irq_hook * hook = get_irq_hook(info, intr->irq);
+int v3_lower_irq(struct v3_vm_info * vm, int irq) {
+    struct intr_router * router = NULL;
+    struct v3_intr_routers * routers = &(vm->intr_routers);
 
-  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);
+    //    PrintDebug("[v3_lower_irq]\n");
+    addr_t irq_state = v3_lock_irqsave(routers->irq_lock);
+
+    list_for_each_entry(router, &(routers->router_list), router_node) {
+       router->router_ops->lower_intr(vm, router->priv_data, irq);
+    }
+    v3_unlock_irqrestore(routers->irq_lock, irq_state);
+
+    return 0;
 }
 
 
+int v3_raise_irq(struct v3_vm_info * vm, int irq) {
+    struct intr_router * router = NULL;
+    struct v3_intr_routers * routers = &(vm->intr_routers);
 
+    //  PrintDebug("[v3_raise_irq (%d)]\n", irq);
+    addr_t irq_state = v3_lock_irqsave(routers->irq_lock);
 
+    list_for_each_entry(router, &(routers->router_list), router_node) {
+       router->router_ops->raise_intr(vm, router->priv_data, irq);
+    }
 
+    v3_unlock_irqrestore(routers->irq_lock, irq_state);
 
+    return 0;
+}
+
+
+int v3_signal_swintr(struct guest_info * core, int vector) {
+    struct v3_intr_core_state * intr_state = &(core->intr_core_state);
+
+    PrintDebug("Signaling software interrupt in vmm_intr.c\n");
+    PrintDebug("\tINT vector: %d\n", vector);
+    
+    intr_state->swintr_posted = 1;
+    intr_state->swintr_vector = vector;
+    return 0;
+}
 
 
-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);
+int v3_handle_swintr(struct guest_info * core) {
 
-  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 ret = 0;
+    void * instr_ptr = NULL;
+    struct x86_instr instr;
 
-  return 0;
+    if (core->mem_mode == PHYSICAL_MEM) { 
+        ret = v3_gpa_to_hva(core, get_addr_linear(core, core->rip, &(core->segments.cs)), (addr_t *)&instr_ptr);
+    } else { 
+        ret = v3_gva_to_hva(core, get_addr_linear(core, core->rip, &(core->segments.cs)), (addr_t *)&instr_ptr);
+    }
+    
+    if (ret == -1) {
+        PrintError("V3 SWintr Handler: Could not translate Instruction Address (%p)\n", (void *)core->rip);
+        return -1;
+    }
+
+    if (v3_decode(core, (addr_t)instr_ptr, &instr) == -1) {
+        PrintError("V3 SWintr Handler: Decoding Error\n");
+        return -1;
+    }
+
+    uint8_t vector = instr.dst_operand.operand;
+
+    struct v3_swintr_hook * hook = core->intr_core_state.swintr_hooks[vector];
+    if (hook == NULL) {
+#ifdef CONFIG_SWINTR_PASSTHROUGH
+        if (v3_hook_passthrough_swintr(core, vector) == -1) {
+            PrintDebug("V3 SWintr Handler: Error hooking passthrough swintr\n");
+            return -1;
+        }
+        hook = core->intr_core_state.swintr_hooks[vector];
+#else
+        core->rip += instr.instr_length;
+        return v3_signal_swintr(core, vector);
+#endif
+    }
+
+    ret = hook->handler(core, vector, NULL);
+    if (ret == -1) {
+        PrintDebug("V3 SWintr Handler: Error in swintr hook\n");
+        return -1;
+    }
+
+    /* at some point we may need to prioritize swints 
+       so that they finish in time for the next
+       instruction */
+    core->rip += instr.instr_length;
+    return v3_signal_swintr(core, vector);
 }
 
-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;
+
+static inline struct v3_swintr_hook * get_swintr_hook(struct guest_info * core, uint8_t vector) {
+    return core->intr_core_state.swintr_hooks[vector];
 }
 
 
-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);
+int v3_hook_swintr(struct guest_info * core,
+        uint8_t vector,
+        int (*handler)(struct guest_info * core, uint8_t vector, void * priv_data),
+        void * priv_data) 
+{
 
-  PrintDebug("[v3_lower_irq]\n");
+    struct v3_swintr_hook * hook = (struct v3_swintr_hook *)V3_Malloc(sizeof(struct v3_swintr_hook));
 
-  if ((info->intr_state.controller) && 
-      (info->intr_state.controller->lower_intr)) {
-    info->intr_state.controller->lower_intr(info->intr_state.controller_state, irq);
-  } else {
-    PrintError("There is no registered Interrupt Controller... (NULL POINTER)\n");
-    return -1;
-  }
+    if (hook == NULL) { 
+        return -1; 
+    }
 
-  return 0;
-}
+    if (get_swintr_hook(core, vector) != NULL) {
+        PrintError("SWINT %d already hooked\n", vector);
+        return -1;
+    }
 
-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);
+    hook->handler = handler;
+    hook->priv_data = priv_data;
+  
+    core->intr_core_state.swintr_hooks[vector] = hook;
+
+    return 0;
+}
+    
 
-  PrintDebug("[v3_raise_irq]\n");
+static int passthrough_swintr_handler(struct guest_info * core, uint8_t vector, void * priv_data) {
 
-  if ((info->intr_state.controller) && 
-      (info->intr_state.controller->raise_intr)) {
-    info->intr_state.controller->raise_intr(info->intr_state.controller_state, irq);
-  } else {
-    PrintError("There is no registered Interrupt Controller... (NULL POINTER)\n");
-    return -1;
-  }
+    PrintDebug("[passthrough_swint_handler] INT vector=%d (guest=0x%p)\n", 
+              vector, (void *)core);
 
-  return 0;
+    return 0;
 }
 
 
-int v3_intr_pending(struct guest_info * info) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
+int v3_hook_passthrough_swintr(struct guest_info * core, uint8_t vector) {
 
-  //  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 rc = v3_hook_swintr(core, vector, passthrough_swintr_handler, NULL);
 
-  /* Check [A]PIC */
+    if (rc) { 
+        PrintError("guest_swintr_injection: failed to hook swint 0x%x (guest=0x%p)\n", vector, (void *)core);
+        return -1;
+    } else {
+        PrintDebug("guest_swintr_injection: hooked swint 0x%x (guest=0x%p)\n", vector, (void *)core);
+        return 0;
+    }
 
-  return 0;
+    /* shouldn't get here */
+    return 0;
 }
 
 
-uint_t v3_get_intr_number(struct guest_info * info) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
+void v3_clear_pending_intr(struct guest_info * core) {
+    struct v3_intr_core_state * intr_state = &(core->intr_core_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);
-  }
+    intr_state->irq_pending = 0;
+}
 
-  /* someway to get the [A]PIC intr */
 
-  return 0;
+v3_intr_type_t v3_intr_pending(struct guest_info * info) {
+    struct v3_intr_core_state * intr_state = &(info->intr_core_state);
+    struct intr_controller * ctrl = NULL;
+    int ret = V3_INVALID_INTR;
+    int i = 0;
+
+    //  PrintDebug("[intr_pending]\n");
+    addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock);
+
+    // VIRQs have priority
+    for (i = 0; i < MAX_IRQ / 8; i++) {
+       if (intr_state->virq_map[i] != 0) {   
+           ret = V3_VIRTUAL_IRQ;
+           break;
+       }
+    }
+
+    if (ret == V3_INVALID_INTR) {
+       list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+           if (ctrl->ctrl_ops->intr_pending(info, ctrl->priv_data) == 1) {
+               ret = V3_EXTERNAL_IRQ;
+               break;
+           }
+       }
+    }
+
+    // KCH: added for SWintr injection
+    if (intr_state->swintr_posted == 1) {
+        ret = V3_SOFTWARE_INTR;
+    }
+        
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
+
+    return ret;
 }
 
 
-intr_type_t v3_get_intr_type(struct guest_info * info) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
-
-  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;
+uint32_t v3_get_intr(struct guest_info * info) {
+    struct v3_intr_core_state * intr_state = &(info->intr_core_state);
+    struct intr_controller * ctrl = NULL;
+    uint_t ret = 0;
+    int i = 0;
+    int j = 0;
+
+    addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock);    
+
+    // virqs have priority
+    for (i = 0; i < MAX_IRQ / 8; i++) {
+       if (intr_state->virq_map[i] != 0) {
+           for (j = 0; j < 8; j++) {
+               if (intr_state->virq_map[i] & (1 << j)) {
+                   ret = (i * 8) + j;
+                   break;
+               }
+           }
+           break;
+       }
+    }
+
+    if (!ret) {
+       list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+           if (ctrl->ctrl_ops->intr_pending(info, ctrl->priv_data)) {
+               uint_t intr_num = ctrl->ctrl_ops->get_intr_number(info, ctrl->priv_data);
+               
+               //      PrintDebug("[get_intr_number] intr_number = %d\n", intr_num);
+               ret = intr_num;
+               break;
+           }
+       }
+    }
+
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
+
+    return ret;
 }
 
+/*
+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;
+    intr_type_t type = V3_INVALID_INTR;
+
+    addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock);  
+
+    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");
+           type = V3_EXTERNAL_IRQ;         
+           break;
+       }
+    }
+
+#ifdef CONFIG_DEBUG_INTERRUPTS
+    if (type == V3_INVALID_INTR) {
+       PrintError("[get_intr_type] Invalid_Intr\n");
+    }
+#endif
 
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
 
+    return type;
+}
+*/
 
 
+int v3_injecting_intr(struct guest_info * info, uint_t intr_num, v3_intr_type_t type) {
+    struct v3_intr_core_state * intr_state = &(info->intr_core_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 == V3_EXTERNAL_IRQ) {
+       struct intr_controller * ctrl = NULL;
 
-  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);
-  }
+       addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock); 
+
+       //      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(info, ctrl->priv_data, intr_num);
+       }
 
-  return 0;
+       v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
+    }
+
+    return 0;
 }