X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fvm.c;h=440ff69f660c391e9d8b36f83080ed9be11f22cf;hb=a569df65eac9f48c73e30f85afbb385f65c2eb38;hp=b14cff42c57cdfa4579a5b9a746b1594d22f43a6;hpb=4b9f54d875c87a0b06337fb64239278d6cfc02fa;p=palacios.git diff --git a/linux_module/vm.c b/linux_module/vm.c index b14cff4..440ff69 100644 --- a/linux_module/vm.c +++ b/linux_module/vm.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -93,6 +92,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 +113,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)); + + palacios_free(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); + + palacios_free(ctrl); + } +} @@ -126,7 +156,7 @@ static long v3_vm_ioctl(struct file * filp, struct v3_guest * guest = filp->private_data; - INFO("V3 IOCTL %d\n", ioctl); + DEBUG("V3 IOCTL %d\n", ioctl); switch (ioctl) { case V3_VM_LAUNCH: { @@ -165,6 +195,38 @@ static long v3_vm_ioctl(struct file * filp, v3_simulate_vm(guest->v3_ctx, arg); break; } + case V3_VM_RESET: { + struct v3_reset_cmd r; + void __user * argp = (void __user *)arg; + v3_vm_reset_type t; + uint32_t core_range[2]; + + if (copy_from_user(&r, argp, sizeof(struct v3_reset_cmd))) { + WARNING("Copy from user error getting reset info\n"); + return -EFAULT; + } + + if (r.type==V3_RESET_VM_ALL) { + t=V3_VM_RESET_ALL; + } else if (r.type==V3_RESET_VM_HRT) { + t=V3_VM_RESET_HRT; + } else if (r.type==V3_RESET_VM_ROS) { + t=V3_VM_RESET_ROS; + } else if (r.type==V3_RESET_VM_CORE_RANGE){ + t=V3_VM_RESET_CORE_RANGE; + core_range[0]=r.first_core; + core_range[1]=r.first_core+r.num_cores-1; + } else { + ERROR("Unknown reset type %d requested\n",r.type); + return -EFAULT; + } + + if (v3_reset_vm_extended(guest->v3_ctx, t, core_range) == -1) { + WARNING("Error reseting VM\n"); + return -EFAULT; + } + break; + } #ifdef V3_CONFIG_CHECKPOINT @@ -181,7 +243,7 @@ static long v3_vm_ioctl(struct file * filp, NOTICE("Saving Guest to %s:%s\n", chkpt.store, chkpt.url); - if (v3_save_vm(guest->v3_ctx, chkpt.store, chkpt.url) == -1) { + if (v3_save_vm(guest->v3_ctx, chkpt.store, chkpt.url, chkpt.opts) == -1) { WARNING("Error checkpointing VM state\n"); return -EFAULT; } @@ -199,9 +261,9 @@ 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) { + if (v3_load_vm(guest->v3_ctx, chkpt.store, chkpt.url, chkpt.opts) == -1) { WARNING("Error Loading VM state\n"); return -EFAULT; } @@ -225,7 +287,7 @@ static long v3_vm_ioctl(struct file * filp, 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) { + if (v3_send_vm(guest->v3_ctx, chkpt_info.store, chkpt_info.url, chkpt_info.opts) == -1) { WARNING("Error sending VM\n"); return -EFAULT; } @@ -247,7 +309,7 @@ static long v3_vm_ioctl(struct file * filp, 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) { + if (v3_receive_vm(guest->v3_ctx, chkpt_info.store, chkpt_info.url, chkpt_info.opts) == -1) { WARNING("Error receiving VM\n"); return -EFAULT; } @@ -287,13 +349,36 @@ static long v3_vm_ioctl(struct file * filp, memset(&cmd, 0, sizeof(struct v3_core_move_cmd)); if (copy_from_user(&cmd, argp, sizeof(struct v3_core_move_cmd))) { - WARNING("copy from user error getting migrate command...\n"); + WARNING("copy from user error getting migrate core command...\n"); return -EFAULT; } INFO("moving guest %s vcore %d to CPU %d\n", guest->name, cmd.vcore_id, cmd.pcore_id); - v3_move_vm_core(guest->v3_ctx, cmd.vcore_id, cmd.pcore_id); + if (v3_move_vm_core(guest->v3_ctx, cmd.vcore_id, cmd.pcore_id)) { + ERROR("Could not move core\n"); + return -EFAULT; + } + + break; + } + case V3_VM_MOVE_MEM: { + struct v3_mem_move_cmd cmd; + void __user * argp = (void __user *)arg; + + memset(&cmd, 0, sizeof(struct v3_mem_move_cmd)); + + if (copy_from_user(&cmd, argp, sizeof(struct v3_mem_move_cmd))) { + WARNING("copy from user error getting migrate memory command...\n"); + return -EFAULT; + } + + INFO("moving guest %s memory at gpa %p to memory with affinity for CPU %d\n", guest->name, (void*)(cmd.gpa), cmd.pcore_id); + + if (v3_move_vm_mem(guest->v3_ctx, (void*)(cmd.gpa), cmd.pcore_id)) { + ERROR("Could not move memory\n"); + return -EFAULT; + } break; } @@ -355,7 +440,7 @@ int create_palacios_vm(struct v3_guest * guest) { return -1; } - guest->v3_ctx = v3_create_vm(guest->img, (void *)guest, guest->name); + guest->v3_ctx = v3_create_vm(guest->img, (void *)guest, guest->name, (0x1 << num_online_cpus()) - 1); if (guest->v3_ctx == NULL) { WARNING("palacios: failed to create vm\n"); @@ -402,13 +487,19 @@ out_err: 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)); - vfree(guest->img); + free_guest_ctrls(guest); + + deinit_vm_extensions(guest); + + palacios_vfree(guest->img); palacios_free(guest); return 0;