X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=22ab61187fdd42ea3bad43446d115eee43470b85;hb=0aed29b0f8c93d2bef57d589e8bf058445e89fc2;hp=4c3701560dce3bce8e07381bbe4fd32660aeafcd;hpb=00fc14723ccdc218a89755cbf750167071d68b35;p=palacios.git

diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c
index 4c37015..22ab611 100644
--- a/palacios/src/palacios/vmm_config.c
+++ b/palacios/src/palacios/vmm_config.c
@@ -30,7 +30,7 @@
 #include <palacios/vmm_xml.h>
 #include <palacios/vmm_io.h>
 #include <palacios/vmm_msr.h>
-
+#include <palacios/vmm_mptable.h>
 
 
 
@@ -183,12 +183,35 @@ static struct v3_config * parse_config(void * cfg_blob) {
     return cfg;
 }
 
+
+static inline uint32_t get_alignment(char * align_str) {
+    // default is 4KB alignment
+    uint32_t alignment = PAGE_SIZE_4KB;
+
+    if (align_str != NULL) {
+	if (strcasecmp(align_str, "2MB") == 0) {
+	    alignment = PAGE_SIZE_2MB;
+	} else if (strcasecmp(align_str, "4MB") == 0) {
+	    alignment = PAGE_SIZE_4MB;
+	}
+    }
+    
+#ifndef CONFIG_ALIGNED_PG_ALLOC
+    if (alignment != PAGE_SIZE_4KB) {
+	PrintError("Aligned page allocations are not supported in this host (requested alignment=%d)\n", alignment);
+	PrintError("Ignoring alignment request\n");
+    }
+#endif 
+
+    return alignment;
+}
 static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
 
 
     char * memory_str = v3_cfg_val(vm_cfg, "memory");
     char * schedule_hz_str = v3_cfg_val(vm_cfg, "schedule_hz");
     char * vm_class = v3_cfg_val(vm_cfg, "class");
+    char * align_str = v3_cfg_val(v3_cfg_subtree(vm_cfg, "memory"), "alignment");
     uint32_t sched_hz = 100; 	// set the schedule frequency to 100 HZ
     
     if (!memory_str) {
@@ -197,10 +220,18 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
     }
     
     PrintDebug("Memory=%s\n", memory_str);
+    if (align_str) {
+	 PrintDebug("Alignment=%s\n", align_str);
+    } else {
+	 PrintDebug("Alignment defaulted to 4KB.\n");
+    }
 
     // Amount of ram the Guest will have, always in MB
     vm->mem_size = atoi(memory_str) * 1024 * 1024;
-    
+    vm->mem_align = get_alignment(align_str);
+
+    PrintDebug("Alignment computed as 0x%x\n", vm->mem_align);
+
     if (strcasecmp(vm_class, "PC") == 0) {
 	vm->vm_class = V3_PC_VM;
     } else {
@@ -241,37 +272,50 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) {
     return 0;
 }
 
-static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
+static int determine_paging_mode(struct guest_info *info, v3_cfg_tree_t * core_cfg)
+{
     extern v3_cpu_arch_t v3_cpu_types[];
-    v3_cfg_tree_t * paging_cfg = v3_cfg_subtree(core_cfg, "paging");
-    char * paging = v3_cfg_val(paging_cfg, NULL);
 
-    if (paging) {
-	if ((strcasecmp(paging, "nested") == 0)) {
+    v3_cfg_tree_t *vm_tree = info->vm_info->cfg_data->cfg;
+    v3_cfg_tree_t *pg_tree = v3_cfg_subtree(vm_tree, "paging");
+    char *pg_mode = v3_cfg_val(pg_tree, "mode");
+    
+    PrintDebug("Paging mode specified as %s\n", pg_mode);
+
+    if (pg_mode) {
+	if ((strcasecmp(pg_mode, "nested") == 0)) {
 	    if (v3_cpu_types[info->cpu_id] == V3_SVM_REV3_CPU) {
 	    	info->shdw_pg_mode = NESTED_PAGING;
 	    } else {
 		PrintError("Nested paging not supported on this hardware. Defaulting to shadow paging\n");
 	    	info->shdw_pg_mode = SHADOW_PAGING;
 	    }
-	} else if ((strcasecmp(paging, "shadow") == 0)) {
+	} else if ((strcasecmp(pg_mode, "shadow") == 0)) {
 	    info->shdw_pg_mode = SHADOW_PAGING;
 	} else {
-	    PrintError("Invalid paging type specified in configuration. Defaulting to shadow paging\n");
+	    PrintError("Invalid paging mode (%s) specified in configuration. Defaulting to shadow paging\n", pg_mode);
 	    info->shdw_pg_mode = SHADOW_PAGING;
 	}
     } else {
-	PrintDebug("No paging type specified in configuration.\n");
+	PrintDebug("No paging mode specified in configuration.\n");
 	info->shdw_pg_mode = SHADOW_PAGING;
     }
+
     if (info->shdw_pg_mode == NESTED_PAGING) {
-    	PrintDebug("Guest Page Mode: NESTED_PAGING\n");
+    	PrintDebug("Guest Paging Mode: NESTED_PAGING\n");
     } else if (info->shdw_pg_mode == SHADOW_PAGING) {
-        PrintDebug("Guest Page Mode: SHADOW_PAGING\n");
+        PrintDebug("Guest Paging Mode: SHADOW_PAGING\n");
     } else {
 	PrintError("Guest paging mode incorrectly set.\n");
 	return -1;
     }
+    return 0;
+}
+
+static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) {
+
+    if (determine_paging_mode(info, core_cfg))
+	return -1;
 
     v3_init_core(info);
 
@@ -322,6 +366,11 @@ static int post_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 	return -1;
     }
 
+    if (v3_inject_mptable(vm)==-1) { 
+	PrintError("Failed to inject mptable during configuration\n");
+	return -1;
+    }
+
     return 0;
 }
 
@@ -421,11 +470,13 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) {
     for (i = 0; i < vm->num_cores; i++) {
 	struct guest_info * info = &(vm->cores[i]);
 
-	
 	info->cpu_id = i;
 	info->vm_info = vm;
 
-	pre_config_core(info, per_core_cfg);
+	if (pre_config_core(info, per_core_cfg) == -1) {
+	    PrintError("Error in core %d preconfiguration\n", i);
+	    return NULL;
+	}
 
 	per_core_cfg = v3_cfg_next_branch(per_core_cfg);
     }