X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_io.c;h=9756eb4140dbb46b6d71e6e289cd164ca73de6dc;hb=c163873b7b96544683030cafba0e73a7ed988171;hp=52945ad2257db7ba86c60b83622cbb4b6265eb64;hpb=091d8b1fcfc3a766f6603d4c1c69d9f8f4bf3031;p=palacios.git diff --git a/palacios/src/palacios/vmm_io.c b/palacios/src/palacios/vmm_io.c index 52945ad..9756eb4 100644 --- a/palacios/src/palacios/vmm_io.c +++ b/palacios/src/palacios/vmm_io.c @@ -1,5 +1,21 @@ -/* (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 @@ -18,89 +34,78 @@ static int default_write(ushort_t port, void *src, uint_t length, void * priv_da static int default_read(ushort_t port, void * dst, uint_t length, void * priv_data); -void init_vmm_io_map(struct guest_info * info) { - struct vmm_io_map * io_map = &(info->io_map); - io_map->num_ports = 0; - io_map->head = NULL; +void v3_init_io_map(struct guest_info * info) { + info->io_map.rb_node = NULL; } +static inline struct v3_io_hook * __insert_io_hook(struct guest_info * info, struct v3_io_hook * hook) { + struct rb_node ** p = &(info->io_map.rb_node); + struct rb_node * parent = NULL; + struct v3_io_hook * tmp_hook = NULL; -static int add_io_hook(struct vmm_io_map * io_map, struct vmm_io_hook * io_hook) { - - if (!(io_map->head)) { - io_map->head = io_hook; - io_map->num_ports = 1; - return 0; - } else if (io_map->head->port > io_hook->port) { - io_hook->next = io_map->head; - - io_map->head->prev = io_hook; - io_map->head = io_hook; - io_map->num_ports++; + while (*p) { + parent = *p; + tmp_hook = rb_entry(parent, struct v3_io_hook, tree_node); - return 0; - } else { - struct vmm_io_hook * tmp_hook = io_map->head; - - while ((tmp_hook->next) && - (tmp_hook->next->port <= io_hook->port)) { - tmp_hook = tmp_hook->next; - } - - if (tmp_hook->port == io_hook->port) { - //tmp_hook->read = io_hook->read; - //tmp_hook->write = io_hook->write; - //V3_Free(io_hook); - return -1; + if (hook->port < tmp_hook->port) { + p = &(*p)->rb_left; + } else if (hook->port > tmp_hook->port) { + p = &(*p)->rb_right; } else { - io_hook->prev = tmp_hook; - io_hook->next = tmp_hook->next; + return tmp_hook; + } + } + rb_link_node(&(hook->tree_node), parent, p); - if (tmp_hook->next) { - tmp_hook->next->prev = io_hook; - } + return NULL; +} - tmp_hook->next = io_hook; - io_map->num_ports++; - return 0; - } +static inline struct v3_io_hook * insert_io_hook(struct guest_info * info, struct v3_io_hook * hook) { + struct v3_io_hook * ret; + + if ((ret = __insert_io_hook(info, hook))) { + return ret; } - return -1; + + v3_rb_insert_color(&(hook->tree_node), &(info->io_map)); + + return NULL; } -static int remove_io_hook(struct vmm_io_map * io_map, struct vmm_io_hook * io_hook) { - if (io_map->head == io_hook) { - io_map->head = io_hook->next; - } else if (io_hook->prev) { - io_hook->prev->next = io_hook->next; - } else { - return -1; - // data corruption failure - } - - if (io_hook->next) { - io_hook->next->prev = io_hook->prev; - } - io_map->num_ports--; +struct v3_io_hook * v3_get_io_hook(struct guest_info * info, uint_t port) { + struct rb_node * n = info->io_map.rb_node; + struct v3_io_hook * hook = NULL; - return 0; + while (n) { + hook = rb_entry(n, struct v3_io_hook, tree_node); + + if (port < hook->port) { + n = n->rb_left; + } else if (port > hook->port) { + n = n->rb_right; + } else { + return hook; + } + } + + return NULL; } + int v3_hook_io_port(struct guest_info * info, uint_t port, int (*read)(ushort_t port, void * dst, uint_t length, void * priv_data), int (*write)(ushort_t port, void * src, uint_t length, void * priv_data), void * priv_data) { - struct vmm_io_map * io_map = &(info->io_map); - struct vmm_io_hook * io_hook = (struct vmm_io_hook *)V3_Malloc(sizeof(struct vmm_io_hook)); + struct v3_io_hook * io_hook = (struct v3_io_hook *)V3_Malloc(sizeof(struct v3_io_hook)); io_hook->port = port; @@ -116,12 +121,10 @@ int v3_hook_io_port(struct guest_info * info, uint_t port, io_hook->write = write; } - io_hook->next = NULL; - io_hook->prev = NULL; io_hook->priv_data = priv_data; - if (add_io_hook(io_map, io_hook) != 0) { + if (insert_io_hook(info, io_hook)) { V3_Free(io_hook); return -1; } @@ -130,38 +133,37 @@ int v3_hook_io_port(struct guest_info * info, uint_t port, } int v3_unhook_io_port(struct guest_info * info, uint_t port) { - struct vmm_io_map * io_map = &(info->io_map); - struct vmm_io_hook * hook = v3_get_io_hook(io_map, port); + struct v3_io_hook * hook = v3_get_io_hook(info, port); if (hook == NULL) { return -1; } - remove_io_hook(io_map, hook); + v3_rb_erase(&(hook->tree_node), &(info->io_map)); + + V3_Free(hook); + return 0; } -struct vmm_io_hook * v3_get_io_hook(struct vmm_io_map * io_map, uint_t port) { - struct vmm_io_hook * tmp_hook; - FOREACH_IO_HOOK(*io_map, tmp_hook) { - if (tmp_hook->port == port) { - return tmp_hook; - } - } - return NULL; -} -void PrintDebugIOMap(struct vmm_io_map * io_map) { - struct vmm_io_hook * iter = io_map->head; - PrintDebug("VMM IO Map (Entries=%d)\n", io_map->num_ports); +void v3_print_io_map(struct guest_info * info) { + struct v3_io_hook * tmp_hook = NULL; + struct rb_node * node = v3_rb_first(&(info->io_map)); - while (iter) { - PrintDebug("IO Port: %hu (Read=%x) (Write=%x)\n", iter->port, iter->read, iter->write); - } + PrintDebug("VMM IO Map\n"); + + do { + tmp_hook = rb_entry(node, struct v3_io_hook, tree_node); + + PrintDebug("IO Port: %hu (Read=%p) (Write=%p)\n", + tmp_hook->port, + (void *)(tmp_hook->read), (void *)(tmp_hook->write)); + } while ((node = v3_rb_next(node))); }