X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_config.c;h=26943c8441f493c824490f1bb98ffe4004077537;hb=0adb91252edd4b093f12f57eea76687ced1aec0c;hp=b05d63701435955e8623751751291b4bd4e03726;hpb=36c1666cf64c49302d906a79d8cafbf760452d86;p=palacios.git diff --git a/palacios/src/palacios/vmm_config.c b/palacios/src/palacios/vmm_config.c index b05d637..26943c8 100644 --- a/palacios/src/palacios/vmm_config.c +++ b/palacios/src/palacios/vmm_config.c @@ -30,29 +30,11 @@ #include #include #include +#include -#ifdef CONFIG_SYMBIOTIC -#include -#ifdef CONFIG_SYMBIOTIC_SWAP -#include -#endif - -#endif - - -#ifdef CONFIG_SVM -#include -#include -#include -#endif -#ifdef CONFIG_VMX -#include -#include -#include -#endif #include @@ -90,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) { @@ -201,12 +190,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) { - v3_cpu_arch_t cpu_type = v3_get_cpu_type(v3_get_cpu_id()); + 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) { @@ -215,10 +227,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 { @@ -239,50 +259,13 @@ static int pre_config_vm(struct v3_vm_info * vm, v3_cfg_tree_t * vm_cfg) { } #endif - v3_init_hypercall_map(vm); - v3_init_io_map(vm); - v3_init_msr_map(vm); - v3_init_cpuid_map(vm); - v3_init_host_events(vm); - v3_init_intr_routers(vm); - - // Initialize the memory map - if (v3_init_mem_map(vm) == -1) { - PrintError("Could not initialize shadow map\n"); + if (v3_init_vm(vm) == -1) { + PrintError("Failed to initialize VM\n"); return -1; } -#ifdef CONFIG_SYMBIOTIC - v3_init_sym_iface(vm); -#endif - - v3_init_dev_mgr(vm); -#ifdef CONFIG_SYMBIOTIC_SWAP - PrintDebug("initializing symbiotic swap\n"); - v3_init_sym_swap(vm); -#endif - - - // init SVM/VMX -#ifdef CONFIG_SVM - if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) { - v3_init_svm_io_map(vm); - v3_init_svm_msr_map(vm); - } -#endif -#ifdef CONFIG_VMX - else if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) { - v3_init_vmx_io_map(vm); - v3_init_vmx_msr_map(vm); - } -#endif - else { - PrintError("Invalid CPU Type\n"); - return -1; - } - if (schedule_hz_str) { sched_hz = atoi(schedule_hz_str); } @@ -295,39 +278,69 @@ 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[]; - char * paging = v3_cfg_val(core_cfg, "paging"); - - /* - * Initialize the subsystem data strutures - */ -#ifdef CONFIG_TELEMETRY - if (info->vm_info->enable_telemetry) { - v3_init_telemetry(info); - } -#endif + 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"); - if ((v3_cpu_types[info->cpu_id] == V3_SVM_REV3_CPU) && - (paging) && (strcasecmp(paging, "nested") == 0)) { - PrintDebug("Guest Page Mode: NESTED_PAGING\n"); - info->shdw_pg_mode = NESTED_PAGING; + 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(pg_mode, "shadow") == 0)) { + 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("Guest Page Mode: SHADOW_PAGING\n"); - v3_init_shadow_page_state(info); + 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 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; + } - v3_init_time(info); - v3_init_intr_controllers(info); - v3_init_exception_state(info); + 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"); + } - v3_init_decoder(info); - + 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); if (info->vm_info->vm_class == V3_PC_VM) { if (pre_config_pc_core(info, core_cfg) == -1) { @@ -376,6 +389,12 @@ 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; } @@ -475,34 +494,15 @@ 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; + info->core_cfg_data = per_core_cfg; - pre_config_core(info, per_core_cfg); - - // init SVM/VMX -#ifdef CONFIG_SVM - if ((cpu_type == V3_SVM_CPU) || (cpu_type == V3_SVM_REV3_CPU)) { - if (v3_init_svm_vmcb(info, vm->vm_class) == -1) { - PrintError("Error in SVM initialization\n"); - return NULL; - } - } -#endif -#ifdef CONFIG_VMX - else if ((cpu_type == V3_VMX_CPU) || (cpu_type == V3_VMX_EPT_CPU)) { - if (v3_init_vmx_vmcs(info, vm->vm_class) == -1) { - PrintError("Error in VMX initialization\n"); - return NULL; - } - } -#endif - else { - PrintError("Invalid CPU Type\n"); + 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); } @@ -564,12 +564,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; }