X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=e6fad6929ca673cebaa216c9968f893a2f88803c;hb=5d1bbcc86de011e3f0d115b6f10fd8645cdf855e;hp=70d0d5e3fb3e24ae8bbb16313a3ab94ba684e58b;hpb=72420d58d18ec71d4777d029daaf0c6a1c820b32;p=palacios.git diff --git a/palacios/src/palacios/vmm_dev_mgr.c b/palacios/src/palacios/vmm_dev_mgr.c index 70d0d5e..e6fad69 100644 --- a/palacios/src/palacios/vmm_dev_mgr.c +++ b/palacios/src/palacios/vmm_dev_mgr.c @@ -22,8 +22,12 @@ #include #include +#ifdef V3_CONFIG_CHECKPOINT +#include +#endif + -#ifndef CONFIG_DEBUG_DEV_MGR +#ifndef V3_CONFIG_DEBUG_DEV_MGR #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -44,13 +48,13 @@ static int dev_eq_fn(addr_t key1, addr_t key2) { } -int v3_init_devices() { +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; -#ifdef CONFIG_DEBUG_DEV_MGR +#ifdef V3_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); @@ -86,6 +90,12 @@ int v3_init_devices() { } +int V3_deinit_devices() { + v3_free_htable(master_dev_table, 0, 0); + return 0; +} + + int v3_init_dev_mgr(struct v3_vm_info * vm) { struct vmm_dev_mgr * mgr = &(vm->dev_mgr); @@ -108,19 +118,94 @@ int v3_init_dev_mgr(struct v3_vm_info * vm) { } -int v3_dev_mgr_deinit(struct v3_vm_info * vm) { - struct vm_device * dev; +int v3_free_vm_devices(struct v3_vm_info * vm) { struct vmm_dev_mgr * mgr = &(vm->dev_mgr); + struct vm_device * dev; struct vm_device * tmp; list_for_each_entry_safe(dev, tmp, &(mgr->dev_list), dev_link) { v3_remove_device(dev); } - v3_free_htable(mgr->blk_table, 0, 0); - v3_free_htable(mgr->net_table, 0, 0); - v3_free_htable(mgr->char_table, 0, 0); - v3_free_htable(mgr->cons_table, 0, 0); + return 0; +} + +#ifdef V3_CONFIG_CHECKPOINT + +int v3_save_vm_devices(struct v3_vm_info * vm, struct v3_chkpt * chkpt) { + struct vmm_dev_mgr * mgr = &(vm->dev_mgr); + struct vm_device * dev; + struct v3_chkpt_ctx * dev_mgr_ctx = NULL; + + uint32_t num_saved_devs = 0; + uint32_t table_len = mgr->num_devs * 32; + char * name_table = NULL; + uint32_t tbl_offset = 0; + + name_table = V3_Malloc(table_len); + + memset(name_table, 0, table_len); + + + dev_mgr_ctx = v3_chkpt_open_ctx(chkpt, NULL, "devices"); + + list_for_each_entry(dev, &(mgr->dev_list), dev_link) { + + if (dev->ops->save) { + struct v3_chkpt_ctx * dev_ctx = NULL; + + + dev_ctx = v3_chkpt_open_ctx(chkpt, dev_mgr_ctx, dev->name); + + dev->ops->save(dev_ctx, dev->private_data); + + v3_chkpt_close_ctx(dev_ctx); + + // Error checking?? + + strncpy(name_table + tbl_offset, dev->name, 32); + tbl_offset += 32; + num_saved_devs++; + } else { + PrintError("Error: %s save() not implemented\n", dev->name); + } + } + + + // Specify which devices were saved + v3_chkpt_save(dev_mgr_ctx, "num_devs", 4, &num_saved_devs); + v3_chkpt_save(dev_mgr_ctx, "names", table_len, name_table); + V3_Free(name_table); + + v3_chkpt_close_ctx(dev_mgr_ctx); + + return 0; +} + + +int v3_load_vm_devices(struct v3_vm_info * vm, struct v3_chkpt * chkpt) { + + PrintError("TODO... \n"); + + // Read devices from checkpoint data + // selectively load them + + return 0; +} + + +#endif + +static int free_frontends(struct v3_vm_info * vm, struct vmm_dev_mgr * mgr); + +int v3_deinit_dev_mgr(struct v3_vm_info * vm) { + struct vmm_dev_mgr * mgr = &(vm->dev_mgr); + + // clear frontend lists + + free_frontends(vm, mgr); + + v3_free_htable(mgr->dev_table, 0, 0); @@ -166,55 +251,108 @@ struct vm_device * v3_find_dev(struct v3_vm_info * vm, const char * dev_name) { /* The remaining functions are called by the devices themselves */ /****************************************************************/ -struct dev_io_hook { - uint16_t port; +typedef enum {DEV_IO_HOOK, DEV_MSR_HOOK, DEV_CPUID_HOOK, DEV_MEM_HOOK, DEV_HCALL_HOOK} dev_rsrc_type_t; - struct list_head node; +struct dev_rsrc { + dev_rsrc_type_t type; + uint64_t rsrc; + struct list_head node; }; -/* IO HOOKS */ + + +static int add_resource(struct vm_device * dev, dev_rsrc_type_t type, uint64_t rsrc_id) { + struct dev_rsrc * resource = NULL; + + resource = V3_Malloc(sizeof(struct dev_rsrc)); + + if (resource == NULL) { + PrintError("Error: Could not allocate device resource\n"); + return -1; + } + + resource->rsrc = rsrc_id; + resource->type = type; + + list_add(&(resource->node), &(dev->res_hooks)); + return 0; +} + +static int free_resource(struct vm_device * dev, dev_rsrc_type_t type, uint64_t rsrc_id) { + struct dev_rsrc * resource = NULL; + struct dev_rsrc * tmp; + + list_for_each_entry_safe(resource, tmp, &(dev->res_hooks), node) { + if ((resource->type == type) && + (resource->rsrc == rsrc_id)) { + + list_del(&(resource->node)); + V3_Free(resource); + + return 0; + } + } + + return -1; +} + + int v3_dev_hook_io(struct vm_device * dev, uint16_t port, int (*read)(struct guest_info * core, uint16_t port, void * dst, uint_t length, void * priv_data), int (*write)(struct guest_info * core, uint16_t port, void * src, uint_t length, void * priv_data)) { - struct dev_io_hook * io_hook = NULL; int ret = 0; - ret = v3_hook_io_port(dev->vm, port, - (int (*)(struct guest_info * core, ushort_t, void *, uint_t, void *))read, - (int (*)(struct guest_info * core, ushort_t, void *, uint_t, void *))write, - (void *)dev->private_data); + ret = v3_hook_io_port(dev->vm, port, + (int (*)(struct guest_info * core, uint16_t, void *, uint_t, void *))read, + (int (*)(struct guest_info * core, uint16_t, void *, uint_t, void *))write, + (void *)dev->private_data); - if (ret == -1) { - return -1; - } + if (ret == -1) { + return -1; + } - io_hook = V3_Malloc(sizeof(struct dev_io_hook)); + if (add_resource(dev, DEV_IO_HOOK, port) == -1) { + v3_unhook_io_port(dev->vm, port); + PrintError("Could not allocate io hook dev state\n"); + return -1; + } + + return 0; +} - if (io_hook == NULL) { - PrintError("Could not allocate io hook dev state\n"); - return -1; - } - io_hook->port = port; - list_add(&(io_hook->node), &(dev->io_hooks)); +int v3_dev_unhook_io(struct vm_device * dev, uint16_t port) { + if (free_resource(dev, DEV_IO_HOOK, port) == 0) { + return v3_unhook_io_port(dev->vm, port); + } - return 0; + return -1; } -int v3_dev_unhook_io(struct vm_device * dev, uint16_t port) { - struct dev_io_hook * io_hook = NULL; - struct dev_io_hook * tmp; +int v3_dev_hook_msr(struct vm_device * dev, uint32_t msr, + int (*read)(struct guest_info * core, uint32_t msr, struct v3_msr * dst, void * priv_data), + int (*write)(struct guest_info * core, uint32_t msr, struct v3_msr src, void * priv_data)) { + int ret = 0; - list_for_each_entry_safe(io_hook, tmp, &(dev->io_hooks), node) { - if (io_hook->port == port) { + ret = v3_hook_msr(dev->vm, msr, read, write, dev->private_data); - list_del(&(io_hook->node)); - V3_Free(io_hook); - - return v3_unhook_io_port(dev->vm, port); - } + if (ret == -1) { + return -1; + } + + if (add_resource(dev, DEV_MSR_HOOK, msr) == -1) { + v3_unhook_msr(dev->vm, msr); + return -1; + } + + return 0; +} + +int v3_dev_unhook_msr(struct vm_device * dev, uint32_t msr) { + if (free_resource(dev, DEV_MSR_HOOK, msr) == 0) { + return v3_unhook_msr(dev->vm, msr); } return -1; @@ -222,19 +360,25 @@ int v3_dev_unhook_io(struct vm_device * dev, uint16_t port) { + int v3_remove_device(struct vm_device * dev) { struct vmm_dev_mgr * mgr = &(dev->vm->dev_mgr); - struct dev_io_hook * io_hook = NULL; - struct dev_io_hook * tmp; + struct dev_rsrc * resource = NULL; + struct dev_rsrc * tmp; + + list_for_each_entry_safe(resource, tmp, &(dev->res_hooks), node) { + if (resource->type == DEV_IO_HOOK) { + v3_unhook_io_port(dev->vm, (uint16_t)(resource->rsrc)); + } else if (resource->type == DEV_MSR_HOOK) { + v3_unhook_msr(dev->vm, (uint32_t)(resource->rsrc)); + } - list_for_each_entry_safe(io_hook, tmp, &(dev->io_hooks), node) { - v3_unhook_io_port(dev->vm, io_hook->port); - list_del(&(io_hook->node)); - V3_Free(io_hook); + list_del(&(resource->node)); + V3_Free(resource); } if (dev->ops->free) { - dev->ops->free(dev); + dev->ops->free(dev->private_data); } else { PrintError("Error: %s free() not implemented\n", dev->name); } @@ -262,7 +406,7 @@ struct vm_device * v3_add_device(struct v3_vm_info * vm, return NULL; } - INIT_LIST_HEAD(&(dev->io_hooks)); + INIT_LIST_HEAD(&(dev->res_hooks)); strncpy(dev->name, name, 32); dev->ops = ops; @@ -547,3 +691,45 @@ int v3_dev_connect_char(struct v3_vm_info * vm, return 0; } + + +static int free_frontends(struct v3_vm_info * vm, struct vmm_dev_mgr * mgr) { + struct char_frontend * chr = NULL; + struct char_frontend * tmp_chr = NULL; + struct cons_frontend * cons = NULL; + struct cons_frontend * tmp_cons = NULL; + struct net_frontend * net = NULL; + struct net_frontend * tmp_net = NULL; + struct blk_frontend * blk = NULL; + struct blk_frontend * tmp_blk = NULL; + + + + list_for_each_entry_safe(chr, tmp_chr, &(mgr->char_list), char_node) { + list_del(&(chr->char_node)); + V3_Free(chr); + } + + list_for_each_entry_safe(cons, tmp_cons, &(mgr->cons_list), cons_node) { + list_del(&(cons->cons_node)); + V3_Free(cons); + } + + list_for_each_entry_safe(net, tmp_net, &(mgr->net_list), net_node) { + list_del(&(net->net_node)); + V3_Free(net); + } + + list_for_each_entry_safe(blk, tmp_blk, &(mgr->blk_list), blk_node) { + list_del(&(blk->blk_node)); + V3_Free(blk); + } + + v3_free_htable(mgr->blk_table, 0, 0); + v3_free_htable(mgr->net_table, 0, 0); + v3_free_htable(mgr->char_table, 0, 0); + v3_free_htable(mgr->cons_table, 0, 0); + + + return 0; +}