X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=fa8c69fedca386c6bd911fb488a29d89e489c705;hb=a5d2c00cc461b4a60a1360a2a0bba55cef467bab;hp=8c4e1c27a7f0a973e15c47ba4e05314af7eb152a;hpb=382829fe58cb541af371547325c5502e37032ecd;p=palacios.git diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c index 8c4e1c2..fa8c69f 100644 --- a/palacios/src/palacios/vmm_intr.c +++ b/palacios/src/palacios/vmm_intr.c @@ -69,9 +69,14 @@ void v3_deinit_intr_controllers(struct guest_info * core) { 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); + if (*(void**)&intr_state->controller_list) { + list_for_each_entry_safe(ctrlr, tmp, &(intr_state->controller_list), ctrl_node) { + v3_remove_intr_controller(core, ctrlr); + } + + v3_lock_deinit(&(intr_state->irq_lock)); } + } @@ -89,15 +94,24 @@ 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); - } + // clear out any routers that were left around + if (*(void**)&vm->intr_routers.router_list) { + list_for_each_entry_safe(rtr, tmp, &(vm->intr_routers.router_list), router_node) { + v3_remove_intr_router(vm, rtr); + } + + v3_lock_deinit(&(vm->intr_routers.irq_lock)); + } } 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(info->vm_info, info, "Cannot allocate in registering an interrupt controller\n"); + return NULL; + } + ctrlr->priv_data = priv_data; ctrlr->ctrl_ops = ops; @@ -120,7 +134,7 @@ void v3_remove_intr_controller(struct guest_info * core, void * handle) { } if (found == 0) { - PrintError("Attempted to remove invalid interrupt controller handle\n"); + PrintError(core->vm_info, core, "Attempted to remove invalid interrupt controller handle\n"); return; } @@ -131,6 +145,11 @@ void v3_remove_intr_controller(struct guest_info * core, void * handle) { 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(vm, VCORE_NONE,"Cannot allocate in registering an interrupt router\n"); + return NULL; + } + router->priv_data = priv_data; router->router_ops = ops; @@ -152,7 +171,7 @@ void v3_remove_intr_router(struct v3_vm_info * vm, void * handle) { } if (found == 0) { - PrintError("Attempted to remove invalid interrupt router\n"); + PrintError(vm, VCORE_NONE, "Attempted to remove invalid interrupt router\n"); return; } @@ -163,7 +182,7 @@ void v3_remove_intr_router(struct v3_vm_info * vm, void * handle) { static inline struct v3_irq_hook * get_irq_hook(struct v3_vm_info * vm, uint_t irq) { - V3_ASSERT(irq <= 256); + V3_ASSERT(vm, VCORE_NONE,irq <= 256); return vm->intr_routers.hooks[irq]; } @@ -175,12 +194,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(vm, VCORE_NONE, "Cannot allocate when hooking an irq\n"); return -1; } if (get_irq_hook(vm, irq) != NULL) { - PrintError("IRQ %d already hooked\n", irq); + PrintError(vm, VCORE_NONE, "IRQ %d already hooked\n", irq); + V3_Free(hook); return -1; } @@ -190,10 +212,12 @@ int v3_hook_irq(struct v3_vm_info * vm, vm->intr_routers.hooks[irq] = hook; if (V3_Hook_Interrupt(vm, irq)) { - PrintError("hook_irq: failed to hook irq %d\n", irq); + PrintError(vm, VCORE_NONE, "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); + PrintDebug(vm, VCORE_NONE, "hook_irq: hooked irq %d\n", irq); return 0; } } @@ -201,7 +225,7 @@ int v3_hook_irq(struct v3_vm_info * vm, 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", + PrintDebug(vm, VCORE_NONE, "[passthrough_irq_handler] raise_irq=%d (guest=0x%p)\n", intr->irq, (void *)vm); return v3_raise_irq(vm, intr->irq); @@ -211,10 +235,10 @@ 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 *)vm); + PrintError(vm, VCORE_NONE, "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); + PrintDebug(vm, VCORE_NONE, "guest_irq_injection: hooked irq 0x%x (guest=0x%p)\n", irq, (void *)vm); return 0; } } @@ -224,12 +248,12 @@ int v3_hook_passthrough_irq(struct v3_vm_info * vm, uint_t irq) { 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); + PrintDebug(vm, VCORE_NONE, "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); + PrintError(vm, VCORE_NONE, "Attempting to deliver interrupt to non registered hook(irq=%d)\n", intr->irq); return -1; } @@ -239,6 +263,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(core->vm_info, core, "Signaling software interrupt in v3_signal_swintr()\n"); + PrintDebug(core->vm_info, core, "\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); @@ -262,38 +298,62 @@ 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(info->vm_info, info, "[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(info->vm_info, info, "[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); @@ -308,10 +368,18 @@ v3_intr_type_t v3_intr_pending(struct guest_info * info) { int ret = V3_INVALID_INTR; int i = 0; - // PrintDebug("[intr_pending]\n"); + // PrintDebug(info->vm_info, info, "[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)) { + 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; @@ -319,13 +387,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); @@ -334,12 +398,14 @@ v3_intr_type_t v3_intr_pending(struct guest_info * info) { } -uint32_t v3_get_intr(struct guest_info * info) { +int 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 ret = -1; int i = 0; int j = 0; + int found_virq=0; + int found_irq=0; addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock); @@ -349,6 +415,8 @@ uint32_t v3_get_intr(struct guest_info * info) { for (j = 0; j < 8; j++) { if (intr_state->virq_map[i] & (1 << j)) { ret = (i * 8) + j; + // need to be able to find virq 0 + found_virq=1; break; } } @@ -356,20 +424,28 @@ uint32_t v3_get_intr(struct guest_info * info) { } } - if (!ret) { + if (!found_virq) { 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); + int 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; + if (intr_num >= 0) { + // PrintDebug(info->vm_info, info, "[get_intr_number] intr_number = %d\n", intr_num); + ret = intr_num; + found_irq=1; + break; + } + } } } v3_unlock_irqrestore(intr_state->irq_lock, irq_state); + if (!found_virq && !found_irq) { + PrintError(info->vm_info,info,"Strange... neither a VIRQ nor an IRQ was found...\n"); + } + return ret; } @@ -383,7 +459,7 @@ intr_type_t v3_get_intr_type(struct guest_info * info) { 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"); + //PrintDebug(info->vm_info, info, "[get_intr_type] External_irq\n"); type = V3_EXTERNAL_IRQ; break; } @@ -391,7 +467,7 @@ intr_type_t v3_get_intr_type(struct guest_info * info) { #ifdef V3_CONFIG_DEBUG_INTERRUPTS if (type == V3_INVALID_INTR) { - PrintError("[get_intr_type] Invalid_Intr\n"); + PrintError(info->vm_info, info, "[get_intr_type] Invalid_Intr\n"); } #endif @@ -413,7 +489,7 @@ int v3_injecting_intr(struct guest_info * info, uint_t intr_num, v3_intr_type_t addr_t irq_state = v3_lock_irqsave(intr_state->irq_lock); - // PrintDebug("[injecting_intr] External_Irq with intr_num = %x\n", intr_num); + // PrintDebug(info->vm_info, info, "[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); }