X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_intr.c;h=ccbfd9fd5a5388144c4154c4879d7b3d3f3e29b2;hb=7bb4a918835892e9071ffbdef1ea8e57f9a12950;hp=96caa7cea8dbd4a0caeee87846bb408fbad21af9;hpb=f9bb3db89469169bb5775dc031d89e570c6fed70;p=palacios.git diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c index 96caa7c..ccbfd9f 100644 --- a/palacios/src/palacios/vmm_intr.c +++ b/palacios/src/palacios/vmm_intr.c @@ -1,5 +1,22 @@ -/* Northwestern University */ -/* (c) 2008, Jack Lange */ +/* + * 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,92 +30,93 @@ -/*Zheng 07/30/2008*/ -void init_interrupt_state(struct guest_info * info) { + +struct intr_controller { + struct intr_ctrl_ops * ctrl_ops; + + void * priv_data; + struct list_head ctrl_node; +}; + + +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) { - info->intr_state.controller = ops; - info->intr_state.controller_state = state; +void v3_register_intr_controller(struct guest_info * info, struct intr_ctrl_ops * ops, void * state) { + struct intr_controller * ctrlr = (struct intr_controller *)V3_Malloc(sizeof(struct intr_controller)); + + ctrlr->priv_data = state; + ctrlr->ctrl_ops = ops; + + list_add(&(ctrlr->ctrl_node), &(info->intr_state.controller_list)); + } -// 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 (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 (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%p)\n", + intr->irq, (void *)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); + PrintError("guest_irq_injection: failed to hook irq 0x%x (guest=0x%p)\n", irq, (void *)info); return -1; } else { - PrintDebug("guest_irq_injection: hooked irq 0x%x (guest=0x%x)\n", irq, info); + PrintDebug("guest_irq_injection: hooked irq 0x%x (guest=0x%p)\n", irq, (void *)info); return 0; } } @@ -106,8 +124,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%p, \n", intr->irq, (void *)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 +163,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,89 +178,96 @@ 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); + struct intr_controller * ctrl = NULL; + struct v3_intr_state * intr_state = &(info->intr_state); PrintDebug("[v3_lower_irq]\n"); - // if ((info->intr_state.controller) && - // (info->intr_state.controller->raise_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; - //} + list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) { + ctrl->ctrl_ops->lower_intr(ctrl->priv_data, irq); + } + 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); + struct intr_controller * ctrl = NULL; + struct v3_intr_state * intr_state = &(info->intr_state); 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; - //} + list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) { + ctrl->ctrl_ops->raise_intr(ctrl->priv_data, irq); + } + 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) { return 1; - } else if (intr_state->controller->intr_pending(intr_state->controller_state) == 1) { - return 1; - } + } else { + struct intr_controller * ctrl = NULL; - /* Check [A]PIC */ + list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) { + if (ctrl->ctrl_ops->intr_pending(ctrl->priv_data) == 1) { + return 1; + } + } + } return 0; } -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; - } 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); - } + } else { + struct intr_controller * ctrl = NULL; + + 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); - /* someway to get the [A]PIC intr */ + PrintDebug("[get_intr_number] intr_number = %d\n", intr_num); + + return intr_num; + } + } + } return 0; } -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"); return EXCEPTION; - } else if (intr_state->controller->intr_pending(intr_state->controller_state)) { - PrintDebug("[get_intr_type] External_irq\n"); - return EXTERNAL_IRQ; + } else { + struct intr_controller * ctrl = NULL; + + 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"); + return EXTERNAL_IRQ; + } + } } - PrintDebug("[get_intr_type] Invalid_Intr\n"); + + PrintDebug("[get_intr_type] Invalid_Intr\n"); return INVALID_INTR; } @@ -230,8 +276,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"); @@ -241,8 +287,12 @@ int injecting_intr(struct guest_info * info, uint_t intr_num, intr_type_t type) 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); + struct intr_controller * ctrl = NULL; + + list_for_each_entry(ctrl, &(intr_state->controller_list), ctrl_node) { + PrintDebug("[injecting_intr] External_Irq with intr_num = %x\n", intr_num); + ctrl->ctrl_ops->begin_irq(ctrl->priv_data, intr_num); + } } return 0;