Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Cleaned up deinitialization of VMM and free of VMs
[palacios.git] / palacios / src / palacios / vmm.c
index a162da5..9337cdd 100644 (file)
@@ -18,6 +18,7 @@
  */
 
 #include <palacios/vmm.h>
+#include <palacios/vmm_mem.h>
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_config.h>
 #include <palacios/vm_guest.h>
@@ -49,7 +50,6 @@ int v3_dbg_enable = 0;
 
 
 
-
 static void init_cpu(void * arg) {
     uint32_t cpu_id = (uint32_t)(addr_t)arg;
 
@@ -107,9 +107,14 @@ void Init_V3(struct v3_os_hooks * hooks, char * cpu_mask, int num_cpus, char *op
 
     V3_Print(VM_NONE, VCORE_NONE, "V3 Print statement to fix a Kitten page fault bug\n");
 
+
     // Set global variables. 
     os_hooks = hooks;
 
+    if (num_cpus>V3_CONFIG_MAX_CPUS) { 
+       PrintError(VM_NONE,VCORE_NONE, "Requesting as many as %d cpus, but Palacios is compiled for a maximum of %d.  Only the first %d cpus will be considered\n", num_cpus, V3_CONFIG_MAX_CPUS, V3_CONFIG_MAX_CPUS);
+    }
+
     // Determine the global machine type
     v3_mach_type = V3_INVALID_CPU;
 
@@ -120,6 +125,9 @@ void Init_V3(struct v3_os_hooks * hooks, char * cpu_mask, int num_cpus, char *op
     // Parse host-os defined options into an easily-accessed format.
     v3_parse_options(options);
 
+    // Memory manager initialization
+    v3_init_mem();
+
     // Register all the possible device types
     V3_init_devices();
 
@@ -152,7 +160,7 @@ void Init_V3(struct v3_os_hooks * hooks, char * cpu_mask, int num_cpus, char *op
 
     if ((hooks) && (hooks->call_on_cpu)) {
 
-        for (i = 0; i < num_cpus; i++) {
+        for (i = 0; i < num_cpus && i < V3_CONFIG_MAX_CPUS; i++) {
             major = i / 8;
             minor = i % 8;
 
@@ -173,19 +181,9 @@ void Init_V3(struct v3_os_hooks * hooks, char * cpu_mask, int num_cpus, char *op
 void Shutdown_V3() {
     int i;
 
-    V3_deinit_devices();
-    V3_deinit_shdw_paging();
-
-    V3_deinit_extensions();
-
-#ifdef V3_CONFIG_SYMMOD
-    V3_deinit_symmod();
-#endif
-
-#ifdef V3_CONFIG_CHECKPOINT
-    V3_deinit_checkpoint();
-#endif
+    // Reverse order of Init_V3
 
+    // bring down CPUs
 
     if ((os_hooks) && (os_hooks->call_on_cpu)) {
        for (i = 0; i < V3_CONFIG_MAX_CPUS; i++) {
@@ -196,6 +194,33 @@ void Shutdown_V3() {
        }
     }
 
+#ifdef V3_CONFIG_CHECKPOINT
+    V3_deinit_checkpoint();
+#endif
+
+#ifdef V3_CONFIG_SYMMOD
+    V3_deinit_symmod();
+#endif
+
+    V3_disable_scheduler();
+
+    V3_disable_cpu_mapper();
+
+    V3_deinit_extensions();
+
+    V3_deinit_scheduling();
+    
+    V3_deinit_cpu_mapper();
+    
+    V3_deinit_shdw_paging();
+    
+    V3_deinit_devices();
+
+    v3_deinit_mem();
+    
+    v3_deinit_options();
+    
+
 }
 
 
@@ -273,10 +298,11 @@ static int start_core(void * p)
 
 int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
 
-    uint32_t i;
+    uint32_t i,j;
     uint8_t * core_mask = (uint8_t *)&cpu_mask; // This is to make future expansion easier
     uint32_t avail_cores = 0;
     int vcore_id = 0;
+    extern uint64_t v3_mem_block_size;
 
 
     if (vm->run_state != VM_STOPPED) {
@@ -288,16 +314,18 @@ int v3_start_vm(struct v3_vm_info * vm, unsigned int cpu_mask) {
     // Do not run if any core is using shadow paging and we are out of 4 GB bounds
     for (i=0;i<vm->num_cores;i++) { 
        if (vm->cores[i].shdw_pg_mode == SHADOW_PAGING) {
-           if ((vm->mem_map.base_region.host_addr + vm->mem_size ) >= 0x100000000ULL) {
-               PrintError(vm, VCORE_NONE, "Base memory region exceeds 4 GB boundary with shadow paging enabled on core %d.\n",i);
-               PrintError(vm, VCORE_NONE, "Any use of non-64 bit mode in the guest is likely to fail in this configuration.\n");
-               PrintError(vm, VCORE_NONE, "If you would like to proceed anyway, remove this check and recompile Palacios.\n");
-               PrintError(vm, VCORE_NONE, "Alternatively, change this VM to use nested paging.\n");
-               return -1;
+           for (j=0;j<vm->mem_map.num_base_regions;j++) {
+               if ((vm->mem_map.base_regions[i].host_addr + v3_mem_block_size)  >= 0x100000000ULL) {
+                   PrintError(vm, VCORE_NONE, "Base memory region %d exceeds 4 GB boundary with shadow paging enabled on core %d.\n",j, i);
+                   PrintError(vm, VCORE_NONE, "Any use of non-64 bit mode in the guest is likely to fail in this configuration.\n");
+                   PrintError(vm, VCORE_NONE, "If you would like to proceed anyway, remove this check and recompile Palacios.\n");
+                   PrintError(vm, VCORE_NONE, "Alternatively, change this VM to use nested paging.\n");
+                   return -1;
+               }
            }
        }
     }
-
+    
     /// CHECK IF WE ARE MULTICORE ENABLED....
 
     V3_Print(vm, VCORE_NONE, "V3 --  Starting VM (%u cores)\n", vm->num_cores);
@@ -633,59 +661,68 @@ int v3_simulate_vm(struct v3_vm_info * vm, unsigned int msecs) {
 
 }
 
-int v3_get_state_vm(struct v3_vm_info *vm, struct v3_vm_state *s)
+int v3_get_state_vm(struct v3_vm_info        *vm, 
+                   struct v3_vm_base_state  *base,
+                   struct v3_vm_core_state  *core,
+                   struct v3_vm_mem_state   *mem)
 {
-  uint32_t i;
-  uint32_t numcores = s->num_vcores > vm->num_cores ? vm->num_cores : s->num_vcores;
-
-  switch (vm->run_state) { 
-  case VM_INVALID: s->state = V3_VM_INVALID; break;
-  case VM_RUNNING: s->state = V3_VM_RUNNING; break;
-  case VM_STOPPED: s->state = V3_VM_STOPPED; break;
-  case VM_PAUSED: s->state = V3_VM_PAUSED; break;
-  case VM_ERROR: s->state = V3_VM_ERROR; break;
-  case VM_SIMULATING: s->state = V3_VM_SIMULATING; break;
-  default: s->state = V3_VM_UNKNOWN; break;
-  }
+    uint32_t i;
+    uint32_t numcores = core->num_vcores > vm->num_cores ? vm->num_cores : core->num_vcores;
+    uint32_t numregions = mem->num_regions > vm->mem_map.num_base_regions ? vm->mem_map.num_base_regions : mem->num_regions;
+    extern uint64_t v3_mem_block_size;
+
+    switch (vm->run_state) { 
+       case VM_INVALID: base->state = V3_VM_INVALID; break;
+       case VM_RUNNING: base->state = V3_VM_RUNNING; break;
+       case VM_STOPPED: base->state = V3_VM_STOPPED; break;
+       case VM_PAUSED: base->state = V3_VM_PAUSED; break;
+       case VM_ERROR: base->state = V3_VM_ERROR; break;
+       case VM_SIMULATING: base->state = V3_VM_SIMULATING; break;
+       default: base->state = V3_VM_UNKNOWN; break;
+    }
+
+    for (i=0;i<numcores;i++) {
+       switch (vm->cores[i].core_run_state) {
+           case CORE_INVALID: core->vcore[i].state = V3_VCORE_INVALID; break;
+           case CORE_RUNNING: core->vcore[i].state = V3_VCORE_RUNNING; break;
+           case CORE_STOPPED: core->vcore[i].state = V3_VCORE_STOPPED; break;
+           default: core->vcore[i].state = V3_VCORE_UNKNOWN; break;
+       }
+       switch (vm->cores[i].cpu_mode) {
+           case REAL: core->vcore[i].cpu_mode = V3_VCORE_CPU_REAL; break;
+           case PROTECTED: core->vcore[i].cpu_mode = V3_VCORE_CPU_PROTECTED; break;
+           case PROTECTED_PAE: core->vcore[i].cpu_mode = V3_VCORE_CPU_PROTECTED_PAE; break;
+           case LONG: core->vcore[i].cpu_mode = V3_VCORE_CPU_LONG; break;
+           case LONG_32_COMPAT: core->vcore[i].cpu_mode = V3_VCORE_CPU_LONG_32_COMPAT; break;
+           case LONG_16_COMPAT: core->vcore[i].cpu_mode = V3_VCORE_CPU_LONG_16_COMPAT; break;
+           default: core->vcore[i].cpu_mode = V3_VCORE_CPU_UNKNOWN; break;
+       }
+       switch (vm->cores[i].shdw_pg_mode) { 
+           case SHADOW_PAGING: core->vcore[i].mem_state = V3_VCORE_MEM_STATE_SHADOW; break;
+           case NESTED_PAGING: core->vcore[i].mem_state = V3_VCORE_MEM_STATE_NESTED; break;
+           default: core->vcore[i].mem_state = V3_VCORE_MEM_STATE_UNKNOWN; break;
+       }
+       switch (vm->cores[i].mem_mode) { 
+           case PHYSICAL_MEM: core->vcore[i].mem_mode = V3_VCORE_MEM_MODE_PHYSICAL; break;
+           case VIRTUAL_MEM: core->vcore[i].mem_mode=V3_VCORE_MEM_MODE_VIRTUAL; break;
+           default: core->vcore[i].mem_mode=V3_VCORE_MEM_MODE_UNKNOWN; break;
+       }
+       
+       core->vcore[i].pcore=vm->cores[i].pcpu_id;
+       core->vcore[i].last_rip=(void*)(vm->cores[i].rip);
+       core->vcore[i].num_exits=vm->cores[i].num_exits;
+    }
+    
+    core->num_vcores=numcores;
 
-  s->mem_base_paddr = (void*)(vm->mem_map.base_region.host_addr);
-  s->mem_size = vm->mem_size;
-
-  s->num_vcores = numcores;
-
-  for (i=0;i<numcores;i++) {
-    switch (vm->cores[i].core_run_state) {
-    case CORE_INVALID: s->vcore[i].state = V3_VCORE_INVALID; break;
-    case CORE_RUNNING: s->vcore[i].state = V3_VCORE_RUNNING; break;
-    case CORE_STOPPED: s->vcore[i].state = V3_VCORE_STOPPED; break;
-    default: s->vcore[i].state = V3_VCORE_UNKNOWN; break;
-    }
-    switch (vm->cores[i].cpu_mode) {
-    case REAL: s->vcore[i].cpu_mode = V3_VCORE_CPU_REAL; break;
-    case PROTECTED: s->vcore[i].cpu_mode = V3_VCORE_CPU_PROTECTED; break;
-    case PROTECTED_PAE: s->vcore[i].cpu_mode = V3_VCORE_CPU_PROTECTED_PAE; break;
-    case LONG: s->vcore[i].cpu_mode = V3_VCORE_CPU_LONG; break;
-    case LONG_32_COMPAT: s->vcore[i].cpu_mode = V3_VCORE_CPU_LONG_32_COMPAT; break;
-    case LONG_16_COMPAT: s->vcore[i].cpu_mode = V3_VCORE_CPU_LONG_16_COMPAT; break;
-    default: s->vcore[i].cpu_mode = V3_VCORE_CPU_UNKNOWN; break;
-    }
-    switch (vm->cores[i].shdw_pg_mode) { 
-    case SHADOW_PAGING: s->vcore[i].mem_state = V3_VCORE_MEM_STATE_SHADOW; break;
-    case NESTED_PAGING: s->vcore[i].mem_state = V3_VCORE_MEM_STATE_NESTED; break;
-    default: s->vcore[i].mem_state = V3_VCORE_MEM_STATE_UNKNOWN; break;
-    }
-    switch (vm->cores[i].mem_mode) { 
-    case PHYSICAL_MEM: s->vcore[i].mem_mode = V3_VCORE_MEM_MODE_PHYSICAL; break;
-    case VIRTUAL_MEM: s->vcore[i].mem_mode=V3_VCORE_MEM_MODE_VIRTUAL; break;
-    default: s->vcore[i].mem_mode=V3_VCORE_MEM_MODE_UNKNOWN; break;
-    }
-
-    s->vcore[i].pcore=vm->cores[i].pcpu_id;
-    s->vcore[i].last_rip=(void*)(vm->cores[i].rip);
-    s->vcore[i].num_exits=vm->cores[i].num_exits;
-  }
+    for (i=0;i<vm->mem_map.num_base_regions;i++) {
+       mem->region[i].host_paddr =  (void*)(vm->mem_map.base_regions[i].host_addr);
+       mem->region[i].size = v3_mem_block_size;
+    }
 
-  return 0;
+    mem->num_regions=numregions;
+    
+    return 0;
 }