Extensive, Pedantic Error Checking in Linux module, especially for memory

[palacios.git] / linux_module / main.c

diff --git a/linux_module/main.c b/linux_module/main.c
index 57fe2ef..e37f207 100644 (file)
--- a/linux_module/main.c
+++ b/linux_module/main.c
@@ -19,6 +19,8 @@
 #include <linux/spinlock.h>
 #include <linux/kthread.h>
 
+#include <linux/proc_fs.h>
+
 #include "palacios.h"
 #include "mm.h"
 #include "vm.h"
@@ -42,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;
@@ -71,7 +74,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,6 +89,7 @@ static long v3_dev_ioctl(struct file * filp,
 
            if (vm_minor == -1) {
                ERROR("Palacios Error: Too many VMs are currently running\n");
+               palacios_free(guest);
                return -EFAULT;
            }
 
@@ -93,6 +97,7 @@ static long v3_dev_ioctl(struct file * filp,
 
            if (copy_from_user(&user_image, argp, sizeof(struct v3_guest_img))) {
                ERROR("Palacios Error: copy from user error getting guest image...\n");
+               palacios_free(guest);
                return -EFAULT;
            }
 
@@ -103,11 +108,13 @@ static long v3_dev_ioctl(struct file * filp,
 
            if (IS_ERR(guest->img)) {
                ERROR("Palacios Error: Could not allocate space for guest image\n");
+               palacios_free(guest);
                return -EFAULT;
            }
 
            if (copy_from_user(guest->img, user_image.guest_data, guest->img_size)) {
                ERROR("Palacios: Error loading guest data\n");
+               palacios_free(guest);
                return -EFAULT;
            }      
 
@@ -117,6 +124,8 @@ static long v3_dev_ioctl(struct file * filp,
 
            if (create_palacios_vm(guest) == -1) {
                ERROR("Palacios: Error creating guest\n");
+               palacios_free(guest->img);
+               palacios_free(guest);
                return -EFAULT;
            }
 
@@ -171,6 +180,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 (len<count) { 
+               len += snprintf(buf+len, count-len,
+                               "%s\t/dev/v3-vm%d\n", 
+                               guest_map[i]->name, 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 +264,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:
@@ -265,6 +334,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);
 }