X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fmain.c;h=74301e93e4576ad68093f7bda1acbaca541e3742;hb=f31b4ee024b09ded6a5be33a33cca0e2e756b63d;hp=931763557742e635bca6101aed89011e9eaaca29;hpb=b1128b2a9d269fefc786c60c26878b372d5e39c1;p=palacios.git diff --git a/linux_module/main.c b/linux_module/main.c index 9317635..74301e9 100644 --- a/linux_module/main.c +++ b/linux_module/main.c @@ -5,6 +5,7 @@ #include +#include #include #include #include @@ -18,6 +19,10 @@ #include #include +#include + +#include + #include "palacios.h" #include "mm.h" #include "vm.h" @@ -28,6 +33,12 @@ MODULE_LICENSE("GPL"); +// Module parameter +int cpu_list[NR_CPUS] = {}; +int cpu_list_len = 0; +module_param_array(cpu_list, int, &cpu_list_len, 0644); +MODULE_PARM_DESC(cpu_list, "Comma-delimited list of CPUs that Palacios will run on"); + int mod_allocs = 0; int mod_frees = 0; @@ -35,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; @@ -57,81 +69,88 @@ static int register_vm(struct v3_guest * guest) { static long v3_dev_ioctl(struct file * filp, unsigned int ioctl, unsigned long arg) { void __user * argp = (void __user *)arg; - printk("V3 IOCTL %d\n", ioctl); + DEBUG("V3 IOCTL %d\n", ioctl); switch (ioctl) { - case V3_START_GUEST:{ + 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)) { - printk("Palacios: Error allocating Kernel guest_image\n"); + ERROR("Palacios: Error allocating Kernel guest_image\n"); return -EFAULT; } memset(guest, 0, sizeof(struct v3_guest)); - printk("Palacios: Starting V3 Guest...\n"); + INFO("Palacios: Creating V3 Guest...\n"); vm_minor = register_vm(guest); if (vm_minor == -1) { - printk("Palacios Error: Too many VMs are currently running\n"); - return -EFAULT; + ERROR("Palacios Error: Too many VMs are currently running\n"); + goto out_err; } guest->vm_dev = MKDEV(v3_major_num, vm_minor); if (copy_from_user(&user_image, argp, sizeof(struct v3_guest_img))) { - printk("Palacios Error: copy from user error getting guest image...\n"); - return -EFAULT; + ERROR("Palacios Error: copy from user error getting guest image...\n"); + goto out_err1; } guest->img_size = user_image.size; - printk("Palacios: Allocating kernel memory for guest image (%llu bytes)\n", user_image.size); + DEBUG("Palacios: Allocating kernel memory for guest image (%llu bytes)\n", user_image.size); guest->img = vmalloc(guest->img_size); if (IS_ERR(guest->img)) { - printk("Palacios Error: Could not allocate space for guest image\n"); - return -EFAULT; + ERROR("Palacios Error: Could not allocate space for guest image\n"); + goto out_err1; } if (copy_from_user(guest->img, user_image.guest_data, guest->img_size)) { - printk("Palacios: Error loading guest data\n"); - return -EFAULT; + ERROR("Palacios: Error loading guest data\n"); + goto out_err2; } strncpy(guest->name, user_image.name, 127); - printk("Palacios: Launching VM\n"); - INIT_LIST_HEAD(&(guest->exts)); - if (start_palacios_vm(guest) == -1) { - printk("Palacios: Error starting guest\n"); - return -EFAULT; + if (create_palacios_vm(guest) == -1) { + ERROR("Palacios: Error creating guest\n"); + goto out_err2; } - return guest->vm_dev; + 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_STOP_GUEST: { + case V3_FREE_GUEST: { unsigned long vm_idx = arg; struct v3_guest * guest = guest_map[vm_idx]; - printk("Stopping VM idx=%d\n", vm_idx); - printk("Stopping VM (%s) (%p)\n", guest->name, guest); - - - if (irqs_disabled()) { - printk("WHAT!!?? IRQs are disabled??\n"); - break; + if (!guest) { + ERROR("No VM at index %ld\n",vm_idx); + return -1; } - stop_palacios_vm(guest); + INFO("Freeing VM (%s) (%p)\n", guest->name, guest); + + free_palacios_vm(guest); guest_map[vm_idx] = NULL; break; } @@ -141,14 +160,14 @@ static long v3_dev_ioctl(struct file * filp, memset(&mem, 0, sizeof(struct v3_mem_region)); if (copy_from_user(&mem, argp, sizeof(struct v3_mem_region))) { - printk("copy from user error getting mem_region...\n"); + ERROR("copy from user error getting mem_region...\n"); return -EFAULT; } - printk("Adding %llu pages to Palacios memory\n", mem.num_pages); + DEBUG("Adding %llu pages to Palacios memory\n", mem.num_pages); if (add_palacios_memory(mem.base_addr, mem.num_pages) == -1) { - printk("Error adding memory to Palacios\n"); + ERROR("Error adding memory to Palacios\n"); return -EFAULT; } @@ -156,7 +175,7 @@ static long v3_dev_ioctl(struct file * filp, } default: - printk("\tUnhandled\n"); + ERROR("\tUnhandled\n"); return -EINVAL; } @@ -173,6 +192,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; @@ -180,9 +235,7 @@ static int __init v3_init(void) { palacios_init_mm(); - // Initialize Palacios - palacios_vmm_init(); @@ -192,16 +245,16 @@ static int __init v3_init(void) { v3_class = class_create(THIS_MODULE, "vms"); if (IS_ERR(v3_class)) { - printk("Failed to register V3 VM device class\n"); + ERROR("Failed to register V3 VM device class\n"); return PTR_ERR(v3_class); } - printk("intializing V3 Control device\n"); + INFO("intializing V3 Control device\n"); ret = alloc_chrdev_region(&dev, 0, MAX_VMS + 1, "v3vee"); if (ret < 0) { - printk("Error registering device region for V3 devices\n"); + ERROR("Error registering device region for V3 devices\n"); goto failure2; } @@ -210,7 +263,7 @@ static int __init v3_init(void) { dev = MKDEV(v3_major_num, MAX_VMS + 1); - printk("Creating V3 Control device: Major %d, Minor %d\n", v3_major_num, MINOR(dev)); + DEBUG("Creating V3 Control device: Major %d, Minor %d\n", v3_major_num, MINOR(dev)); cdev_init(&ctrl_dev, &v3_ctrl_fops); ctrl_dev.owner = THIS_MODULE; ctrl_dev.ops = &v3_ctrl_fops; @@ -219,12 +272,36 @@ static int __init v3_init(void) { device_create(v3_class, NULL, dev, NULL, "v3vee"); if (ret != 0) { - printk("Error adding v3 control device\n"); + ERROR("Error adding v3 control device\n"); 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: @@ -241,21 +318,33 @@ 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); - printk("Removing V3 Control device\n"); + INFO("Removing V3 Control device\n"); palacios_vmm_exit(); - printk("Palacios Mallocs = %d, Frees = %d\n", mallocs, frees); - printk("Palacios Page Allocs = %d, Page Frees = %d\n", pg_allocs, pg_frees); + DEBUG("Palacios Mallocs = %d, Frees = %d\n", mallocs, frees); + DEBUG("Palacios Page Allocs = %d, Page Frees = %d\n", pg_allocs, pg_frees); unregister_chrdev_region(MKDEV(v3_major_num, 0), MAX_VMS + 1); @@ -269,7 +358,11 @@ static void __exit v3_exit(void) { palacios_deinit_mm(); - printk("Palacios Module Mallocs = %d, Frees = %d\n", mod_allocs, mod_frees); + 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); }