X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=1397c075e0f86bfee9878addb017c997cea0cc56;hb=13d8e5d4035b90bf1ab8b1da115c7d6310c76526;hp=b65dfefca9c10fb3f44ebad546fb3ce830771cfa;hpb=87819b4172a7c32186403fc7a03bea5ae65f0e4a;p=palacios.git

diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c
index b65dfef..1397c07 100644
--- a/palacios/src/palacios/vmm_intr.c
+++ b/palacios/src/palacios/vmm_intr.c
@@ -26,7 +26,7 @@
 
 #include <palacios/vmm_lock.h>
 
-#ifndef DEBUG_INTERRUPTS
+#ifndef CONFIG_DEBUG_INTERRUPTS
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -42,41 +42,69 @@ struct intr_controller {
 };
 
 
-void v3_init_interrupt_state(struct guest_info * info) {
+struct intr_router {
+    struct intr_router_ops * router_ops;
 
-    info->intr_state.irq_pending = 0;
-    info->intr_state.irq_started = 0;
-    info->intr_state.irq_vector = 0;
+    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);
 
-    INIT_LIST_HEAD(&(info->intr_state.controller_list));
+    intr_state->irq_pending = 0;
+    intr_state->irq_started = 0;
+    intr_state->irq_vector = 0;
 
-    v3_lock_init(&(info->intr_state.irq_lock));
+    v3_lock_init(&(intr_state->irq_lock));
 
-    memset((uchar_t *)(info->intr_state.hooks), 0, sizeof(struct v3_irq_hook *) * 256);
+    INIT_LIST_HEAD(&(intr_state->controller_list));
 }
 
-void v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state) {
+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);
+}
+
+
+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));
 
-    ctrlr->priv_data = state;
+    ctrlr->priv_data = priv_data;
     ctrlr->ctrl_ops = ops;
 
-    list_add(&(ctrlr->ctrl_node), &(info->intr_state.controller_list));
-
+    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 inline struct v3_irq_hook * get_irq_hook(struct guest_info * info, uint_t irq) {
+
+static inline struct v3_irq_hook * get_irq_hook(struct v3_vm_info * vm, uint_t irq) {
     V3_ASSERT(irq <= 256);
-    return info->intr_state.hooks[irq];
+    return vm->intr_routers.hooks[irq];
 }
 
 
-int v3_hook_irq(struct guest_info * info, 
+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));
@@ -85,7 +113,7 @@ int v3_hook_irq(struct guest_info * info,
 	return -1; 
     }
 
-    if (get_irq_hook(info, irq) != NULL) {
+    if (get_irq_hook(vm, irq) != NULL) {
 	PrintError("IRQ %d already hooked\n", irq);
 	return -1;
     }
@@ -93,9 +121,9 @@ int v3_hook_irq(struct guest_info * info,
     hook->handler = handler;
     hook->priv_data = priv_data;
   
-    info->intr_state.hooks[irq] = hook;
+    vm->intr_routers.hooks[irq] = hook;
 
-    if (V3_Hook_Interrupt(info, irq)) { 
+    if (V3_Hook_Interrupt(vm, irq)) { 
 	PrintError("hook_irq: failed to hook irq %d\n", irq);
 	return -1;
     } else {
@@ -106,21 +134,21 @@ int v3_hook_irq(struct guest_info * info,
 
 
 
-static int passthrough_irq_handler(struct guest_info * info, struct v3_interrupt * intr, void * priv_data) {
+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 *)info);
+	       intr->irq, (void *)vm);
 
-    return v3_raise_irq(info, intr->irq);
+    return v3_raise_irq(vm, 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 v3_hook_passthrough_irq(struct v3_vm_info * vm, uint_t irq) {
+    int rc = v3_hook_irq(vm, irq, passthrough_irq_handler, NULL);
 
     if (rc) { 
-	PrintError("guest_irq_injection: failed to hook irq 0x%x (guest=0x%p)\n", irq, (void *)info);
+	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 *)info);
+	PrintDebug("guest_irq_injection: hooked irq 0x%x (guest=0x%p)\n", irq, (void *)vm);
 	return 0;
     }
 }
@@ -129,123 +157,174 @@ int v3_hook_passthrough_irq(struct guest_info * info, uint_t irq) {
 
 
 
-int v3_deliver_irq(struct guest_info * info, struct v3_interrupt * intr) {
+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(info, intr->irq);
+    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(info, intr, hook->priv_data);
+    return hook->handler(vm, intr, hook->priv_data);
 }
 
 
 
 
 
+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;
 
+    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);
 
-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;
+}
+
+
+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");
-    addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock);
+    addr_t irq_state = v3_lock_irqsave(routers->irq_lock);
 
-    list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
-	ctrl->ctrl_ops->lower_intr(ctrl->priv_data, irq);
+    list_for_each_entry(router, &(routers->router_list), router_node) {
+	router->router_ops->lower_intr(vm, router->priv_data, irq);
     }
  
-    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
+    v3_unlock_irqrestore(routers->irq_lock, irq_state);
 
     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_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(intr_state->irq_lock);
+    addr_t irq_state = v3_lock_irqsave(routers->irq_lock);
 
-    list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) {
-	ctrl->ctrl_ops->raise_intr(ctrl->priv_data, irq);
+    list_for_each_entry(router, &(routers->router_list), router_node) {
+	router->router_ops->raise_intr(vm, router->priv_data, irq);
     }
 
-    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
+    v3_unlock_irqrestore(routers->irq_lock, irq_state);
 
     return 0;
 }
 
 
+void v3_clear_pending_intr(struct guest_info * core) {
+    struct v3_intr_core_state * intr_state = &(core->intr_core_state);
 
-int v3_intr_pending(struct guest_info * info) {
-    struct v3_intr_state * intr_state = &(info->intr_state);
+    intr_state->irq_pending = 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 = 0;
+    int ret = V3_INVALID_INTR;
+    int i = 0;
 
     //  PrintDebug("[intr_pending]\n");
-    addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock);    
+    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) {
-	    ret = 1;
+    // 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);
 
     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);    
 
-    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);
-	    ret = intr_num;
+    // 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;
 	}
     }
 
-    v3_unlock_irqrestore(intr_state->irq_lock, irq_state);
+    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 = INVALID_INTR;
+    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 = EXTERNAL_IRQ;
+	    type = V3_EXTERNAL_IRQ;	    
 	    break;
 	}
     }
 
-#ifdef DEBUG_INTERRUPTS
-    if (type == INVALID_INTR) {
+#ifdef CONFIG_DEBUG_INTERRUPTS
+    if (type == V3_INVALID_INTR) {
 	PrintError("[get_intr_type] Invalid_Intr\n");
     }
 #endif
@@ -254,23 +333,23 @@ intr_type_t v3_get_intr_type(struct guest_info * info) {
 
     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 == EXTERNAL_IRQ) {
+    if (type == V3_EXTERNAL_IRQ) {
 	struct intr_controller * ctrl = NULL;
 
 	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);