X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fmain.c;h=efaa20e6fd9ad9f0b20a69d8de6d8e967f1d31f8;hb=1b9bba809bf9c1d6ada56c7e4f8910e7afb82557;hp=57fe2ef219d8c3758c3d2a67e100d6416b734343;hpb=791ea2f3e21cfbc9c47341efbb98995c33d86fcb;p=palacios.releases.git diff --git a/linux_module/main.c b/linux_module/main.c index 57fe2ef..efaa20e 100644 --- a/linux_module/main.c +++ b/linux_module/main.c @@ -19,6 +19,10 @@ #include #include +#include + +#include + #include "palacios.h" #include "mm.h" #include "vm.h" @@ -42,6 +46,7 @@ int mod_frees = 0; static int v3_major_num = 0; static struct v3_guest * guest_map[MAX_VMS] = {[0 ... MAX_VMS - 1] = 0}; +static struct proc_dir_entry *dir = 0; struct class * v3_class = NULL; static struct cdev ctrl_dev; @@ -71,7 +76,7 @@ static long v3_dev_ioctl(struct file * filp, case V3_CREATE_GUEST:{ int vm_minor = 0; struct v3_guest_img user_image; - struct v3_guest * guest = kmalloc(sizeof(struct v3_guest), GFP_KERNEL); + struct v3_guest * guest = palacios_alloc(sizeof(struct v3_guest)); if (IS_ERR(guest)) { ERROR("Palacios: Error allocating Kernel guest_image\n"); @@ -86,14 +91,14 @@ static long v3_dev_ioctl(struct file * filp, if (vm_minor == -1) { ERROR("Palacios Error: Too many VMs are currently running\n"); - return -EFAULT; + goto out_err; } guest->vm_dev = MKDEV(v3_major_num, vm_minor); if (copy_from_user(&user_image, argp, sizeof(struct v3_guest_img))) { ERROR("Palacios Error: copy from user error getting guest image...\n"); - return -EFAULT; + goto out_err1; } guest->img_size = user_image.size; @@ -103,12 +108,12 @@ static long v3_dev_ioctl(struct file * filp, if (IS_ERR(guest->img)) { ERROR("Palacios Error: Could not allocate space for guest image\n"); - return -EFAULT; + goto out_err1; } if (copy_from_user(guest->img, user_image.guest_data, guest->img_size)) { ERROR("Palacios: Error loading guest data\n"); - return -EFAULT; + goto out_err2; } strncpy(guest->name, user_image.name, 127); @@ -117,16 +122,32 @@ static long v3_dev_ioctl(struct file * filp, if (create_palacios_vm(guest) == -1) { ERROR("Palacios: Error creating guest\n"); - return -EFAULT; + goto out_err2; } return vm_minor; + + +out_err2: + vfree(guest->img); +out_err1: + guest_map[vm_minor] = NULL; +out_err: + palacios_free(guest); + + return -1; + break; } case V3_FREE_GUEST: { unsigned long vm_idx = arg; struct v3_guest * guest = guest_map[vm_idx]; + if (!guest) { + ERROR("No VM at index %ld\n",vm_idx); + return -1; + } + INFO("Freeing VM (%s) (%p)\n", guest->name, guest); free_palacios_vm(guest); @@ -153,9 +174,25 @@ static long v3_dev_ioctl(struct file * filp, break; } - default: - ERROR("\tUnhandled\n"); + case V3_RESET_MEMORY: { + if (palacios_init_mm() == -1) { + ERROR("Error resetting Palacios memory\n"); + return -EFAULT; + } + break; + } + + default: { + struct global_ctrl * ctrl = get_global_ctrl(ioctl); + + if (ctrl) { + return ctrl->handler(ioctl, arg); + } + + WARNING("\tUnhandled global ctrl cmd: %d\n", ioctl); + return -EINVAL; + } } return 0; @@ -171,6 +208,42 @@ static struct file_operations v3_ctrl_fops = { +struct proc_dir_entry *palacios_get_procdir(void) +{ + return dir; +} + +static int read_guests(char * buf, char ** start, off_t off, int count, + int * eof, void * data) +{ + int len = 0; + unsigned int i = 0; + + for(i = 0; i < MAX_VMS; i++) { + if (guest_map[i] != NULL) { + if (lenname, i); + } + } + } + + return len; +} + +static int show_mem(char * buf, char ** start, off_t off, int count, + int * eof, void * data) +{ + int len = 0; + + len = snprintf(buf,count, "%p\n", (void *)get_palacios_base_addr()); + len += snprintf(buf+len,count-len, "%lld\n", get_palacios_num_pages()); + + return len; +} + + static int __init v3_init(void) { dev_t dev = MKDEV(0, 0); // We dynamicallly assign the major number int ret = 0; @@ -219,8 +292,32 @@ static int __init v3_init(void) { goto failure1; } - - + dir = proc_mkdir("v3vee", NULL); + if(dir) { + struct proc_dir_entry *entry; + + entry = create_proc_read_entry("v3-guests", 0444, dir, + read_guests, NULL); + if (entry) { + INFO("/proc/v3vee/v3-guests successfully created\n"); + } else { + ERROR("Could not create proc entry\n"); + goto failure1; + } + + entry = create_proc_read_entry("v3-mem", 0444, dir, + show_mem, NULL); + if (entry) { + INFO("/proc/v3vee/v3-mem successfully added\n"); + } else { + ERROR("Could not create proc entry\n"); + goto failure1; + } + } else { + ERROR("Could not create proc entry\n"); + goto failure1; + } + return 0; failure1: @@ -237,13 +334,25 @@ static void __exit v3_exit(void) { extern u32 pg_frees; extern u32 mallocs; extern u32 frees; + int i = 0; + struct v3_guest * guest; + dev_t dev; - // should probably try to stop any guests + /* Stop and free any running VMs */ + for (i = 0; i < MAX_VMS; i++) { + if (guest_map[i] != NULL) { + guest = (struct v3_guest *)guest_map[i]; + if (v3_stop_vm(guest->v3_ctx) < 0) + ERROR("Couldn't stop VM %d\n", i); + free_palacios_vm(guest); + guest_map[i] = NULL; + } + } - dev_t dev = MKDEV(v3_major_num, MAX_VMS + 1); + dev = MKDEV(v3_major_num, MAX_VMS + 1); INFO("Removing V3 Control device\n"); @@ -265,6 +374,10 @@ static void __exit v3_exit(void) { palacios_deinit_mm(); + remove_proc_entry("v3-guests", dir); + remove_proc_entry("v3-mem", dir); + remove_proc_entry("v3vee", NULL); + DEBUG("Palacios Module Mallocs = %d, Frees = %d\n", mod_allocs, mod_frees); }