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.


Fix interrupt injection bug due to caching irq vectors after vector mappings have...
[palacios.git] / palacios / src / palacios / vmm_intr.c
index fea0959..bc36d05 100644 (file)
+/* 
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
+
+
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm.h>
 
 #include <palacios/vm_guest.h>
+#include <palacios/vmm_ctrl_regs.h>
 
+#include <palacios/vmm_lock.h>
 
+#ifndef CONFIG_DEBUG_INTERRUPTS
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
 
-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;
-}
 
-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;
+
+struct intr_controller {
+    struct intr_ctrl_ops * ctrl_ops;
+    
+    void * priv_data;
+    struct list_head ctrl_node;
+};
+
+
+void v3_init_interrupt_state(struct guest_info * info) {
+
+    info->intr_state.irq_pending = 0;
+    info->intr_state.irq_started = 0;
+    info->intr_state.irq_vector = 0;
+
+    INIT_LIST_HEAD(&(info->intr_state.controller_list));
+
+    v3_lock_init(&(info->intr_state.irq_lock));
+
+    memset((uchar_t *)(info->intr_state.hooks), 0, sizeof(struct v3_irq_hook *) * 256);
 }
 
+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;
 
-// 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;
-};
+    list_add(&(ctrlr->ctrl_node), &(info->intr_state.controller_list));
 
-int hook_irq_new(uint_t irq,
-                void (*handler)(struct vmm_intr_state *state),
-                void  *opaque)
-{
-  extern struct vmm_os_hooks * os_hooks;
+}
 
-  struct vmm_intr_decode *d = V3_Malloc(sizeof(struct vmm_intr_decode));
 
-  if (!d) { return -1; }
 
-  d->handler = handler;
-  d->opaque = opaque;
-  
-  if (os_hooks->hook_interrupt_new(irq,d)) { 
-    PrintDebug("hook_irq_new: failed to hook irq 0x%x to decode 0x%x\n", irq,d);
-    return -1;
-  } else {
-    PrintDebug("hook_irq_new: hooked irq 0x%x to decode 0x%x\n", irq,d);
-    return 0;
-  }
+
+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];
 }
 
 
-void deliver_interrupt_to_vmm(struct vmm_intr_state *state)
+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));
 
-  PrintDebug("deliver_interrupt_to_vmm: state=0x%x\n",state);
+    if (hook == NULL) { 
+       return -1; 
+    }
 
-  struct vmm_intr_decode *d = (struct vmm_intr_decode *)(state->opaque);
-  
-  void *temp = state->opaque;
-  state->opaque = d->opaque;
+    if (get_irq_hook(info, irq) != NULL) {
+       PrintError("IRQ %d already hooked\n", irq);
+       return -1;
+    }
 
-  d->handler(state);
+    hook->handler = handler;
+    hook->priv_data = priv_data;
   
-  state->opaque=temp;
+    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;
+    }
 }
 
 
-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);
+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);
 
-  PrintDebug("guest_irq_injection: injecting irq 0x%x into guest 0x%x\n",state->irq,guest);
-  guest->vm_ops.raise_irq(guest,state->irq);
+    return v3_raise_irq(info, intr->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 hook_irq_for_guest_injection(struct guest_info *info, int irq)
-{
+    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;
+    }
+}
 
-  int rc = hook_irq_new(irq,
-                       guest_injection_irq_handler,
-                       info);
 
-  if (rc) { 
-    PrintDebug("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 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);
+
+    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);
 }
 
 
 
 
-int hook_irq(struct guest_info * info, int irq) {
-  extern struct vmm_os_hooks * os_hooks;
 
-  return os_hooks->hook_interrupt(info, irq);
+int v3_raise_virq(struct guest_info * info, int irq) {
+    struct v3_intr_state * intr_state = &(info->intr_state);
+    int major = irq / 8;
+    int minor = irq % 8;
+
+    intr_state->virq_map[major] |= (1 << minor);
+   
+    return 0;
 }
 
-int raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t error_code) {
-  struct vm_intr * intr_state = &(info->intr_state);
+int v3_lower_virq(struct guest_info * info, int irq) {
+    struct v3_intr_state * intr_state = &(info->intr_state);
+    int major = irq / 8;
+    int minor = irq % 8;
 
-  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("Raising exception with error code: %x\n", error_code);
-  } else {
-    PrintDebug("exception already pending, currently not implemented\n");
-    return -1;
-  }
+    intr_state->virq_map[major] &= ~(1 << minor);
 
-  return 0;
+    return 0;
 }
 
-int raise_exception(struct guest_info * info, uint_t excp) {
-  struct vm_intr * 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 = 0;
-    intr_state->excp_error_code_valid = 0;
-  } else {
-    PrintDebug("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");
+    addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock);
+
+    list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+       ctrl->ctrl_ops->lower_intr(info, ctrl->priv_data, irq);
+    }
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
 
+    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);
+    struct intr_controller * ctrl = NULL;
+    struct v3_intr_state * intr_state = &(info->intr_state);
 
-  //  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;
-}
+    //  PrintDebug("[v3_raise_irq (%d)]\n", irq);
+    addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock);
 
+    list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
+       ctrl->ctrl_ops->raise_intr(info, ctrl->priv_data, irq);
+    }
 
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
+
+    return 0;
+}
 
-int intr_pending(struct guest_info * info) {
-  struct vm_intr * intr_state = &(info->intr_state);
 
-  if (intr_state->excp_pending == 1) {
-    return 1;
-  } else if (intr_state->controller->intr_pending(intr_state->controller_state) == 1) {
-    return 1;
-  }
+void v3_clear_pending_intr(struct guest_info * core) {
+    struct v3_intr_state * intr_state = &(core->intr_state);
 
-  /* Check [A]PIC */
+    intr_state->irq_pending = 0;
 
-  return 0;
 }
 
 
-uint_t get_intr_number(struct guest_info * info) {
-  struct vm_intr * intr_state = &(info->intr_state);
+v3_intr_type_t v3_intr_pending(struct guest_info * info) {
+    struct v3_intr_state * intr_state = &(info->intr_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;
+           }
+       }
+    }
+
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
 
-  if (intr_state->excp_pending == 1) {
-    return intr_state->excp_num;
-  } else if (intr_state->controller->intr_pending(intr_state->controller_state)) {
-    return intr_state->controller->get_intr_number(intr_state->controller_state);
-  }
+    return ret;
+}
 
-  /* someway to get the [A]PIC intr */
 
-  return 0;
+uint32_t v3_get_intr(struct guest_info * info) {
+    struct v3_intr_state * intr_state = &(info->intr_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;
+       }
+    }
 
-intr_type_t get_intr_type(struct guest_info * info) {
- struct vm_intr * intr_state = &(info->intr_state);
+#ifdef CONFIG_DEBUG_INTERRUPTS
+    if (type == V3_INVALID_INTR) {
+       PrintError("[get_intr_type] Invalid_Intr\n");
+    }
+#endif
 
-  if (intr_state->excp_pending) {
-    return EXCEPTION;
-  } else if (intr_state->controller->intr_pending(intr_state->controller_state)) {
-    return EXTERNAL_IRQ;
-  }
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
 
-  return INVALID_INTR;
+    return type;
 }
+*/
 
 
 
 
 
+int v3_injecting_intr(struct guest_info * info, uint_t intr_num, v3_intr_type_t type) {
+    struct v3_intr_state * intr_state = &(info->intr_state);
 
-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 == V3_EXTERNAL_IRQ) {
+       struct intr_controller * ctrl = NULL;
 
-  if (type == EXCEPTION) {
+       addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock); 
 
-    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) {
-    return intr_state->controller->begin_irq(intr_state->controller_state, intr_num);
-  }
+       //      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);
+       }
+
+       v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
+    }
 
-  return 0;
+    return 0;
 }