X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fvm.c;h=54d5efde8fbd7a1dbad360c0f82ff6d51affc461;hb=a1e79c2d8ac8ae6ee326c207a83562e7de025ef8;hp=40cfa0621ca9e00592562c7ac71fbd3315404e19;hpb=e784113618800cede961f9a86084a96d20179e1c;p=palacios.git diff --git a/linux_module/vm.c b/linux_module/vm.c index 40cfa06..54d5efd 100644 --- a/linux_module/vm.c +++ b/linux_module/vm.c @@ -70,7 +70,7 @@ int add_guest_ctrl(struct v3_guest * guest, unsigned int cmd, unsigned int cmd, unsigned long arg, void * priv_data), void * priv_data) { - struct vm_ctrl * ctrl = kmalloc(sizeof(struct vm_ctrl), GFP_KERNEL); + struct vm_ctrl * ctrl = palacios_alloc(sizeof(struct vm_ctrl)); if (ctrl == NULL) { WARNING("Error: Could not allocate vm ctrl %d\n", cmd); @@ -83,7 +83,7 @@ int add_guest_ctrl(struct v3_guest * guest, unsigned int cmd, if (__insert_ctrl(guest, ctrl) != NULL) { WARNING("Could not insert guest ctrl %d\n", cmd); - kfree(ctrl); + palacios_free(ctrl); return -1; } @@ -93,6 +93,8 @@ int add_guest_ctrl(struct v3_guest * guest, unsigned int cmd, } + + static struct vm_ctrl * get_ctrl(struct v3_guest * guest, unsigned int cmd) { struct rb_node * n = guest->vm_ctrls.rb_node; struct vm_ctrl * ctrl = NULL; @@ -112,6 +114,35 @@ static struct vm_ctrl * get_ctrl(struct v3_guest * guest, unsigned int cmd) { return NULL; } +int remove_guest_ctrl(struct v3_guest * guest, unsigned int cmd) { + struct vm_ctrl * ctrl = get_ctrl(guest, cmd); + + if (ctrl == NULL) { + INFO("Could not find control (%d) to remove\n", cmd); + return -1; + } + + rb_erase(&(ctrl->tree_node), &(guest->vm_ctrls)); + + kfree(ctrl); + + return 0; +} + +static void free_guest_ctrls(struct v3_guest * guest) { + struct rb_node * node = rb_first(&(guest->vm_ctrls)); + struct vm_ctrl * ctrl = NULL; + + while (node) { + ctrl = rb_entry(node, struct vm_ctrl, tree_node); + + node = rb_next(node); + + WARNING("Cleaning up guest ctrl that was not removed explicitly (%d)\n", ctrl->cmd); + + kfree(ctrl); + } +} @@ -199,7 +230,7 @@ static long v3_vm_ioctl(struct file * filp, return -EFAULT; } - NOTICE("Loading Guest to %s:%s\n", chkpt.store, chkpt.url); + NOTICE("Loading Guest from %s:%s\n", chkpt.store, chkpt.url); if (v3_load_vm(guest->v3_ctx, chkpt.store, chkpt.url) == -1) { WARNING("Error Loading VM state\n"); @@ -209,6 +240,53 @@ static long v3_vm_ioctl(struct file * filp, break; } #endif + +#ifdef V3_CONFIG_LIVE_MIGRATION + case V3_VM_SEND: { + struct v3_chkpt_info chkpt_info; + void __user * argp = (void __user *)arg; + + memset(&chkpt_info,0, sizeof(struct v3_chkpt_info)); + + if(copy_from_user(&chkpt_info, argp, sizeof(struct v3_chkpt_info))){ + WARNING("Copy from user error getting checkpoint info\n"); + return -EFAULT; + } + + + NOTICE("Sending (live-migrating) Guest to %s:%s\n",chkpt_info.store, chkpt_info.url); + + if (v3_send_vm(guest->v3_ctx, chkpt_info.store, chkpt_info.url) == -1) { + WARNING("Error sending VM\n"); + return -EFAULT; + } + + break; + } + + case V3_VM_RECEIVE: { + struct v3_chkpt_info chkpt_info; + void __user * argp = (void __user *)arg; + + memset(&chkpt_info,0, sizeof(struct v3_chkpt_info)); + + if(copy_from_user(&chkpt_info, argp, sizeof(struct v3_chkpt_info))){ + WARNING("Copy from user error getting checkpoint info\n"); + return -EFAULT; + } + + + NOTICE("Receiving (live-migrating) Guest to %s:%s\n",chkpt_info.store, chkpt_info.url); + + if (v3_receive_vm(guest->v3_ctx, chkpt_info.store, chkpt_info.url) == -1) { + WARNING("Error receiving VM\n"); + return -EFAULT; + } + + break; + } +#endif + case V3_VM_DEBUG: { struct v3_debug_cmd cmd; struct v3_debug_event evt; @@ -217,17 +295,17 @@ static long v3_vm_ioctl(struct file * filp, memset(&cmd, 0, sizeof(struct v3_debug_cmd)); if (copy_from_user(&cmd, argp, sizeof(struct v3_debug_cmd))) { - printk("Error: Could not copy debug command from user space\n"); + ERROR("Error: Could not copy debug command from user space\n"); return -EFAULT; } evt.core_id = cmd.core; evt.cmd = cmd.cmd; - printk("Debugging VM\n"); + INFO("Debugging VM\n"); if (v3_deliver_debug_event(guest->v3_ctx, &evt) == -1) { - printk("Error could not deliver debug cmd\n"); + ERROR("Error could not deliver debug cmd\n"); return -EFAULT; } @@ -303,16 +381,18 @@ extern u32 frees; int create_palacios_vm(struct v3_guest * guest) { int err; - init_vm_extensions(guest); + if (init_vm_extensions(guest) < 0) { + WARNING("palacios: failed to initialize extensions\n"); + return -1; + } guest->v3_ctx = v3_create_vm(guest->img, (void *)guest, guest->name); if (guest->v3_ctx == NULL) { WARNING("palacios: failed to create vm\n"); - return -1; + goto out_err; } - NOTICE("Creating VM device: Major %d, Minor %d\n", MAJOR(guest->vm_dev), MINOR(guest->vm_dev)); cdev_init(&(guest->cdev), &v3_vm_fops); @@ -326,20 +406,25 @@ int create_palacios_vm(struct v3_guest * guest) { if (err) { WARNING("Fails to add cdev\n"); - v3_free_vm(guest->v3_ctx); - return -1; + goto out_err1; } if (device_create(v3_class, NULL, guest->vm_dev, guest, "v3-vm%d", MINOR(guest->vm_dev)) == NULL){ WARNING("Fails to create device\n"); - cdev_del(&(guest->cdev)); - v3_free_vm(guest->v3_ctx); - return -1; + goto out_err2; } NOTICE("palacios: vm created at /dev/v3-vm%d\n", MINOR(guest->vm_dev)); return 0; + +out_err2: + cdev_del(&(guest->cdev)); +out_err1: + v3_free_vm(guest->v3_ctx); +out_err: + deinit_vm_extensions(guest); + return -1; } @@ -348,14 +433,19 @@ int create_palacios_vm(struct v3_guest * guest) { int free_palacios_vm(struct v3_guest * guest) { - v3_free_vm(guest->v3_ctx); + if (v3_free_vm(guest->v3_ctx)<0) { + return -1; + } device_destroy(v3_class, guest->vm_dev); cdev_del(&(guest->cdev)); + free_guest_ctrls(guest); + + vfree(guest->img); - kfree(guest); + palacios_free(guest); return 0; }