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.


fixes for single core guest on multicore capable systeM
[palacios.git] / palacios / src / palacios / vmm_intr.c
index 46e1e42..87b6802 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>
+
+#ifndef CONFIG_DEBUG_INTERRUPTS
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
 
 
 
-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;
+struct intr_controller {
+    struct intr_ctrl_ops * ctrl_ops;
+    
+    void * priv_data;
+    struct list_head ctrl_node;
+};
 
-  memset((uchar_t *)(info->intr_state.hooks), 0, sizeof(struct v3_irq_hook *) * 256);
-}
 
-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;
-}
+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);
 
-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];
+    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_init_intr_routers(struct v3_vm_info * vm) {
+    
+    INIT_LIST_HEAD(&(vm->intr_routers.router_list));
+    
+    v3_lock_init(&(vm->intr_routers.irq_lock));
 
-int v3_hook_irq(struct guest_info * info, 
-               uint_t irq,
-               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));
+    memset((uchar_t *)(vm->intr_routers.hooks), 0, sizeof(struct v3_irq_hook *) * 256);
+}
 
-  if (hook == NULL) { 
-    return -1; 
-  }
 
-  if (get_irq_hook(info, irq) != NULL) {
-    PrintError("IRQ %d already hooked\n", irq);
-    return -1;
-  }
+int 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));
 
-  hook->handler = handler;
-  hook->priv_data = priv_data;
-  
-  info->intr_state.hooks[irq] = hook;
+    ctrlr->priv_data = priv_data;
+    ctrlr->ctrl_ops = ops;
 
-  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);
+    list_add(&(ctrlr->ctrl_node), &(info->intr_core_state.controller_list));
+    
     return 0;
-  }
 }
 
+int 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;
+
+    list_add(&(router->router_node), &(vm->intr_routers.router_list));
+    
+    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%p)\n", 
-            intr->irq, (void *)info);
-  return v3_raise_irq(info, intr->irq);
 
+static inline struct v3_irq_hook * get_irq_hook(struct v3_vm_info * vm, uint_t irq) {
+    V3_ASSERT(irq <= 256);
+    return vm->intr_routers.hooks[irq];
 }
 
-int v3_hook_passthrough_irq(struct guest_info * info, uint_t irq)
+
+int v3_hook_irq(struct v3_vm_info * vm,
+               uint_t irq,
+               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));
 
-  int rc = v3_hook_irq(info, 
-                      irq,
-                      passthrough_irq_handler,
-                      NULL);
+    if (hook == NULL) { 
+       return -1; 
+    }
 
-  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;
-  }
+    if (get_irq_hook(vm, irq) != NULL) {
+       PrintError("IRQ %d already hooked\n", irq);
+       return -1;
+    }
+
+    hook->handler = handler;
+    hook->priv_data = priv_data;
+  
+    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;
+    }
 }
 
 
 
+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_deliver_irq(struct guest_info * info, 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(info, 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);
 
-  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);
+    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;
+    }
 }
 
 
 
 
 
+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_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_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;
 
-  return 0;
+    intr_state->virq_map[major] |= (1 << minor);
+   
+    return 0;
 }
 
-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;
+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_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_lower_irq(struct v3_vm_info * vm, int irq) {
+    struct intr_router * router = NULL;
+    struct v3_intr_routers * routers = &(vm->intr_routers);
 
-  PrintDebug("[v3_lower_irq]\n");
+    //    PrintDebug("[v3_lower_irq]\n");
+    addr_t irq_state = v3_lock_irqsave(routers->irq_lock);
 
-  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;
-  }
+    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;
+    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);
+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);
 
-  PrintDebug("[v3_raise_irq]\n");
+    list_for_each_entry(router, &(routers->router_list), router_node) {
+       router->router_ops->raise_intr(vm, router->priv_data, irq);
+    }
 
-  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;
-  }
+    v3_unlock_irqrestore(routers->irq_lock, irq_state);
 
-  return 0;
+    return 0;
 }
 
 
 
-int v3_intr_pending(struct guest_info * info) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
+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");
-  if (intr_state->excp_pending == 1) {
-    return 1;
-  } else if (intr_state->controller->intr_pending(intr_state->controller_state) == 1) {
-    return 1;
-  }
+    //  PrintDebug("[intr_pending]\n");
+    addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock);
 
-  /* Check [A]PIC */
+    // VIRQs have priority
+    for (i = 0; i < MAX_IRQ / 8; i++) {
+       if (intr_state->virq_map[i] != 0) {   
+           ret = V3_VIRTUAL_IRQ;
+           break;
+       }
+    }
 
-  return 0;
+    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;
+           }
+       }
+    }
+
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
+
+    return ret;
 }
 
 
-uint_t v3_get_intr_number(struct guest_info * info) {
-  struct v3_intr_state * intr_state = &(info->intr_state);
+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;
+}
 
-  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_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
 
-  /* someway to get the [A]PIC intr */
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
 
-  return 0;
+    return type;
 }
+*/
 
 
-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;
-}
 
 
 
+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);
 
+    if (type == V3_EXTERNAL_IRQ) {
+       struct intr_controller * ctrl = NULL;
 
+       addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock); 
 
-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);
+       //      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);
+       }
 
-  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);
-  }
+       v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
+    }
 
-  return 0;
+    return 0;
 }