X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=7e1527c96f14a92a1f9d4bc39e79c5e7af4193a5;hb=0899a5c74318e582f3d6ebec52cc744cdb727734;hp=242d63b4a099072b9e9da061948200a34810c7fa;hpb=56f8088296ee4116a4811a2f4f843edd80a7748d;p=palacios.git diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c index 242d63b..7e1527c 100644 --- a/palacios/src/palacios/vmm_intr.c +++ b/palacios/src/palacios/vmm_intr.c @@ -1,5 +1,22 @@ -/* (c) 2008, Jack Lange */ -/* (c) 2008, The V3VEE Project */ +/* + * 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 + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Jack Lange + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + #include #include @@ -13,86 +30,76 @@ -/*Zheng 07/30/2008*/ -void init_interrupt_state(struct guest_info * info) { + +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->vm_ops.raise_irq = &v3_raise_irq; - info->vm_ops.lower_irq = &v3_lower_irq; //Zheng added + memset((uchar_t *)(info->intr_state.hooks), 0, sizeof(struct v3_irq_hook *) * 256); } -void set_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state) { +void v3_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; } -// 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; -}; -int v3_hook_irq(uint_t irq, - void (*handler)(struct vmm_intr_state *state), - void *opaque) +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]; +} + + +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 vmm_intr_decode *d = (struct vmm_intr_decode *)V3_Malloc(sizeof(struct vmm_intr_decode)); + struct v3_irq_hook * hook = (struct v3_irq_hook *)V3_Malloc(sizeof(struct v3_irq_hook)); - if (!d) { return -1; } + if (hook == NULL) { + return -1; + } - d->handler = handler; - d->opaque = opaque; + if (get_irq_hook(info, irq) != NULL) { + PrintError("IRQ %d already hooked\n", irq); + return -1; + } + + hook->handler = handler; + hook->priv_data = priv_data; - if (V3_Hook_Interrupt(irq,d)) { - PrintError("hook_irq: failed to hook irq 0x%x to decode 0x%x\n", irq,d); + 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 0x%x to decode 0x%x\n", irq,d); + PrintDebug("hook_irq: hooked irq %d\n", irq); return 0; } } -void deliver_interrupt_to_vmm(struct vmm_intr_state *state) -{ - - PrintDebug("deliver_interrupt_to_vmm: state=0x%x\n",state); - - struct vmm_intr_decode *d = (struct vmm_intr_decode *)(state->opaque); - - void *temp = state->opaque; - state->opaque = d->opaque; - d->handler(state); - - state->opaque=temp; -} +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%x)\n", intr->irq, info); + return v3_raise_irq(info, intr->irq); -static void guest_injection_irq_handler(struct vmm_intr_state *state) -{ - struct guest_info *guest = (struct guest_info *)(state->opaque); - PrintDebug("[guest_injection_irq_handler] raise_irq=0x%x (guest=0x%x)\n", state->irq, guest); - PrintDebug("guest_irq_injection: state=0x%x\n", state); - guest->vm_ops.raise_irq(guest,state->irq); } - -int v3_hook_irq_for_guest_injection(struct guest_info *info, int irq) +int v3_hook_passthrough_irq(struct guest_info * info, uint_t irq) { - int rc = v3_hook_irq(irq, - guest_injection_irq_handler, - info); + int rc = v3_hook_irq(info, + irq, + passthrough_irq_handler, + NULL); if (rc) { PrintError("guest_irq_injection: failed to hook irq 0x%x (guest=0x%x)\n", irq, info); @@ -106,8 +113,29 @@ int v3_hook_irq_for_guest_injection(struct guest_info *info, int irq) + +int v3_deliver_irq(struct guest_info * info, struct v3_interrupt * intr) { + PrintDebug("v3_deliver_irq: irq=%d state=0x%x, \n", intr->irq, 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 v3_raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t error_code) { - struct vm_intr * intr_state = &(info->intr_state); + struct v3_intr_state * intr_state = &(info->intr_state); if (intr_state->excp_pending == 0) { intr_state->excp_pending = 1; @@ -124,7 +152,7 @@ int v3_raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t } int v3_raise_exception(struct guest_info * info, uint_t excp) { - struct vm_intr * intr_state = &(info->intr_state); + 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; @@ -139,23 +167,23 @@ int v3_raise_exception(struct guest_info * info, uint_t excp) { return 0; } -/*Zheng 07/30/2008*/ int v3_lower_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); + V3_ASSERT(info->intr_state.controller->lower_intr); PrintDebug("[v3_lower_irq]\n"); - // if ((info->intr_state.controller) && - // (info->intr_state.controller->raise_intr)) { + if ((info->intr_state.controller) && + (info->intr_state.controller->lower_intr)) { info->intr_state.controller->lower_intr(info->intr_state.controller_state, irq); - //} else { - // PrintDebug("There is no registered Interrupt Controller... (NULL POINTER)\n"); - // return -1; - //} + } else { + PrintError("There is no registered Interrupt Controller... (NULL POINTER)\n"); + return -1; + } + return 0; } @@ -167,20 +195,21 @@ int v3_raise_irq(struct guest_info * info, int irq) { PrintDebug("[v3_raise_irq]\n"); - // if ((info->intr_state.controller) && - // (info->intr_state.controller->raise_intr)) { + 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; - //} + } else { + PrintError("There is no registered Interrupt Controller... (NULL POINTER)\n"); + return -1; + } + return 0; } - -int intr_pending(struct guest_info * info) { - struct vm_intr * intr_state = &(info->intr_state); + +int v3_intr_pending(struct guest_info * info) { + struct v3_intr_state * intr_state = &(info->intr_state); // PrintDebug("[intr_pending]\n"); if (intr_state->excp_pending == 1) { @@ -195,8 +224,8 @@ int intr_pending(struct guest_info * info) { } -uint_t get_intr_number(struct guest_info * info) { - struct vm_intr * intr_state = &(info->intr_state); +uint_t v3_get_intr_number(struct guest_info * info) { + struct v3_intr_state * intr_state = &(info->intr_state); if (intr_state->excp_pending == 1) { return intr_state->excp_num; @@ -211,8 +240,8 @@ uint_t get_intr_number(struct guest_info * info) { } -intr_type_t get_intr_type(struct guest_info * info) { - struct vm_intr * intr_state = &(info->intr_state); +intr_type_t v3_get_intr_type(struct guest_info * info) { + struct v3_intr_state * intr_state = &(info->intr_state); if (intr_state->excp_pending) { PrintDebug("[get_intr_type] Exception\n"); @@ -230,8 +259,8 @@ intr_type_t get_intr_type(struct guest_info * info) { -int injecting_intr(struct guest_info * info, uint_t intr_num, intr_type_t type) { - struct vm_intr * intr_state = &(info->intr_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 == EXCEPTION) { PrintDebug("[injecting_intr] Exception\n");