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 6db7ba0..bc36d05 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
 
 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.excp_pending = 0;
-    info->intr_state.excp_num = 0;
-    info->intr_state.excp_error_code = 0;
 
     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);
 }
 
@@ -144,38 +146,22 @@ 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) {
+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;
 
-    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;
-    }
-
+    intr_state->virq_map[major] |= (1 << minor);
+   
     return 0;
 }
 
-int v3_raise_exception(struct guest_info * info, uint_t excp) {
+int v3_lower_virq(struct guest_info * info, int irq) {
     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;
-    }
+    int major = irq / 8;
+    int minor = irq % 8;
+
+    intr_state->virq_map[major] &= ~(1 << minor);
 
     return 0;
 }
@@ -185,12 +171,15 @@ int v3_lower_irq(struct guest_info * info, int irq) {
     struct intr_controller * ctrl = NULL;
     struct v3_intr_state * intr_state = &(info->intr_state);
 
-    PrintDebug("[v3_lower_irq]\n");
+    //    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(ctrl->priv_data, irq);
+       ctrl->ctrl_ops->lower_intr(info, ctrl->priv_data, irq);
     }
  
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
+
     return 0;
 }
 
@@ -198,103 +187,144 @@ int v3_raise_irq(struct guest_info * info, int irq) {
     struct intr_controller * ctrl = NULL;
     struct v3_intr_state * intr_state = &(info->intr_state);
 
-    PrintDebug("[v3_raise_irq (%d)]\n", irq);
+    //  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(ctrl->priv_data, irq);
+       ctrl->ctrl_ops->raise_intr(info, ctrl->priv_data, irq);
     }
 
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
+
     return 0;
 }
 
 
+void v3_clear_pending_intr(struct guest_info * core) {
+    struct v3_intr_state * intr_state = &(core->intr_state);
+
+    intr_state->irq_pending = 0;
+
+}
+
 
-int v3_intr_pending(struct guest_info * info) {
+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");
-    if (intr_state->excp_pending == 1) {
-       return 1;
-    } else {
-       struct intr_controller * ctrl = NULL;
+    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(ctrl->priv_data) == 1) {
-               return 1;
+           if (ctrl->ctrl_ops->intr_pending(info, ctrl->priv_data) == 1) {
+               ret = V3_EXTERNAL_IRQ;
+               break;
            }
        }
     }
 
-    return 0;
+    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
+
+    return ret;
 }
 
 
-uint_t v3_get_intr_number(struct guest_info * info) {
+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 (intr_state->excp_pending == 1) {
-       return intr_state->excp_num;
-    } else {
-       struct intr_controller * ctrl = NULL;
-
+    if (!ret) {
        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;
+           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;
            }
        }
     }
 
-    return 0;
-}
+    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;
 
-    if (intr_state->excp_pending) {
-       PrintDebug("[get_intr_type] Exception\n");
-       return EXCEPTION;
-    } else {
-       struct intr_controller * ctrl = NULL;
+    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");
-               return EXTERNAL_IRQ;
-           }
+    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;
        }
     }
 
-    PrintDebug("[get_intr_type] Invalid_Intr\n");
-    return INVALID_INTR;
-}
+#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, intr_type_t 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);
 
-    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) {
+    if (type == V3_EXTERNAL_IRQ) {
        struct intr_controller * ctrl = NULL;
 
-       PrintDebug("[injecting_intr] External_Irq with intr_num = %x\n", 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(ctrl->priv_data, intr_num);
+           ctrl->ctrl_ops->begin_irq(info, ctrl->priv_data, intr_num);
        }
+
+       v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
     }
 
     return 0;