X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fmain.c;h=2199d88a760989684fa98fb1527b42b8ba39cbf6;hb=ccbe7e2ab17a32e671114f258abc1d047151be2e;hp=425e08fc0bcd349aa0159c08f716250d2f81a70d;hpb=28dcbfda8061d2785301784d27694d1e02f54fff;p=palacios.git diff --git a/linux_module/main.c b/linux_module/main.c index 425e08f..2199d88 100644 --- a/linux_module/main.c +++ b/linux_module/main.c @@ -3,7 +3,7 @@ (c) Jack Lange, 2010 */ - +#include #include #include #include @@ -27,13 +27,13 @@ #include "palacios.h" #include "mm.h" #include "vm.h" +#include "numa.h" #include "allow_devmem.h" #include "memcheck.h" #include "lockcheck.h" #include "linux-exts.h" - MODULE_LICENSE("GPL"); // Module parameter @@ -90,7 +90,7 @@ static long v3_dev_ioctl(struct file * filp, struct v3_guest_img user_image; struct v3_guest * guest = palacios_alloc(sizeof(struct v3_guest)); - if (IS_ERR(guest)) { + if (!(guest)) { ERROR("Palacios: Error allocating Kernel guest_image\n"); return -EFAULT; } @@ -118,7 +118,7 @@ static long v3_dev_ioctl(struct file * filp, DEBUG("Palacios: Allocating kernel memory for guest image (%llu bytes)\n", user_image.size); guest->img = palacios_valloc(guest->img_size); - if (IS_ERR(guest->img)) { + if (!guest->img) { ERROR("Palacios Error: Could not allocate space for guest image\n"); goto out_err1; } @@ -222,9 +222,13 @@ out_err: case V3_RESET_MEMORY: { DEBUG("Resetting memory\n"); if (palacios_deinit_mm() == -1) { - ERROR("Error resetting Palacios memory\n"); + ERROR("Error deiniting the Palacios memory manager\n"); return -EFAULT; } + if (palacios_init_mm()) { + ERROR("Error initing the Palacios memory manager\n"); + return -EFAULT; + } break; } @@ -322,7 +326,8 @@ static int read_guests_details(struct seq_file *s, void *v) 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", + base->state==V3_VM_SIMULATING ? "simulating" : + base->state==V3_VM_RESETTING ? "resetting" : "UNKNOWN", core->num_vcores, mem->num_regions); seq_printf(s, "Core States\n"); @@ -333,7 +338,8 @@ static int read_guests_details(struct seq_file *s, void *v) 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].state==V3_VCORE_STOPPED ? "stopped" : + core->vcore[j].state==V3_VCORE_RESETTING ? "resetting" : "UNKNOWN", core->vcore[j].pcore, core->vcore[j].num_exits, core->vcore[j].last_rip, @@ -351,8 +357,11 @@ static int read_guests_details(struct seq_file *s, void *v) seq_printf(s, "\nMemory Regions\n"); for (j=0;jnum_regions;j++) { - seq_printf(s," region %u has HPAs 0x%p-0x%p\n", - j, mem->region[j].host_paddr, mem->region[j].host_paddr+mem->region[j].size); + seq_printf(s," region %u has HPAs 0x%p-0x%p (node %d) %s %s\n", + j, mem->region[j].host_paddr, mem->region[j].host_paddr+mem->region[j].size, + numa_addr_to_node((uintptr_t)(mem->region[j].host_paddr)), + mem->region[j].swapped ? "swapped" : "", + mem->region[j].pinned ? "pinned" : ""); } } seq_printf(s, @@ -445,6 +454,7 @@ static int guests_full_proc_open(struct inode * inode, struct file * filp) + static struct file_operations guest_full_proc_ops = { .owner = THIS_MODULE, .open = guests_full_proc_open, @@ -461,6 +471,78 @@ static struct file_operations guest_short_proc_ops = { .release = single_release, }; +// Supply basic information that the user-space tools need +// to manipulate Palacios. The current use case here is to +// convey memory information +static int read_info(struct seq_file *s, void *v) +{ + uint64_t mem_block_size; + int i,j; + int max_node=-1; + seq_printf(s,"kernel MAX_ORDER:\t%d\n",MAX_ORDER); + seq_printf(s,"number of nodes:\t%d\n", numa_num_nodes()); + seq_printf(s,"number of cpus: \t%d\n", num_online_cpus()); + seq_printf(s,"\npalacios compiled mem_block_size:\t%d\n", V3_CONFIG_MEM_BLOCK_SIZE); + if (!v3_lookup_option("mem_block_size")) { + mem_block_size = V3_CONFIG_MEM_BLOCK_SIZE; + } else { + if (strict_strtoull(v3_lookup_option("mem_block_size"), 0, &mem_block_size)) { + // huh? + mem_block_size=-1; + } + } + seq_printf(s,"palacios run-time mem_block_size:\t%llu\n", mem_block_size); + + seq_printf(s,"\nCPU to node mappings\n"); + for (i=0;i node %d\n", i, numa_cpu_to_node(i)); + if (numa_cpu_to_node(i)>max_node) { + max_node=numa_cpu_to_node(i); + } + } + seq_printf(s,"\nNode to node distances\n"); + for (j=0;j<=max_node;j++) { + seq_printf(s," \t%2d", j); + } + seq_printf(s,"\n"); + for (i=0;i<=max_node;i++) { + seq_printf(s,"%2d ",i); + for (j=0;j<=max_node;j++) { + seq_printf(s,"\t%2d", numa_get_distance(i,j)); + } + seq_printf(s,"\n"); + } + seq_printf(s,"\nCPU to CPU distances\n"); + for (j=0;jdata); +} + + + +static struct file_operations info_proc_ops = { + .owner = THIS_MODULE, + .open = info_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + static int __init v3_init(void) { @@ -486,6 +568,10 @@ static int __init v3_init(void) { palacios_allow_devmem(); } + // numa is now a required interface and we need it + // up before primary initiatilization + palacios_init_numa(); + // Initialize Palacios palacios_vmm_init(options); @@ -494,7 +580,7 @@ static int __init v3_init(void) { v3_class = class_create(THIS_MODULE, "vms"); - if (IS_ERR(v3_class)) { + if (!v3_class || IS_ERR(v3_class)) { ERROR("Failed to register V3 VM device class\n"); ret = PTR_ERR(v3_class); goto failure3; @@ -546,14 +632,27 @@ static int __init v3_init(void) { ERROR("Could not create proc entry\n"); goto failure7; } + + entry = create_proc_entry("v3-info", 0444, palacios_proc_dir); + if (entry) { + entry->proc_fops = &info_proc_ops; + INFO("/proc/v3vee/v3-info successfully created\n"); + } else { + ERROR("Could not create proc entry\n"); + goto failure8; + } + + } return 0; - failure7: + failure8: remove_proc_entry("v3-guests-details", palacios_proc_dir); - failure6: + failure7: remove_proc_entry("v3-guests", palacios_proc_dir); + failure6: + device_destroy(v3_class, dev); failure5: unregister_chrdev_region(MKDEV(v3_major_num, 0), MAX_VMS + 1); failure4: @@ -587,8 +686,13 @@ static void __exit v3_exit(void) { /* 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 (guest_map[i] != NULL) { + guest = (struct v3_guest *)(guest_map[i]); + + if (!guest->v3_ctx) { + ERROR("Orphan VM detected and skipped: index=%d name=%s\n", i, guest->name); + continue; + } if (v3_stop_vm(guest->v3_ctx) < 0) ERROR("Couldn't stop VM %d\n", i); @@ -605,6 +709,8 @@ static void __exit v3_exit(void) { palacios_vmm_exit(); + palacios_deinit_numa(); + 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); @@ -625,6 +731,7 @@ static void __exit v3_exit(void) { palacios_deinit_mm(); + remove_proc_entry("v3-info", palacios_proc_dir); remove_proc_entry("v3-guests-details", palacios_proc_dir); remove_proc_entry("v3-guests", palacios_proc_dir); remove_proc_entry("v3vee", NULL);