X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm.c;h=dbb1b8d0620579510ad36a0e67f682ab7775512d;hb=3e937e5468169b8183a22a90f6d07ff370abde0c;hp=ffaf15c328a8dd1b95d3cea5454b68d28077bc10;hpb=d57b407f9d05a21303bc2c94cbd5142de130be48;p=palacios.git diff --git a/palacios/src/palacios/vmm.c b/palacios/src/palacios/vmm.c index ffaf15c..dbb1b8d 100644 --- a/palacios/src/palacios/vmm.c +++ b/palacios/src/palacios/vmm.c @@ -44,7 +44,6 @@ #include #endif - v3_cpu_arch_t v3_cpu_types[V3_CONFIG_MAX_CPUS]; v3_cpu_arch_t v3_mach_type = V3_INVALID_CPU; @@ -151,6 +150,10 @@ void Init_V3(struct v3_os_hooks * hooks, char * cpu_mask, int num_cpus, char *op v3_cpu_types[i] = V3_INVALID_CPU; } +#ifdef V3_CONFIG_CACHEPART + v3_init_cachepart(); +#endif + // Parse host-os defined options into an easily-accessed format. v3_parse_options(options); @@ -162,6 +165,7 @@ void Init_V3(struct v3_os_hooks * hooks, char * cpu_mask, int num_cpus, char *op v3_init_hvm(); #endif + // Memory manager initialization v3_init_mem(); @@ -273,6 +277,9 @@ void Shutdown_V3() { v3_deinit_options(); +#ifdef V3_CONFIG_CACHEPART + v3_deinit_cachepart(); +#endif } @@ -332,7 +339,9 @@ struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name, unsi } memset(vm->name, 0, 128); - strncpy(vm->name, name, 127); + strncpy(vm->name, name, 128); + vm->name[127] = 0; + if(v3_cpu_mapper_register_vm(vm) == -1) { @@ -359,12 +368,17 @@ struct v3_vm_info * v3_create_vm(void * cfg, void * priv_data, char * name, unsi PrintDebug(vm, VCORE_NONE, "Creating virtual core %u on logical core %u\n", vcore_id, core->pcpu_id); - sprintf(core->exec_name, "%s-%u", vm->name, vcore_id); + sprintf(core->exec_name, "%s-%d", vm->name, vcore_id); PrintDebug(vm, VCORE_NONE, "run: core=%u, func=0x%p, arg=0x%p, name=%s\n", core->pcpu_id, start_core, core, core->exec_name); - core->core_thread = V3_CREATE_THREAD_ON_CPU(core->pcpu_id, start_core, core, core->exec_name); + + // Resource controls for cores can be independent, but + // currently are not, hence this copy. + core->resource_control = vm->resource_control; + + core->core_thread = V3_CREATE_THREAD_ON_CPU(core->pcpu_id, start_core, core, core->exec_name, &core->resource_control); if (core->core_thread == NULL) { PrintError(vm, VCORE_NONE, "Thread creation failed\n"); @@ -537,8 +551,12 @@ int v3_reset_vm_extended(struct v3_vm_info *vm, v3_vm_reset_type t, void *data) #endif break; case V3_VM_RESET_CORE_RANGE: - start = ((uint32_t*)data)[0]; - end = ((uint32_t*)data)[1]; + if (data) { + start = ((uint32_t*)data)[0]; + end = ((uint32_t*)data)[1]; + } else { + return -1; + } break; default: PrintError(vm,VCORE_NONE,"Unsupported reset type %d for this VM\n",t); @@ -723,7 +741,8 @@ int v3_move_vm_mem(struct v3_vm_info * vm, void *gpa, int target_cpu) { new_hpa = V3_AllocPagesExtended(num_pages, PAGE_SIZE_4KB, new_node, - 0, 0); // no constraints given new shadow pager impl + vm->resource_control.pg_filter_func, + vm->resource_control.pg_filter_state); if (!new_hpa) { PrintError(vm, VCORE_NONE, "Cannot allocate memory for new base region...\n"); @@ -731,6 +750,8 @@ int v3_move_vm_mem(struct v3_vm_info * vm, void *gpa, int target_cpu) { } // Note, assumes virtual contiguity in the host OS... + // A null deref here can only happen if the host does not provide the + // physical_to_virtual functions or if they do not work memcpy(V3_VAddr((void*)new_hpa), V3_VAddr((void*)(reg->host_addr)), num_pages*PAGE_SIZE); old_hpa = (void*)(reg->host_addr); @@ -977,9 +998,10 @@ int v3_get_state_vm(struct v3_vm_info *vm, uint32_t numcores; uint32_t numregions; extern uint64_t v3_mem_block_size; + void *cur_gpa; if (!vm || !base || !core || !mem) { - PrintError(VM_NONE, VCORE_NONE, "Invalid rquest to v3_get_state_vm\n"); + PrintError(VM_NONE, VCORE_NONE, "Invalid request to v3_get_state_vm\n"); return -1; } @@ -997,6 +1019,14 @@ int v3_get_state_vm(struct v3_vm_info *vm, default: base->state = V3_VM_UNKNOWN; break; } + base->vm_type = V3_VM_GENERAL; + +#ifdef V3_CONFIG_HVM + if (vm->hvm_state.is_hvm) { + base->vm_type = V3_VM_HVM; + } +#endif + for (i=0;icores[i].core_run_state) { case CORE_INVALID: core->vcore[i].state = V3_VCORE_INVALID; break; @@ -1024,6 +1054,18 @@ int v3_get_state_vm(struct v3_vm_info *vm, 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].vcore_type = V3_VCORE_GENERAL; + +#ifdef V3_CONFIG_HVM + if (vm->hvm_state.is_hvm) { + if (v3_is_hvm_ros_core(&vm->cores[i])) { + core->vcore[i].vcore_type = V3_VCORE_ROS; + } else { + core->vcore[i].vcore_type = V3_VCORE_HRT; + } + } +#endif core->vcore[i].pcore=vm->cores[i].pcpu_id; core->vcore[i].last_rip=(void*)(vm->cores[i].rip); @@ -1032,7 +1074,10 @@ int v3_get_state_vm(struct v3_vm_info *vm, core->num_vcores=numcores; + cur_gpa=0; + for (i=0;iregion[i].guest_paddr = cur_gpa; mem->region[i].host_paddr = (void*)(vm->mem_map.base_regions[i].host_addr); mem->region[i].size = v3_mem_block_size; #ifdef V3_CONFIG_SWAPPING @@ -1043,9 +1088,35 @@ int v3_get_state_vm(struct v3_vm_info *vm, mem->region[i].pinned = 0; #endif + cur_gpa += mem->region[i].size; } mem->num_regions=numregions; + + + mem->mem_size=vm->mem_size; + mem->ros_mem_size=vm->mem_size; + +#ifdef V3_CONFIG_HVM + if (vm->hvm_state.is_hvm) { + mem->ros_mem_size=v3_get_hvm_ros_memsize(vm); + } +#endif + + return 0; +} + +int v3_get_state_sizes_vm(struct v3_vm_info *vm, + unsigned long long *num_vcores, + unsigned long long *num_regions) +{ + if (!vm || !num_vcores || !num_regions) { + PrintError(VM_NONE, VCORE_NONE, "Invalid request to v3_get_state_sizes\n"); + return -1; + } + + *num_vcores = vm->num_cores; + *num_regions = vm->mem_map.num_base_regions; return 0; } @@ -1157,18 +1228,6 @@ v3_cpu_mode_t v3_get_host_cpu_mode() { #endif -void v3_print_cond(const char * fmt, ...) { - if (v3_dbg_enable == 1) { - char buf[2048]; - va_list ap; - - va_start(ap, fmt); - vsnprintf(buf, 2048, fmt, ap); - va_end(ap); - - V3_Print(VM_NONE, VCORE_NONE,"%s", buf); - } -}