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;
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;
}
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 32
+#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;
- struct v3_vm_state *s =palacios_alloc(sizeof(struct v3_vm_state)+MAX_VCORES*sizeof(struct v3_vcore_state));
+ base = palacios_alloc(sizeof(struct v3_vm_base_state));
- if (!s) {
- ERROR("No space for state structure\n");
+ 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) {
goto out;
} else {
// Get extended data
- s->num_vcores=MAX_VCORES; // max we can handle
- if (v3_get_state_vm(guest_map[i]->v3_ctx, s)) {
+ 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;
unsigned long j;
len+=snprintf(buf+len, count-len,
- "%s [0x%p-0x%p] %lu vcores ",
- s->state==V3_VM_INVALID ? "INVALID" :
- s->state==V3_VM_RUNNING ? "running" :
- s->state==V3_VM_STOPPED ? "stopped" :
- s->state==V3_VM_PAUSED ? "paused" :
- s->state==V3_VM_ERROR ? "ERROR" :
- s->state==V3_VM_SIMULATING ? "simulating" : "UNKNOWN",
- s->mem_base_paddr, s->mem_base_paddr+s->mem_size-1,
- s->num_vcores);
+ "%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<s->num_vcores;j++) {
+
+ 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] ",
+ "(vcore %lu %s on pcore %lu %llu exits rip=0x%p %s %s %s) ",
j,
- s->vcore[j].state==V3_VCORE_INVALID ? "INVALID" :
- s->vcore[j].state==V3_VCORE_RUNNING ? "running" :
- s->vcore[j].state==V3_VCORE_STOPPED ? "stopped" : "UNKNOWN",
- s->vcore[j].pcore,
- s->vcore[j].num_exits,
- s->vcore[j].last_rip,
- s->vcore[j].cpu_mode==V3_VCORE_CPU_REAL ? "real" :
- s->vcore[j].cpu_mode==V3_VCORE_CPU_PROTECTED ? "protected" :
- s->vcore[j].cpu_mode==V3_VCORE_CPU_PROTECTED_PAE ? "protectedpae" :
- s->vcore[j].cpu_mode==V3_VCORE_CPU_LONG ? "long" :
- s->vcore[j].cpu_mode==V3_VCORE_CPU_LONG_32_COMPAT ? "long32" :
- s->vcore[j].cpu_mode==V3_VCORE_CPU_LONG_16_COMPAT ? "long16" : "UNKNOWN",
- s->vcore[j].mem_mode==V3_VCORE_MEM_MODE_PHYSICAL ? "physical" :
- s->vcore[j].mem_mode==V3_VCORE_MEM_MODE_VIRTUAL ? "virtual" : "UNKNOWN",
- s->vcore[j].mem_state==V3_VCORE_MEM_STATE_SHADOW ? "shadow" :
- s->vcore[j].mem_state==V3_VCORE_MEM_STATE_NESTED ? "nested" : "UNKNOWN");
+ 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;
+ *(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';
}
}
out:
- if (s) { palacios_free(s); }
-
- return len;
-}
+ 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;
}
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;
+ }
+
+ // 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();
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");
if (ret < 0) {
ERROR("Error registering device region for V3 devices\n");
- goto failure2;
+ goto failure4;
}
v3_major_num = MAJOR(dev);
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;
}
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);
