X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=06d5254bc79b455eb120867bf30051858a16bd35;hb=0c942db0269c98d20875637eab9e97d639f7cda8;hp=87b6802a5313448dcc61bc27fa97ec50d5fac72a;hpb=7650d345982514b32fc0f116b8a6512ec243b267;p=palacios.git diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c index 87b6802..06d5254 100644 --- a/palacios/src/palacios/vmm_intr.c +++ b/palacios/src/palacios/vmm_intr.c @@ -26,7 +26,7 @@ #include -#ifndef CONFIG_DEBUG_INTERRUPTS +#ifndef V3_CONFIG_DEBUG_INTERRUPTS #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -62,6 +62,19 @@ void v3_init_intr_controllers(struct guest_info * info) { 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)); @@ -72,26 +85,89 @@ void v3_init_intr_routers(struct v3_vm_info * vm) { } -int v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * priv_data) { +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_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)); + if (!ctrlr) { + PrintError("Cannot allocate in registering an interrupt controller\n"); + return NULL; + } + ctrlr->priv_data = priv_data; ctrlr->ctrl_ops = ops; list_add(&(ctrlr->ctrl_node), &(info->intr_core_state.controller_list)); - return 0; + return (void *)ctrlr; } -int v3_register_intr_router(struct v3_vm_info * vm, struct intr_router_ops * ops, void * priv_data) { +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)); + if (!router) { + PrintError("Cannot allocate in registering an interrupt router\n"); + return NULL; + } + router->priv_data = priv_data; router->router_ops = ops; list_add(&(router->router_node), &(vm->intr_routers.router_list)); - return 0; + return (void *)router; +} + +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); } @@ -109,12 +185,15 @@ int v3_hook_irq(struct v3_vm_info * vm, { struct v3_irq_hook * hook = (struct v3_irq_hook *)V3_Malloc(sizeof(struct v3_irq_hook)); + if (hook == NULL) { + PrintError("Cannot allocate when hooking an irq\n"); return -1; } if (get_irq_hook(vm, irq) != NULL) { PrintError("IRQ %d already hooked\n", irq); + V3_Free(hook); return -1; } @@ -125,6 +204,8 @@ int v3_hook_irq(struct v3_vm_info * vm, if (V3_Hook_Interrupt(vm, irq)) { PrintError("hook_irq: failed to hook irq %d\n", irq); + vm->intr_routers.hooks[irq] = NULL; + V3_Free(hook); return -1; } else { PrintDebug("hook_irq: hooked irq %d\n", irq); @@ -173,6 +254,18 @@ int v3_deliver_irq(struct v3_vm_info * vm, struct v3_interrupt * intr) { +int v3_raise_swintr (struct guest_info * core, uint8_t vector) { + struct v3_intr_core_state * intr_state = &(core->intr_core_state); + + PrintDebug("Signaling software interrupt in v3_signal_swintr()\n"); + PrintDebug("\tINT vector: %d\n", vector); + + intr_state->swintr_posted = 1; + intr_state->swintr_vector = vector; + return 0; +} + + int v3_raise_virq(struct guest_info * info, int irq) { struct v3_intr_core_state * intr_state = &(info->intr_core_state); @@ -196,39 +289,70 @@ int v3_lower_virq(struct guest_info * info, int irq) { int v3_lower_irq(struct v3_vm_info * vm, int irq) { + struct v3_irq irq_state; + + irq_state.irq = irq; + irq_state.ack = NULL; + irq_state.private_data = NULL; + + return v3_lower_acked_irq(vm, irq_state); +} + +int v3_raise_irq(struct v3_vm_info * vm, int irq) { + struct v3_irq irq_state; + + irq_state.irq = irq; + irq_state.ack = NULL; + irq_state.private_data = NULL; + + return v3_raise_acked_irq(vm, irq_state); +} + + +int v3_raise_acked_irq(struct v3_vm_info * vm, struct v3_irq irq) { struct intr_router * router = NULL; struct v3_intr_routers * routers = &(vm->intr_routers); - // PrintDebug("[v3_lower_irq]\n"); + // 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->lower_intr(vm, router->priv_data, irq); + router->router_ops->raise_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) { + +int v3_lower_acked_irq(struct v3_vm_info * vm, struct v3_irq irq) { struct intr_router * router = NULL; struct v3_intr_routers * routers = &(vm->intr_routers); - // PrintDebug("[v3_raise_irq (%d)]\n", irq); + // 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->raise_intr(vm, router->priv_data, irq); + router->router_ops->lower_intr(vm, router->priv_data, &irq); } - + 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); + + 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; @@ -238,7 +362,15 @@ v3_intr_type_t v3_intr_pending(struct guest_info * info) { // PrintDebug("[intr_pending]\n"); addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock); - // VIRQs have priority + // External IRQs have lowest priority + 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; + } + } + + // VIRQs have 2nd priority for (i = 0; i < MAX_IRQ / 8; i++) { if (intr_state->virq_map[i] != 0) { ret = V3_VIRTUAL_IRQ; @@ -246,13 +378,9 @@ v3_intr_type_t v3_intr_pending(struct guest_info * info) { } } - 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; - } - } + /* SWINTRs have highest */ + if (intr_state->swintr_posted == 1) { + ret = V3_SOFTWARE_INTR; } v3_unlock_irqrestore(intr_state->irq_lock, irq_state); @@ -316,7 +444,7 @@ intr_type_t v3_get_intr_type(struct guest_info * info) { } } -#ifdef CONFIG_DEBUG_INTERRUPTS +#ifdef V3_CONFIG_DEBUG_INTERRUPTS if (type == V3_INVALID_INTR) { PrintError("[get_intr_type] Invalid_Intr\n"); }