X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_dev_mgr.c;h=0b1619653117f29377444b7d040fbee2fb892b83;hb=7ca1f3f6bcb065c7c28b98f049d4abbca21a7bc1;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..0b16196 100644 --- a/palacios/src/palacios/vmm_dev_mgr.c +++ b/palacios/src/palacios/vmm_dev_mgr.c @@ -22,8 +22,15 @@ #include #include +#ifdef V3_CONFIG_CHECKPOINT +#include -#ifndef CONFIG_DEBUG_DEV_MGR +#define V3_MAX_DEVICE_NAME 32 + +#endif + + +#ifndef V3_CONFIG_DEBUG_DEV_MGR #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -44,13 +51,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); @@ -64,7 +71,7 @@ int v3_init_devices() { while (tmp_dev != __stop__v3_devices) { - PrintDebug("Device: %s\n", tmp_dev->name); + V3_Print("Registering Device: %s\n", tmp_dev->name); if (v3_htable_search(master_dev_table, (addr_t)(tmp_dev->name))) { PrintError("Multiple instance of device (%s)\n", tmp_dev->name); @@ -86,6 +93,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 +121,190 @@ 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 * V3_MAX_DEVICE_NAME; + char * name_table = NULL; + uint32_t tbl_offset = 0; + + name_table = V3_Malloc(table_len); + + if (!name_table) { + PrintError("Unable to allocate space in device manager save\n"); + return -1; + } + + memset(name_table, 0, table_len); + + dev_mgr_ctx = v3_chkpt_open_ctx(chkpt, NULL, "devices"); + + if (!dev_mgr_ctx) { + PrintError("Unable to open device manager context\n"); + V3_Free(name_table); + return -1; + } + + list_for_each_entry(dev, &(mgr->dev_list), dev_link) { + if (dev->ops->save) { + strncpy(name_table + tbl_offset, dev->name, V3_MAX_DEVICE_NAME); + tbl_offset += V3_MAX_DEVICE_NAME; + num_saved_devs++; + } else { + PrintDebug("Skipping device %s\n"); + } + } + + if (v3_chkpt_save(dev_mgr_ctx, "num_devs", 4, &num_saved_devs) == -1) { + PrintError("Unable to store num_devs\n"); + v3_chkpt_close_ctx(dev_mgr_ctx); + V3_Free(name_table); + return -1; + } + + if (v3_chkpt_save(dev_mgr_ctx, "names", num_saved_devs*V3_MAX_DEVICE_NAME, name_table) == -1) { + PrintError("Unable to store names of devices\n"); + v3_chkpt_close_ctx(dev_mgr_ctx); + V3_Free(name_table); + return -1; + } + + v3_chkpt_close_ctx(dev_mgr_ctx); + + V3_Free(name_table); + + list_for_each_entry(dev, &(mgr->dev_list), dev_link) { + if (dev->ops->save) { + struct v3_chkpt_ctx * dev_ctx = NULL; + + V3_Print("Saving state for device (%s)\n", dev->name); + + dev_ctx = v3_chkpt_open_ctx(chkpt, NULL, dev->name); + + if (!dev_ctx) { + PrintError("Unable to open context for device %s\n",dev->name); + return -1; + } + + if (dev->ops->save(dev_ctx, dev->private_data)) { + PrintError("Unable t save device %s\n",dev->name); + v3_chkpt_close_ctx(dev_ctx); + return -1; + } + + v3_chkpt_close_ctx(dev_ctx); + + // Error checking?? + } else { + PrintError("Error: %s save() not implemented\n", dev->name); + } + } + + return 0; +} + + +int v3_load_vm_devices(struct v3_vm_info * vm, struct v3_chkpt * chkpt) { + struct vm_device * dev; + struct v3_chkpt_ctx * dev_mgr_ctx = NULL; + uint32_t num_devs = 0; + char * name_table = NULL; + int i = 0; + + dev_mgr_ctx = v3_chkpt_open_ctx(chkpt, NULL, "devices"); + + if (!dev_mgr_ctx) { + PrintError("Unable to open devices for load\n"); + return -1; + } + + if (v3_chkpt_load(dev_mgr_ctx, "num_devs", 4, &num_devs) == -1) { + PrintError("Unable to load num_devs\n"); + v3_chkpt_close_ctx(dev_mgr_ctx); + return -1; + } + + V3_Print("Loading State for %d devices\n", num_devs); + + name_table = V3_Malloc(V3_MAX_DEVICE_NAME * num_devs); + + if (!name_table) { + PrintError("Unable to allocate space for device table\n"); + v3_chkpt_close_ctx(dev_mgr_ctx); + return -1; + } + + if (v3_chkpt_load(dev_mgr_ctx, "names", V3_MAX_DEVICE_NAME * num_devs, name_table) == -1) { + PrintError("Unable to load device name table\n"); + v3_chkpt_close_ctx(dev_mgr_ctx); + V3_Free(name_table); + } + + v3_chkpt_close_ctx(dev_mgr_ctx); + + for (i = 0; i < num_devs; i++) { + char * name = &(name_table[i * V3_MAX_DEVICE_NAME]); + struct v3_chkpt_ctx * dev_ctx = NULL; + dev = v3_find_dev(vm, name); + + if (!dev) { + PrintError("Tried to load state into non existant device: %s\n", name); + continue; + } + + if (!dev->ops->load) { + PrintError("Error Device (%s) does not support load operation\n", name); + continue; + } + + dev_ctx = v3_chkpt_open_ctx(chkpt, NULL, name); + + if (!dev_ctx) { + PrintError("Error missing device context (%s)\n", name); + continue; + } + + + if (dev->ops->load(dev_ctx, dev->private_data)) { + PrintError("Load of device %s failed\n",name); + } + + v3_chkpt_close_ctx(dev_ctx); + } + + V3_Free(name_table); + + 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 +350,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 +459,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); } @@ -256,13 +499,21 @@ struct vm_device * v3_add_device(struct v3_vm_info * vm, struct vmm_dev_mgr * mgr = &(vm->dev_mgr); struct vm_device * dev = NULL; + + // Check if we already registered a device of the same name + if (v3_htable_search(mgr->dev_table, (addr_t)name) != (addr_t)NULL) { + PrintError("Device with name (%s) already registered with VM\n", name); + return NULL; + } + dev = (struct vm_device *)V3_Malloc(sizeof(struct vm_device)); if (dev == NULL) { + PrintError("Cannot allocate in adding a device\n"); return NULL; } - INIT_LIST_HEAD(&(dev->io_hooks)); + INIT_LIST_HEAD(&(dev->res_hooks)); strncpy(dev->name, name, 32); dev->ops = ops; @@ -322,6 +573,12 @@ int v3_dev_add_blk_frontend(struct v3_vm_info * vm, struct blk_frontend * frontend = NULL; frontend = (struct blk_frontend *)V3_Malloc(sizeof(struct blk_frontend)); + + if (!frontend) { + PrintError("Cannot allocate in adding a block front end\n"); + return -1; + } + memset(frontend, 0, sizeof(struct blk_frontend)); frontend->connect = connect; @@ -385,6 +642,12 @@ int v3_dev_add_net_frontend(struct v3_vm_info * vm, struct net_frontend * frontend = NULL; frontend = (struct net_frontend *)V3_Malloc(sizeof(struct net_frontend)); + + if (!frontend) { + PrintError("Cannot allocate in adding a net front end\n"); + return -1; + } + memset(frontend, 0, sizeof(struct net_frontend)); frontend->connect = connect; @@ -447,6 +710,12 @@ int v3_dev_add_console_frontend(struct v3_vm_info * vm, struct cons_frontend * frontend = NULL; frontend = (struct cons_frontend *)V3_Malloc(sizeof(struct cons_frontend)); + + if (!frontend) { + PrintError("Cannot allocate in adding a console front end\n"); + return -1; + } + memset(frontend, 0, sizeof(struct cons_frontend)); frontend->connect = connect; @@ -510,6 +779,12 @@ int v3_dev_add_char_frontend(struct v3_vm_info * vm, struct char_frontend * frontend = NULL; frontend = (struct char_frontend *)V3_Malloc(sizeof(struct char_frontend)); + + if (!frontend) { + PrintError("Cannot allocate in adding a char front end\n"); + return -1; + } + memset(frontend, 0, sizeof(struct char_frontend)); frontend->connect = connect; @@ -547,3 +822,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; +}