X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=9125d2e136bf1f12a28f8800184006e515c467cc;hb=3716aafce2de9e12ed62bee37968bfc0e0eaed44;hp=6ffa3e44b9ceaaa14d5e08d191d4941bedadc286;hpb=07a12ade201ee7c2fe2358084ca079d2facac500;p=palacios.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index 6ffa3e4..9125d2e 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -30,15 +30,13 @@ #include #include #include -#include - +#include #include -#include #include "vmm_config_class.h" @@ -58,6 +56,7 @@ struct file_idx_table { static int setup_memory_map(struct v3_vm_info * vm, v3_cfg_tree_t * cfg); +static int setup_extensions(struct v3_vm_info * vm, v3_cfg_tree_t * cfg); static int setup_devices(struct v3_vm_info * vm, v3_cfg_tree_t * cfg); @@ -132,11 +131,23 @@ static struct v3_config * parse_config(void * cfg_blob) { offset += 8; cfg = (struct v3_config *)V3_Malloc(sizeof(struct v3_config)); + + if (!cfg) { + PrintError("Unable to allocate while parsing\n"); + return NULL; + } + memset(cfg, 0, sizeof(struct v3_config)); cfg->blob = cfg_blob; INIT_LIST_HEAD(&(cfg->file_list)); cfg->file_table = v3_create_htable(0, file_hash_fn, file_eq_fn); + + if (!(cfg->file_table)) { + PrintError("Unable to allocate hash table while parsing\n"); + V3_Free(cfg); + return NULL; + } xml_len = *(uint32_t *)(cfg_blob + offset); offset += 4; @@ -163,13 +174,14 @@ static struct v3_config * parse_config(void * cfg_blob) { if (!file) { PrintError("Could not allocate file structure\n"); + v3_free_htable(cfg->file_table,0,0); + V3_Free(cfg); return NULL; } - V3_Print("File index=%d id=%s\n", idx, id); - strncpy(file->tag, id, 256); + strncpy(file->tag, id, V3_MAX_TAG_LEN); file->size = hdr->size; file->data = cfg_blob + hdr->offset; @@ -203,7 +215,7 @@ static inline uint32_t get_alignment(char * align_str) { } } -#ifndef CONFIG_ALIGNED_PG_ALLOC +#ifndef V3_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"); @@ -212,15 +224,16 @@ static inline uint32_t get_alignment(char * align_str) { return alignment; } -static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) { +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; @@ -237,6 +250,7 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) { 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) { @@ -246,7 +260,7 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) { return -1; } -#ifdef CONFIG_TELEMETRY +#ifdef V3_CONFIG_TELEMETRY { char * telemetry = v3_cfg_val(vm_cfg, "telemetry"); @@ -278,55 +292,42 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) { return 0; } -static int determine_paging_mode(struct guest_info *info, v3_cfg_tree_t * core_cfg) -{ - extern v3_cpu_arch_t v3_cpu_types[]; + +static int determine_paging_mode(struct guest_info * info, v3_cfg_tree_t * core_cfg) { + extern v3_cpu_arch_t v3_mach_type; 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\n", pg_mode); if (pg_mode) { if ((strcasecmp(pg_mode, "nested") == 0)) { - if (v3_cpu_types[info->cpu_id] == V3_SVM_REV3_CPU) { + // we assume symmetric cores, so if core 0 has nested paging they all do + if ((v3_mach_type == V3_SVM_REV3_CPU) || + (v3_mach_type == V3_VMX_EPT_CPU) || + (v3_mach_type == V3_VMX_EPT_UG_CPU)) { + + V3_Print("Setting paging mode to NESTED\n"); 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_mode, "shadow") == 0)) { + V3_Print("Setting paging mode to SHADOW\n"); info->shdw_pg_mode = SHADOW_PAGING; } else { 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. Defaulting to shadow paging\n"); + V3_Print("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 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 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; @@ -337,11 +338,14 @@ static int determine_paging_mode(struct guest_info *info, v3_cfg_tree_t * core_c } 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) != 0) { return -1; + } - v3_init_core(info); + if (v3_init_core(info) == -1) { + PrintError("Error Initializing Core\n"); + return -1; + } if (info->vm_info->vm_class == V3_PC_VM) { if (pre_config_pc_core(info, core_cfg) == -1) { @@ -360,16 +364,29 @@ static int pre_config_core(struct guest_info * info, v3_cfg_tree_t * core_cfg) { static int post_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { - vm->run_state = VM_STOPPED; + // Configure the memory map for the guest if (setup_memory_map(vm, cfg) == -1) { PrintError("Setting up guest memory map failed...\n"); return -1; } - - //v3_hook_io_port(info, 1234, &IO_Read, NULL, info); - + + + if (vm->vm_class == V3_PC_VM) { + if (post_config_pc(vm, cfg) == -1) { + PrintError("PC Post configuration failure\n"); + return -1; + } + } else { + PrintError("Invalid VM Class\n"); + return -1; + } + + + /* + * Initialize configured devices + */ if (setup_devices(vm, cfg) == -1) { PrintError("Failed to setup devices\n"); return -1; @@ -380,16 +397,19 @@ static int post_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { v3_print_msr_map(vm); - if (vm->vm_class == V3_PC_VM) { - if (post_config_pc(vm, cfg) == -1) { - PrintError("PC Post configuration failure\n"); - return -1; - } - } else { - PrintError("Invalid VM Class\n"); + + + /* + * Initialize configured extensions + */ + if (setup_extensions(vm, cfg) == -1) { + PrintError("Failed to setup extensions\n"); return -1; } + + vm->run_state = VM_STOPPED; + return 0; } @@ -397,8 +417,12 @@ 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 (v3_init_core_extensions(info) == -1) { + PrintError("Error intializing extension core states\n"); + return -1; + } + if (info->vm_info->vm_class == V3_PC_VM) { if (post_config_pc_core(info, cfg) == -1) { PrintError("PC Post configuration failure\n"); @@ -419,17 +443,30 @@ static struct v3_vm_info * allocate_guest(int num_cores) { int guest_state_size = sizeof(struct v3_vm_info) + (sizeof(struct guest_info) * num_cores); struct v3_vm_info * vm = V3_Malloc(guest_state_size); + if (!vm) { + PrintError("Unable to allocate space for guest data structures\n"); + return NULL; + } + + int i = 0; + memset(vm, 0, guest_state_size); vm->num_cores = num_cores; + for (i = 0; i < num_cores; i++) { + vm->cores[i].core_run_state = CORE_INVALID; + } + + vm->run_state = VM_INVALID; + return vm; } -struct v3_vm_info * v3_config_guest(void * cfg_blob) { - v3_cpu_arch_t cpu_type = v3_get_cpu_type(V3_Get_CPU()); +struct v3_vm_info * v3_config_guest(void * cfg_blob, void * priv_data) { + extern v3_cpu_arch_t v3_mach_type; struct v3_config * cfg_data = NULL; struct v3_vm_info * vm = NULL; int num_cores = 0; @@ -437,7 +474,7 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) { v3_cfg_tree_t * cores_cfg = NULL; v3_cfg_tree_t * per_core_cfg = NULL; - if (cpu_type == V3_INVALID_CPU) { + if (v3_mach_type == V3_INVALID_CPU) { PrintError("Configuring guest on invalid CPU\n"); return NULL; } @@ -457,7 +494,6 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) { } num_cores = atoi(v3_cfg_val(cores_cfg, "count")); - if (num_cores == 0) { PrintError("No cores specified in configuration\n"); return NULL; @@ -472,6 +508,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"); @@ -481,7 +519,6 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) { return NULL; } - V3_Print("Per core configuration\n"); per_core_cfg = v3_cfg_subtree(cores_cfg, "core"); @@ -489,7 +526,7 @@ 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->vcpu_id = i; info->vm_info = vm; info->core_cfg_data = per_core_cfg; @@ -498,6 +535,7 @@ struct v3_vm_info * v3_config_guest(void * cfg_blob) { return NULL; } + per_core_cfg = v3_cfg_next_branch(per_core_cfg); } @@ -528,6 +566,17 @@ 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) { @@ -552,6 +601,29 @@ static int setup_memory_map(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { } +static int setup_extensions(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { + v3_cfg_tree_t * extension = v3_cfg_subtree(v3_cfg_subtree(cfg, "extensions"), "extension"); + + while (extension) { + char * ext_name = v3_cfg_val(extension, "name"); + + if (!ext_name) { + PrintError("Extension has no name\n"); + return -1; + } + + V3_Print("Configuring extension %s\n", ext_name); + + if (v3_add_extension(vm, ext_name, extension) == -1) { + PrintError("Error adding extension %s\n", ext_name); + return -1; + } + + extension = v3_cfg_next_branch(extension); + } + + return 0; +} static int setup_devices(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { @@ -578,4 +650,3 @@ static int setup_devices(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { -