X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=84a645b171499177cebe605d53a3c388b29111e8;hb=f2c976eb850d2633d2bc05011a66bbc91a432204;hp=8908507b70314832d2a4da47cfb9968bc47a9ab4;hpb=cbf35ad72de3a7a1f6eee3e8b2b35d7f31df22a5;p=palacios.git diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c index 8908507..84a645b 100644 --- a/palacios/src/palacios/vmm_intr.c +++ b/palacios/src/palacios/vmm_intr.c @@ -1,3 +1,23 @@ +/* + * 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 @@ -8,12 +28,18 @@ #define PrintDebug(fmt, args...) #endif + + + void 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; + memset((uchar_t *)(info->intr_state.hooks), 0, sizeof(struct v3_irq_hook *) * 256); + info->vm_ops.raise_irq = &v3_raise_irq; + info->vm_ops.lower_irq = &v3_lower_irq; } void set_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state) { @@ -23,79 +49,66 @@ void set_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, v -// 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 hook_irq_new(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) { - extern struct vmm_os_hooks * os_hooks; + struct v3_irq_hook * hook = (struct v3_irq_hook *)V3_Malloc(sizeof(struct v3_irq_hook)); - struct vmm_intr_decode *d = V3_Malloc(sizeof(struct vmm_intr_decode)); + if (hook == NULL) { + return -1; + } - if (!d) { return -1; } + if (get_irq_hook(info, irq) != NULL) { + PrintError("IRQ %d already hooked\n", irq); + return -1; + } - d->handler = handler; - d->opaque = opaque; + hook->handler = handler; + hook->priv_data = priv_data; - if (os_hooks->hook_interrupt_new(irq,d)) { - PrintError("hook_irq_new: 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_new: 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; -} - -void guest_injection_irq_handler(struct vmm_intr_state *state) +static int passthrough_irq_handler(struct guest_info * info, struct v3_interrupt * intr, void * priv_data) { - PrintDebug("guest_irq_injection: state=0x%x\n",state); - struct guest_info *guest = (struct guest_info *)(state->opaque); + PrintDebug("[passthrough_irq_handler] raise_irq=%d (guest=0x%x)\n", intr->irq, info); + return v3_raise_irq(info, intr->irq); - PrintDebug("guest_irq_injection: injecting irq 0x%x into guest 0x%x\n",state->irq,guest); - guest->vm_ops.raise_irq(guest,state->irq); } - -int 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 = hook_irq_new(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 for guest 0x%x\n", irq,info); + PrintError("guest_irq_injection: failed to hook irq 0x%x (guest=0x%x)\n", irq, info); return -1; } else { - PrintDebug("guest_irq_injection: hooked irq 0x%x for guest 0x%x\n", irq,info); + PrintDebug("guest_irq_injection: hooked irq 0x%x (guest=0x%x)\n", irq, info); return 0; } } @@ -103,21 +116,36 @@ int hook_irq_for_guest_injection(struct guest_info *info, int irq) -int hook_irq(struct guest_info * info, int irq) { - extern struct vmm_os_hooks * os_hooks; - return os_hooks->hook_interrupt(info, 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 raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t error_code) { - struct vm_intr * intr_state = &(info->intr_state); + + + + + + + +int v3_raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t error_code) { + struct v3_intr_state * intr_state = &(info->intr_state); 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("Raising exception with error code: %x\n", error_code); + PrintDebug("[v3_raise_exception_with_error] error code: %x\n", error_code); } else { PrintError("exception already pending, currently not implemented\n"); return -1; @@ -126,9 +154,9 @@ int raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t err return 0; } -int raise_exception(struct guest_info * info, uint_t excp) { - struct vm_intr * intr_state = &(info->intr_state); - +int v3_raise_exception(struct guest_info * info, uint_t excp) { + 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; @@ -143,27 +171,50 @@ int raise_exception(struct guest_info * info, uint_t excp) { } +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->lower_intr); + + PrintDebug("[v3_lower_irq]\n"); + + if ((info->intr_state.controller) && + (info->intr_state.controller->lower_intr)) { + info->intr_state.controller->lower_intr(info->intr_state.controller_state, irq); + } else { + PrintError("There is no registered Interrupt Controller... (NULL POINTER)\n"); + return -1; + } + + return 0; +} + int v3_raise_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); - // if ((info->intr_state.controller) && - // (info->intr_state.controller->raise_intr)) { + PrintDebug("[v3_raise_irq]\n"); + + 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); + struct v3_intr_state * intr_state = &(info->intr_state); + // PrintDebug("[intr_pending]\n"); if (intr_state->excp_pending == 1) { return 1; } else if (intr_state->controller->intr_pending(intr_state->controller_state) == 1) { @@ -177,11 +228,12 @@ int intr_pending(struct guest_info * info) { uint_t get_intr_number(struct guest_info * info) { - struct vm_intr * intr_state = &(info->intr_state); + struct v3_intr_state * intr_state = &(info->intr_state); if (intr_state->excp_pending == 1) { return intr_state->excp_num; } else if (intr_state->controller->intr_pending(intr_state->controller_state)) { + PrintDebug("[get_intr_number] intr_number = %d\n", intr_state->controller->get_intr_number(intr_state->controller_state)); return intr_state->controller->get_intr_number(intr_state->controller_state); } @@ -192,14 +244,16 @@ 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); + struct v3_intr_state * intr_state = &(info->intr_state); if (intr_state->excp_pending) { + PrintDebug("[get_intr_type] Exception\n"); return EXCEPTION; } else if (intr_state->controller->intr_pending(intr_state->controller_state)) { + PrintDebug("[get_intr_type] External_irq\n"); return EXTERNAL_IRQ; } - + PrintDebug("[get_intr_type] Invalid_Intr\n"); return INVALID_INTR; } @@ -209,16 +263,17 @@ 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); + 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) { + PrintDebug("[injecting_intr] External_Irq with intr_num = %x\n", intr_num); return intr_state->controller->begin_irq(intr_state->controller_state, intr_num); }