X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=572f01a08d669cabccf610cbffe91b1e0f893de7;hb=9c9370627c5a95e3abaa1b4a6b78f6f5846f53cc;hp=e60f05b83e10265d1661d36f3a0b1e93302ad47a;hpb=6d9d2f66b15fba2d85c6f74c84eee68444219775;p=palacios.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index e60f05b..572f01a 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -31,7 +31,7 @@ #include #include #include - +#include @@ -72,9 +72,16 @@ char * v3_cfg_val(v3_cfg_tree_t * tree, char * tag) { return NULL; } - val = (attrib == NULL) ? v3_xml_txt(child_entry): attrib; - - return val; + if (attrib == NULL) { + val = v3_xml_txt(child_entry); + + if ( val[0] == 0 ) + val = NULL; + } else { + val = attrib; + } + + return val; } v3_cfg_tree_t * v3_cfg_subtree(v3_cfg_tree_t * tree, char * tag) { @@ -183,24 +190,56 @@ 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) { PrintError("Memory is a required configuration parameter\n"); return -1; } 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_size = (addr_t)atoi(memory_str) * 1024 * 1024; + vm->mem_align = get_alignment(align_str); + + PrintDebug("Alignment for %lu bytes of memory computed as 0x%x\n", vm->mem_size, vm->mem_align); + if (strcasecmp(vm_class, "PC") == 0) { vm->vm_class = V3_PC_VM; } else { @@ -208,7 +247,6 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) { return -1; } - #ifdef CONFIG_TELEMETRY { char * telemetry = v3_cfg_val(vm_cfg, "telemetry"); @@ -245,45 +283,63 @@ static int determine_paging_mode(struct guest_info *info, v3_cfg_tree_t * core_c { extern v3_cpu_arch_t v3_cpu_types[]; - 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_type = v3_cfg_val(pg_tree, "type"); - char *pg_mode = v3_cfg_val(pg_tree, "mode"); + 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"); + char * page_size = v3_cfg_val(pg_tree, "page_size"); - PrintDebug("Paging mode specified as %s(%s)\n", pg_type, pg_mode); + PrintDebug("Paging mode specified as %s\n", pg_mode); - if (pg_type) { - if ((strcasecmp(pg_type, "nested") == 0)) { + 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(pg_type, "shadow") == 0)) { + } else if ((strcasecmp(pg_mode, "shadow") == 0)) { info->shdw_pg_mode = SHADOW_PAGING; } else { - PrintError("Invalid paging type (%s) specified in configuration. Defaulting to shadow paging\n", pg_type); + 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 type specified in configuration. Defaulting to shadow paging\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"); + if (strcasecmp(page_size, "4kb") == 0) { /* TODO: this may not be an ideal place for this */ + info->vm_info->paging_size = PAGING_4KB; + } else if (strcasecmp(page_size, "2mb") == 0) { + info->vm_info->paging_size = PAGING_2MB; + } else { + PrintError("Invalid VM paging size: '%s'\n", page_size); + return -1; + } + PrintDebug("VM page size=%s\n", page_size); } 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; } + + if (v3_cfg_val(pg_tree, "large_pages") != NULL) { + if (strcasecmp(v3_cfg_val(pg_tree, "large_pages"), "true") == 0) { + info->use_large_pages = 1; + PrintDebug("Use of large pages in memory virtualization enabled.\n"); + } + } return 0; } static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) { - if (!determine_paging_mode(info, core_cfg)) + if (determine_paging_mode(info, core_cfg)) return -1; v3_init_core(info); @@ -335,11 +391,6 @@ 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; } @@ -347,7 +398,7 @@ static int post_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { static int post_config_core(struct guest_info * info, v3_cfg_tree_t * cfg) { - + info->core_run_state = CORE_STOPPED; if (info->vm_info->vm_class == V3_PC_VM) { if (post_config_pc_core(info, cfg) == -1) { @@ -378,8 +429,8 @@ static struct v3_vm_info * allocate_guest(int num_cores) { -struct v3_vm_info * v3_config_guest(void * cfg_blob) { - v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id()); +struct v3_vm_info * v3_config_guest(void * cfg_blob, void * priv_data) { + v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU()); struct v3_config * cfg_data = NULL; struct v3_vm_info * vm = NULL; int num_cores = 0; @@ -422,6 +473,8 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) { return NULL; } + vm->host_priv_data = priv_data; + vm->cfg_data = cfg_data; V3_Print("Preconfiguration\n"); @@ -441,8 +494,12 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) { info->cpu_id = i; info->vm_info = vm; + info->core_cfg_data = per_core_cfg; - 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); } @@ -474,6 +531,16 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) { +int v3_free_config(struct v3_vm_info * vm) { + + v3_free_htable(vm->cfg_data->file_table, 1, 0); + + v3_xml_free(vm->cfg_data->cfg); + + V3_Free(vm->cfg_data); + return 0; +} + static int setup_memory_map(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { @@ -505,12 +572,12 @@ static int setup_devices(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { while (device) { - char * id = v3_cfg_val(device, "id"); + char * dev_class = v3_cfg_val(device, "class"); - V3_Print("configuring device %s\n", id); + V3_Print("configuring device %s\n", dev_class); - if (v3_create_device(vm, id, device) == -1) { - PrintError("Error creating device %s\n", id); + if (v3_create_device(vm, dev_class, device) == -1) { + PrintError("Error creating device %s\n", dev_class); return -1; }