X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fmain.c;h=df1c98c9dadb609c325ee3305f7c76861bcf9da5;hb=fe436f3769306b960087068610f9afc85b7141ba;hp=a6787ce28d359fd12fc6c77fb2039a31fd0e729b;hpb=401f28c04132e4f5ccafc145dcb69b6dee4afe4e;p=palacios.git diff --git a/linux_module/main.c b/linux_module/main.c index a6787ce..df1c98c 100644 --- a/linux_module/main.c +++ b/linux_module/main.c @@ -5,6 +5,7 @@ #include +#include #include #include #include @@ -18,6 +19,8 @@ #include #include +#include + #include "palacios.h" #include "mm.h" #include "vm.h" @@ -28,6 +31,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 +44,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,101 +67,72 @@ 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); if (IS_ERR(guest)) { - printk("Error allocating Kernel guest_image\n"); + ERROR("Palacios: Error allocating Kernel guest_image\n"); return -EFAULT; } memset(guest, 0, sizeof(struct v3_guest)); - printk("Starting V3 Guest... (%p)\n", guest); + INFO("Palacios: Creating V3 Guest...\n"); vm_minor = register_vm(guest); if (vm_minor == -1) { - printk("Too many VMs are currently running\n"); + ERROR("Palacios Error: Too many VMs are currently running\n"); return -EFAULT; } guest->vm_dev = MKDEV(v3_major_num, vm_minor); if (copy_from_user(&user_image, argp, sizeof(struct v3_guest_img))) { - printk("copy from user error getting guest image...\n"); + ERROR("Palacios Error: copy from user error getting guest image...\n"); return -EFAULT; } guest->img_size = user_image.size; - printk("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("Error: Could not allocate space for guest image\n"); + ERROR("Palacios Error: Could not allocate space for guest image\n"); return -EFAULT; } if (copy_from_user(guest->img, user_image.guest_data, guest->img_size)) { - printk("Error loading guest data\n"); + ERROR("Palacios: Error loading guest data\n"); return -EFAULT; } strncpy(guest->name, user_image.name, 127); - printk("Launching VM\n"); - INIT_LIST_HEAD(&(guest->exts)); - init_completion(&(guest->start_done)); - init_completion(&(guest->thread_done)); - - { - struct task_struct * launch_thread = NULL; - // At some point we're going to want to allow the user to specify a CPU mask - // But for now, well just launch from the local core, and rely on the global cpu mask - - preempt_disable(); - launch_thread = kthread_create(start_palacios_vm, guest, guest->name); - - if (IS_ERR(launch_thread)) { - preempt_enable(); - printk("Palacios error creating launch thread for vm (%s)\n", guest->name); - return -EFAULT; - } - - kthread_bind(launch_thread, smp_processor_id()); - preempt_enable(); - - wake_up_process(launch_thread); + if (create_palacios_vm(guest) == -1) { + ERROR("Palacios: Error creating guest\n"); + return -EFAULT; } - wait_for_completion(&(guest->start_done)); - - return guest->vm_dev; + return vm_minor; 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); + INFO("Freeing VM (%s) (%p)\n", guest->name, guest); - - if (irqs_disabled()) { - printk("WHAT!!?? IRQs are disabled??\n"); - break; - } - - stop_palacios_vm(guest); + free_palacios_vm(guest); guest_map[vm_idx] = NULL; break; } @@ -161,14 +142,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; } @@ -176,7 +157,7 @@ static long v3_dev_ioctl(struct file * filp, } default: - printk("\tUnhandled\n"); + ERROR("\tUnhandled\n"); return -EINVAL; } @@ -193,6 +174,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; @@ -200,9 +217,7 @@ static int __init v3_init(void) { palacios_init_mm(); - // Initialize Palacios - palacios_vmm_init(); @@ -212,16 +227,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; } @@ -230,7 +245,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; @@ -239,12 +254,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: @@ -269,13 +308,13 @@ static void __exit v3_exit(void) { dev_t 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); @@ -289,7 +328,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); }