X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fmain.c;h=79b6280c2b4be439b8544d4f40161d8efa4e40e7;hb=07223cf503e20ccd3f09754a614a1c107b018cd0;hp=e37f207ac00a72c28bbd0708f46f771b0149ea45;hpb=07aa8f3c18a33af0961e7546980a63ab5f6fba4f;p=palacios.git

diff --git a/linux_module/main.c b/linux_module/main.c
index e37f207..79b6280 100644
--- a/linux_module/main.c
+++ b/linux_module/main.c
@@ -21,14 +21,18 @@
 
 #include <linux/proc_fs.h>
 
+#include <palacios/vmm.h>
+
 #include "palacios.h"
 #include "mm.h"
 #include "vm.h"
+#include "allow_devmem.h"
+#include "memcheck.h"
+#include "lockcheck.h"
 
 #include "linux-exts.h"
 
 
-
 MODULE_LICENSE("GPL");
 
 // Module parameter
@@ -37,14 +41,23 @@ 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");
 
+static int allow_devmem = 0;
+module_param(allow_devmem, int, 0);
+MODULE_PARM_DESC(allow_devmem, "Allow general user-space /dev/mem access even if kernel is strict");
+
+// Palacios options parameter
+static char *options;
+module_param(options, charp, 0);
+MODULE_PARM_DESC(options, "Generic options to internal Palacios modules");
+
+
 int mod_allocs = 0;
 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;
+static struct proc_dir_entry * palacios_proc_dir = NULL;
 
 struct class * v3_class = NULL;
 static struct cdev ctrl_dev;
@@ -89,33 +102,29 @@ 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;
+		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");
-		palacios_free(guest);
-		return -EFAULT;
+		goto out_err1;
 	    }
 
 	    guest->img_size = user_image.size;
 
 	    DEBUG("Palacios: Allocating kernel memory for guest image (%llu bytes)\n", user_image.size);
-	    guest->img = vmalloc(guest->img_size);
+	    guest->img = palacios_valloc(guest->img_size);
 
 	    if (IS_ERR(guest->img)) {
 		ERROR("Palacios Error: Could not allocate space for guest image\n");
-		palacios_free(guest);
-		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");
-		palacios_free(guest);
-		return -EFAULT;
+		goto out_err2;
 	    }	   
 
 	    strncpy(guest->name, user_image.name, 127);
@@ -124,21 +133,46 @@ 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;
+		goto out_err2;
 	    }
 
 	    return vm_minor;
+
+
+out_err2:
+            palacios_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];
+            struct v3_guest * guest;
+
+            if (vm_idx > MAX_VMS) {
+                ERROR("Invalid VM index: %ld\n", vm_idx);
+                return -1;
+            }
+
+	    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);
+	    if (free_palacios_vm(guest)<0) { 
+		ERROR("Cannot free guest at index %ld\n",vm_idx);
+		return -1;
+	    }
+
 	    guest_map[vm_idx] = NULL;
 	    break;
 	}
@@ -154,7 +188,7 @@ static long v3_dev_ioctl(struct file * filp,
 
 	    DEBUG("Adding %llu pages to Palacios memory\n", mem.num_pages);
 
-	    if (add_palacios_memory(mem.base_addr, mem.num_pages) == -1) {
+	    if (add_palacios_memory(&mem) == -1) {
 		ERROR("Error adding memory to Palacios\n");
 		return -EFAULT;
 	    }
@@ -162,9 +196,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;
@@ -182,50 +232,181 @@ static struct file_operations v3_ctrl_fops = {
 
 struct proc_dir_entry *palacios_get_procdir(void) 
 {
-    return dir;
+    //    INFO("Returning procdir=%p\n",palacios_proc_dir);
+    return palacios_proc_dir;
 }
 
+
+#define MAX_VCORES  256
+#define MAX_REGIONS 256
+
 static int read_guests(char * buf, char ** start, off_t off, int count,
 		       int * eof, void * data)
 {
     int len = 0;
     unsigned int i = 0;
+    struct v3_vm_base_state *base=0;
+    struct v3_vm_core_state *core=0;
+    struct v3_vm_mem_state *mem=0;
+
+    base = palacios_alloc(sizeof(struct v3_vm_base_state));
     
+    if (!base) { 
+      ERROR("No space for base state structure\n");
+      goto out;
+    }
+
+    core = palacios_alloc(sizeof(struct v3_vm_core_state) + MAX_VCORES*sizeof(struct v3_vm_vcore_state));
+    
+    if (!core) { 
+      ERROR("No space for core state structure\n");
+      goto out;
+    }
+
+    mem = palacios_alloc(sizeof(struct v3_vm_mem_state) + MAX_REGIONS*sizeof(struct v3_vm_mem_region));
+    
+    if (!mem) { 
+      ERROR("No space for memory state structure\n");
+      goto out;
+    }
+
     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);
+      if (guest_map[i] != NULL) {
+	if (len>=count) { 
+	  goto out;
+	} else {
+	  len += snprintf(buf+len, count-len,
+			  "%s\t/dev/v3-vm%d ", 
+			  guest_map[i]->name, i);
+	  
+	  if (len>=count) { 
+	    *(buf+len-1)='\n';
+	    goto out;
+	  } else {
+	    // Get extended data
+	    core->num_vcores=MAX_VCORES; // max we can handle
+	    mem->num_regions=MAX_REGIONS; // max we can handle
+	    if (v3_get_state_vm(guest_map[i]->v3_ctx, base, core, mem)) {
+	      ERROR("Cannot get VM info\n");
+	      *(buf+len-1)='\n';
+	      goto out;
+	    } else {
+	      unsigned long j;
+
+	      len+=snprintf(buf+len, count-len,
+			    "%s %lu regions [ ", 
+			    base->state==V3_VM_INVALID ? "INVALID" :
+			    base->state==V3_VM_RUNNING ? "running" :
+			    base->state==V3_VM_STOPPED ? "stopped" :
+			    base->state==V3_VM_PAUSED ? "paused" :
+			    base->state==V3_VM_ERROR ? "ERROR" :
+			    base->state==V3_VM_SIMULATING ? "simulating" : "UNKNOWN",
+			    mem->num_regions);
+
+	      if (len>=count) { 
+		*(buf+len-1)='\n';
+		goto out;
+	      }
+
+	      for (j=0;j<mem->num_regions;j++) { 
+		  len+=snprintf(buf+len, count-len,
+				"(region %lu 0x%p-0x%p) ",
+				j, mem->region[j].host_paddr, mem->region[j].host_paddr+mem->region[j].size);
+		  if (len>=count) { 
+		      *(buf+len-1)='\n';
+		      goto out;
+		  }
+	      }
+		  
+	      len+=snprintf(buf+len, count-len,
+			    "] %lu vcores [ ", 
+			    core->num_vcores);
+
+	      if (len>=count) { 
+		*(buf+len-1)='\n';
+		goto out;
+	      }
+		  
+	      for (j=0;j<core->num_vcores;j++) {
+		len+=snprintf(buf+len, count-len,
+			      "(vcore %lu %s on pcore %lu %llu exits rip=0x%p %s %s %s) ",
+			      j, 
+			      core->vcore[j].state==V3_VCORE_INVALID ? "INVALID" :
+			      core->vcore[j].state==V3_VCORE_RUNNING ? "running" :
+			      core->vcore[j].state==V3_VCORE_STOPPED ? "stopped" : "UNKNOWN",
+			      core->vcore[j].pcore,
+			      core->vcore[j].num_exits,
+			      core->vcore[j].last_rip,
+			      core->vcore[j].cpu_mode==V3_VCORE_CPU_REAL ? "real" :
+			      core->vcore[j].cpu_mode==V3_VCORE_CPU_PROTECTED ? "protected" :
+			      core->vcore[j].cpu_mode==V3_VCORE_CPU_PROTECTED_PAE ? "protectedpae" :
+			      core->vcore[j].cpu_mode==V3_VCORE_CPU_LONG ? "long" :
+			      core->vcore[j].cpu_mode==V3_VCORE_CPU_LONG_32_COMPAT ? "long32" :
+			      core->vcore[j].cpu_mode==V3_VCORE_CPU_LONG_16_COMPAT ? "long16" : "UNKNOWN",
+			      core->vcore[j].mem_mode==V3_VCORE_MEM_MODE_PHYSICAL ? "physical" :
+			      core->vcore[j].mem_mode==V3_VCORE_MEM_MODE_VIRTUAL ? "virtual" : "UNKNOWN",
+			      core->vcore[j].mem_state==V3_VCORE_MEM_STATE_SHADOW ? "shadow" :
+			      core->vcore[j].mem_state==V3_VCORE_MEM_STATE_NESTED ? "nested" : "UNKNOWN");
+		if (len>=count) {
+		    *(buf+len-1)='\n';
+		    goto out;
+		}
+	      }
+
+	      len+=snprintf(buf+len, count-len,
+			    "] ");
+
+	      if (len>=count) { 
+		*(buf+len-1)='\n';
+		goto out;
+	      }
+		  
+	      *(buf+len-1)='\n';
+
 	    }
+	  }
 	}
+      }
     }
-    
-    return len;
-}
+ 
+ out:
+    if (mem) { palacios_free(mem); }
+    if (core) { palacios_free(core); }
+    if (base) { palacios_free(base); }
 
-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;
 
+    LOCKCHECK_INIT();
+    MEMCHECK_INIT();
 
-    palacios_init_mm();
+    palacios_proc_dir = proc_mkdir("v3vee", NULL);
+    if (!palacios_proc_dir) {
+	ERROR("Could not create proc entry\n");
+	ret = -1;
+	goto failure1;
+    }
 
-    // Initialize Palacios
-    palacios_vmm_init();
+    // this will populate the v3vee tree...
+    if (palacios_init_mm()) { 
+	goto failure2;
+    }
 
+    if (allow_devmem) {
+      palacios_allow_devmem();
+    }
+
+    // Initialize Palacios
+    palacios_vmm_init(options);
 
     // initialize extensions
     init_lnx_extensions();
@@ -234,7 +415,8 @@ static int __init v3_init(void) {
     v3_class = class_create(THIS_MODULE, "vms");
     if (IS_ERR(v3_class)) {
 	ERROR("Failed to register V3 VM device class\n");
-	return PTR_ERR(v3_class);
+	ret =  PTR_ERR(v3_class);
+	goto failure3;
     }
 
     INFO("intializing V3 Control device\n");
@@ -243,7 +425,7 @@ static int __init v3_init(void) {
 
     if (ret < 0) {
 	ERROR("Error registering device region for V3 devices\n");
-	goto failure2;
+	goto failure4;
     }
 
     v3_major_num = MAJOR(dev);
@@ -261,41 +443,40 @@ static int __init v3_init(void) {
 
     if (ret != 0) {
 	ERROR("Error adding v3 control device\n");
-	goto failure1;
+	goto failure5;
     }
 
-    dir = proc_mkdir("v3vee", NULL);
-    if(dir) {
+    {
 	struct proc_dir_entry *entry;
 
-	entry = create_proc_read_entry("v3-guests", 0444, dir, 
-				       read_guests, NULL);
+	INFO("palacios_proc_dir=%p before v3-guests\n",palacios_proc_dir);
+	entry = create_proc_read_entry("v3-guests", 0444, palacios_proc_dir, read_guests, NULL);
         if (entry) {
 	    INFO("/proc/v3vee/v3-guests successfully created\n");
 	} else {
 	    ERROR("Could not create proc entry\n");
-	    goto failure1;
+	    goto failure6;
 	}
-	
-	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:
+ failure6:
+    remove_proc_entry("v3-guests", palacios_proc_dir);
+ failure5:
     unregister_chrdev_region(MKDEV(v3_major_num, 0), MAX_VMS + 1);
- failure2:
+ failure4:
     class_destroy(v3_class);
+ failure3:
+    if (allow_devmem) {
+      palacios_restore_devmem();
+    }
+    palacios_deinit_mm();
+ failure2:
+    remove_proc_entry("v3vee", NULL);
+ failure1:   
+    MEMCHECK_DEINIT();
+    LOCKCHECK_DEINIT();
 
     return ret;
 }
@@ -306,13 +487,27 @@ static void __exit v3_exit(void) {
     extern u32 pg_frees;
     extern u32 mallocs;
     extern u32 frees;
+    extern u32 vmallocs;
+    extern u32 vfrees;
+    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");
 
@@ -320,6 +515,7 @@ static void __exit v3_exit(void) {
     palacios_vmm_exit();
 
     DEBUG("Palacios Mallocs = %d, Frees = %d\n", mallocs, frees);
+    DEBUG("Palacios Vmallocs = %d, Vfrees = %d\n", vmallocs, vfrees);
     DEBUG("Palacios Page Allocs = %d, Page Frees = %d\n", pg_allocs, pg_frees);
 
     unregister_chrdev_region(MKDEV(v3_major_num, 0), MAX_VMS + 1);
@@ -332,13 +528,19 @@ static void __exit v3_exit(void) {
 
     deinit_lnx_extensions();
 
+    if (allow_devmem) {
+      palacios_restore_devmem();
+    }
+
     palacios_deinit_mm();
 
-    remove_proc_entry("v3-guests", dir);
-    remove_proc_entry("v3-mem", dir);
+    remove_proc_entry("v3-guests", palacios_proc_dir);
     remove_proc_entry("v3vee", NULL);
 
     DEBUG("Palacios Module Mallocs = %d, Frees = %d\n", mod_allocs, mod_frees);
+    
+    MEMCHECK_DEINIT();
+    LOCKCHECK_DEINIT();
 }
 
 
@@ -352,7 +554,7 @@ void * trace_malloc(size_t size, gfp_t flags) {
     void * addr = NULL;
 
     mod_allocs++;
-    addr = kmalloc(size, flags);
+    addr = palacios_alloc_extended(size, flags);
 
     return addr;
 }
@@ -360,5 +562,5 @@ void * trace_malloc(size_t size, gfp_t flags) {
 
 void trace_free(const void * objp) {
     mod_frees++;
-    kfree(objp);
+    palacios_free((void*)objp);
 }