X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=65d01f47586b96c0755d168c4dadb23da2f4ab58;hp=c1e1fdb11b6a752f52f8f1f74b2ece9414d7d16f;hb=5f0b4f8c5f9f53cea37dde072b37d09ba316487d;hpb=03a41b18bdb6ce4bf666f18acdaf302e2360efdc diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c index c1e1fdb..65d01f4 100644 --- a/palacios/src/palacios/vmm_dev_mgr.c +++ b/palacios/src/palacios/vmm_dev_mgr.c @@ -17,300 +17,354 @@ * redistribute, and modify it as specified in the file "V3VEE_LICENSE". */ -#include #include #include #include #include -#ifndef DEBUG_DEV_MGR +#ifndef CONFIG_DEBUG_DEV_MGR #undef PrintDebug #define PrintDebug(fmt, args...) #endif +static struct hashtable * master_dev_table = NULL; -int v3_init_dev_mgr(struct guest_info * info) { - struct vmm_dev_mgr * mgr = &(info->dev_mgr); - INIT_LIST_HEAD(&(mgr->dev_list)); - mgr->num_devs = 0; - - INIT_LIST_HEAD(&(mgr->io_hooks)); - mgr->num_io_hooks = 0; +static uint_t dev_hash_fn(addr_t key) { + char * name = (char *)key; + return v3_hash_buffer((uchar_t *)name, strlen(name)); +} - return 0; +static int dev_eq_fn(addr_t key1, addr_t key2) { + char * name1 = (char *)key1; + char * name2 = (char *)key2; + + return (strcmp(name1, name2) == 0); } -int v3_dev_mgr_deinit(struct guest_info * info) { - struct vm_device * dev; - struct vmm_dev_mgr * mgr = &(info->dev_mgr); - struct vm_device * tmp; +int v3_init_devices() { + extern struct v3_device_info __start__v3_devices[]; + extern struct v3_device_info __stop__v3_devices[]; + struct v3_device_info * tmp_dev = __start__v3_devices; + int i = 0; - list_for_each_entry_safe(dev, tmp, &(mgr->dev_list), dev_link) { - v3_unattach_device(dev); - v3_free_device(dev); - } +#ifdef CONFIG_DEBUG_DEV_MGR + { + int num_devices = (__stop__v3_devices - __start__v3_devices) / sizeof(struct v3_device_info); + PrintDebug("%d Virtual devices registered with Palacios\n", num_devices); + } +#endif - return 0; -} + PrintDebug("Start addres=%p, Stop address=%p\n", __start__v3_devices, __stop__v3_devices); + master_dev_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn); -static int dev_mgr_add_device(struct vmm_dev_mgr * mgr, struct vm_device * dev) { - list_add(&(dev->dev_link), &(mgr->dev_list)); - mgr->num_devs++; + while (tmp_dev != __stop__v3_devices) { + PrintDebug("Device: %s\n", tmp_dev->name); - return 0; -} + if (v3_htable_search(master_dev_table, (addr_t)(tmp_dev->name))) { + PrintError("Multiple instance of device (%s)\n", tmp_dev->name); + return -1; + } -static int dev_mgr_remove_device(struct vmm_dev_mgr * mgr, struct vm_device * dev) { - list_del(&(dev->dev_link)); - mgr->num_devs--; + if (v3_htable_insert(master_dev_table, + (addr_t)(tmp_dev->name), + (addr_t)(tmp_dev->init)) == 0) { + PrintError("Could not add device %s to master list\n", tmp_dev->name); + return -1; + } - return 0; + tmp_dev = &(__start__v3_devices[++i]); + } + + + return 0; } +int v3_init_dev_mgr(struct guest_info * info) { + struct vmm_dev_mgr * mgr = &(info->dev_mgr); -/* IO HOOKS */ -static int dev_mgr_add_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) { - list_add(&(hook->mgr_list), &(mgr->io_hooks)); - mgr->num_io_hooks++; - return 0; -} + INIT_LIST_HEAD(&(mgr->dev_list)); + mgr->num_devs = 0; + mgr->dev_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn); -static int dev_mgr_remove_io_hook(struct vmm_dev_mgr * mgr, struct dev_io_hook * hook) { - list_del(&(hook->mgr_list)); - mgr->num_io_hooks--; + INIT_LIST_HEAD(&(mgr->blk_list)); + INIT_LIST_HEAD(&(mgr->net_list)); + INIT_LIST_HEAD(&(mgr->console_list)); - return 0; + mgr->blk_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn); + mgr->net_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn); + mgr->console_table = v3_create_htable(0, dev_hash_fn, dev_eq_fn); + + return 0; } -static int dev_add_io_hook(struct vm_device * dev, struct dev_io_hook * hook) { - list_add(&(hook->dev_list), &(dev->io_hooks)); - dev->num_io_hooks++; - return 0; +int v3_dev_mgr_deinit(struct guest_info * info) { + struct vm_device * dev; + struct vmm_dev_mgr * mgr = &(info->dev_mgr); + struct vm_device * tmp; + + list_for_each_entry_safe(dev, tmp, &(mgr->dev_list), dev_link) { + v3_detach_device(dev); + v3_free_device(dev); + } + + return 0; } -static int dev_remove_io_hook(struct vm_device * dev, struct dev_io_hook * hook) { - list_del(&(hook->dev_list)); - dev->num_io_hooks--; - return 0; +int v3_create_device(struct guest_info * info, const char * dev_name, v3_cfg_tree_t * cfg) { + int (*dev_init)(struct guest_info * info, void * cfg_data); + + dev_init = (void *)v3_htable_search(master_dev_table, (addr_t)dev_name); + + if (dev_init == NULL) { + PrintError("Could not find device %s in master device table\n", dev_name); + return -1; + } + + + if (dev_init(info, cfg) == -1) { + PrintError("Could not initialize Device %s\n", dev_name); + return -1; + } + + return 0; } +void v3_free_device(struct vm_device * dev) { + V3_Free(dev); +} -static struct dev_io_hook * dev_mgr_find_io_hook(struct vmm_dev_mgr * mgr, ushort_t port) { - struct dev_io_hook * tmp = NULL; +struct vm_device * v3_find_dev(struct guest_info * info, const char * dev_name) { + struct vmm_dev_mgr * mgr = &(info->dev_mgr); - list_for_each_entry(tmp, &(mgr->io_hooks), mgr_list) { - if (tmp->port == port) { - return tmp; + if (!dev_name) { + return NULL; } - } - return NULL; + + return (struct vm_device *)v3_htable_search(mgr->dev_table, (addr_t)dev_name); } -/* -static struct dev_io_hook * dev_find_io_hook(struct vm_device * dev, ushort_t port) { - struct dev_io_hook * tmp = NULL; +/****************************************************************/ +/* The remaining functions are called by the devices themselves */ +/****************************************************************/ - list_for_each_entry(tmp, &(dev->io_hooks), dev_list) { - if (tmp->port == port) { - return tmp; - } - } - return NULL; +/* IO HOOKS */ +int v3_dev_hook_io(struct vm_device * dev, uint16_t port, + int (*read)(uint16_t port, void * dst, uint_t length, struct vm_device * dev), + int (*write)(uint16_t port, void * src, uint_t length, struct vm_device * dev)) { + return v3_hook_io_port(dev->vm, port, + (int (*)(ushort_t, void *, uint_t, void *))read, + (int (*)(ushort_t, void *, uint_t, void *))write, + (void *)dev); } -*/ +int v3_dev_unhook_io(struct vm_device * dev, uint16_t port) { + return v3_unhook_io_port(dev->vm, port); +} -int v3_dev_hook_io(struct vm_device *dev, - ushort_t port, - int (*read)(ushort_t port, void * dst, uint_t length, struct vm_device * dev), - int (*write)(ushort_t port, void * src, uint_t length, struct vm_device * dev)) { - - struct dev_io_hook *hook = (struct dev_io_hook *)V3_Malloc(sizeof(struct dev_io_hook)); - - if (!hook) { - return -1; - } - if (v3_hook_io_port(dev->vm, port, - (int (*)(ushort_t, void *, uint_t, void *))read, - (int (*)(ushort_t, void *, uint_t, void *))write, - (void *)dev) == 0) { +int v3_detach_device(struct vm_device * dev) { + struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr); - hook->dev = dev; - hook->port = port; - hook->read = read; - hook->write = write; - - dev_mgr_add_io_hook(&(dev->vm->dev_mgr), hook); - dev_add_io_hook(dev, hook); - } else { + dev->ops->free(dev); - return -1; - } + list_del(&(dev->dev_link)); + mgr->num_devs--; - return 0; + dev->vm = NULL; + + return -1; } -int v3_dev_unhook_io(struct vm_device *dev, - ushort_t port) { +struct vm_device * v3_allocate_device(char * name, + struct v3_device_ops * ops, + void * private_data) { + struct vm_device * dev = NULL; - struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr); - struct dev_io_hook * hook = dev_mgr_find_io_hook(mgr, port); + dev = (struct vm_device*)V3_Malloc(sizeof(struct vm_device)); - if (!hook) { - return -1; - } + strncpy(dev->name, name, 32); + dev->ops = ops; + dev->private_data = private_data; - dev_mgr_remove_io_hook(mgr, hook); - dev_remove_io_hook(dev, hook); + dev->vm = NULL; - return v3_unhook_io_port(dev->vm, port); + return dev; } -int v3_attach_device(struct guest_info * vm, struct vm_device * dev) { - struct vmm_dev_mgr *mgr= &(vm->dev_mgr); - - dev->vm = vm; - dev_mgr_add_device(mgr, dev); - dev->ops->init(dev); +int v3_attach_device(struct guest_info * vm, struct vm_device * dev ) { + struct vmm_dev_mgr * mgr = &(vm->dev_mgr); + + dev->vm = vm; + + list_add(&(dev->dev_link), &(mgr->dev_list)); + mgr->num_devs++; + - return 0; + v3_htable_insert(mgr->dev_table, (addr_t)(dev->name), (addr_t)dev); + + return 0; } -int v3_unattach_device(struct vm_device * dev) { - struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr); - dev->ops->deinit(dev); - dev_mgr_remove_device(mgr, dev); - dev->vm = NULL; - return 0; +void v3_print_dev_mgr(struct guest_info * info) { + struct vmm_dev_mgr * mgr = &(info->dev_mgr); + struct vm_device * dev; + + V3_Print("%d devices registered with manager\n", mgr->num_devs); + + list_for_each_entry(dev, &(mgr->dev_list), dev_link) { + V3_Print("Device: %s\n", dev->name); + } + + return; } -#if 0 -static int dev_mgr_hook_mem(struct guest_info *vm, - struct vm_device *device, - void *start, - void *end) -{ +struct blk_frontend { + int (*connect)(struct guest_info * info, + void * frontend_data, + struct v3_dev_blk_ops * ops, + v3_cfg_tree_t * cfg, + void * priv_data); + - struct dev_mem_hook * hook = (struct dev_mem_hook*)V3_Malloc(sizeof(struct dev_mem_hook)); - // V3_Malloc(struct dev_mem_hook *, hook,sizeof(struct dev_mem_hook)); + struct list_head blk_node; - if (!hook) { - return -1; - } + void * priv_data; +}; - /* not implemented yet - hook_memory(vm->mem_map, - guest_physical_address_start, - guest_physical_address_end, - read, - write, - device); - */ - return -1; // remove when hook_memory works +int v3_dev_add_blk_frontend(struct guest_info * info, + char * name, + int (*connect)(struct guest_info * info, + void * frontend_data, + struct v3_dev_blk_ops * ops, + v3_cfg_tree_t * cfg, + void * priv_data), + void * priv_data) { + struct blk_frontend * frontend = NULL; - hook->addr_start = start; - hook->addr_end = end; + frontend = (struct blk_frontend *)V3_Malloc(sizeof(struct blk_frontend)); + memset(frontend, 0, sizeof(struct blk_frontend)); + + frontend->connect = connect; + frontend->priv_data = priv_data; + + list_add(&(frontend->blk_node), &(info->dev_mgr.blk_list)); + v3_htable_insert(info->dev_mgr.blk_table, (addr_t)(name), (addr_t)frontend); - return 0; - + return 0; } +int v3_dev_connect_blk(struct guest_info * info, + char * frontend_name, + struct v3_dev_blk_ops * ops, + v3_cfg_tree_t * cfg, + void * private_data) { -static int dev_mgr_unhook_mem(struct vm_device *dev, - addr_t start, - addr_t end) { - /* - struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr); - struct dev_mem_hook *hook = dev_mgr_find_mem_hook(mgr, start, end); - - if (!hook) { - // Very bad - unhooking something that doesn't exist! - return -1; - } - */ + struct blk_frontend * frontend = NULL; + + frontend = (struct blk_frontend *)v3_htable_search(info->dev_mgr.blk_table, + (addr_t)frontend_name); + + if (frontend == NULL) { + PrintError("Could not find frontend blk device %s\n", frontend_name); + return 0; + } - /* not implemented yet - return unhook_mem_port(vm->mem_map, - guest_physical_start, - guest_physical_end) ; + if (frontend->connect(info, frontend->priv_data, ops, cfg, private_data) == -1) { + PrintError("Error connecting to block frontend %s\n", frontend_name); + return -1; + } - */ - return -1; + return 0; } -#endif -#ifdef DEBUG_DEV_MGR -void PrintDebugDevMgr(struct guest_info * info) { - struct vmm_dev_mgr * mgr = &(info->dev_mgr); - struct vm_device * dev; - PrintDebug("%d devices registered with manager\n", mgr->num_devs); +struct net_frontend { + int (*connect)(struct guest_info * info, + void * frontend_data, + struct v3_dev_net_ops * ops, + v3_cfg_tree_t * cfg, + void * priv_data); + - list_for_each_entry(dev, &(mgr->dev_list), dev_link) { - PrintDebugDev(dev); - PrintDebug("next..\n"); - } + struct list_head net_node; - return; -} + void * priv_data; +}; -void PrintDebugDev(struct vm_device * dev) { - - PrintDebug("Device: %s\n", dev->name); - PrintDebugDevIO(dev); -} +int v3_dev_add_net_frontend(struct guest_info * info, + char * name, + int (*connect)(struct guest_info * info, + void * frontend_data, + struct v3_dev_net_ops * ops, + v3_cfg_tree_t * cfg, + void * private_data), + void * priv_data) +{ + struct net_frontend * frontend = NULL; -void PrintDebugDevMgrIO(struct vmm_dev_mgr * mgr) { + frontend = (struct net_frontend *)V3_Malloc(sizeof(struct net_frontend)); + memset(frontend, 0, sizeof(struct net_frontend)); + + frontend->connect = connect; + frontend->priv_data = priv_data; + + list_add(&(frontend->net_node), &(info->dev_mgr.net_list)); + v3_htable_insert(info->dev_mgr.net_table, (addr_t)(name), (addr_t)frontend); + return 0; } -void PrintDebugDevIO(struct vm_device * dev) { - struct dev_io_hook * hook; - PrintDebug("IO Hooks(%d) for Device: %s\n", dev->num_io_hooks, dev->name); +int v3_dev_connect_net(struct guest_info * info, + char * frontend_name, + struct v3_dev_net_ops * ops, + v3_cfg_tree_t * cfg, + void * private_data) +{ + struct net_frontend * frontend = NULL; + + frontend = (struct net_frontend *)v3_htable_search(info->dev_mgr.net_table, + (addr_t)frontend_name); + + if (frontend == NULL) { + PrintError("Could not find frontend net device %s\n", frontend_name); + return 0; + } - list_for_each_entry(hook, &(dev->io_hooks), dev_list) { - PrintDebug("\tPort: 0x%x (read=0x%p), (write=0x%p)\n", hook->port, - (void *)(addr_t)(hook->read), - (void *)(addr_t)(hook->write)); - } + if (frontend->connect(info, frontend->priv_data, ops, cfg, private_data) == -1) { + PrintError("Error connecting to net frontend %s\n", frontend_name); + return -1; + } - return; + return 0; } -#else -void PrintDebugDevMgr(struct guest_info * info) {} -void PrintDebugDev(struct vm_device * dev) {} -void PrintDebugDevMgrIO(struct vmm_dev_mgr * mgr) {} -void PrintDebugDevIO(struct vm_device * dev) {} -#endif