+struct v3_mem_region * v3_get_base_region(struct v3_vm_info * vm, addr_t gpa) {
+ struct v3_mem_map * map = &(vm->mem_map);
+ uint32_t block_index = gpa / V3_CONFIG_MEM_BLOCK_SIZE;
+
+ if (gpa > (map->num_base_regions * V3_CONFIG_MEM_BLOCK_SIZE) ||
+ (block_index >= map->num_base_regions)) {
+ PrintError(vm, VCORE_NONE, "Guest Address Exceeds Base Memory Size (ga=0x%p), (limit=0x%p)\n",
+ (void *)gpa, (void *)vm->mem_size);
+ v3_print_mem_map(vm);
+
+ return NULL;
+ }
+
+
+ return &(map->base_regions[block_index]);
+}
+
static int mem_offset_hypercall(struct guest_info * info, uint_t hcall_id, void * private_data) {
+ /*
PrintDebug(info->vm_info, info,"V3Vee: Memory offset hypercall (offset=%p)\n",
(void *)(info->vm_info->mem_map.base_region.host_addr));
info->vm_regs.rbx = info->vm_info->mem_map.base_region.host_addr;
-
- return 0;
+ */
+ return -1;
}
static int unhandled_err(struct guest_info * core, addr_t guest_va, addr_t guest_pa,
return -1;
}
+static int gpa_to_node_from_cfg(struct v3_vm_info * vm, addr_t gpa) {
+ v3_cfg_tree_t * layout_cfg = v3_cfg_subtree(vm->cfg_data->cfg, "mem_layout");
+ v3_cfg_tree_t * region_desc = v3_cfg_subtree(layout_cfg, "region");
+
+ while (region_desc) {
+ char * start_addr_str = v3_cfg_val(region_desc, "start_addr");
+ char * end_addr_str = v3_cfg_val(region_desc, "end_addr");
+ char * node_id_str = v3_cfg_val(region_desc, "node");
+
+ addr_t start_addr = 0;
+ addr_t end_addr = 0;
+ int node_id = 0;
+
+ if ((!start_addr_str) || (!end_addr_str) || (!node_id_str)) {
+ PrintError(vm, VCORE_NONE, "Invalid memory layout in configuration\n");
+ return -1;
+ }
+
+ start_addr = atox(start_addr_str);
+ end_addr = atox(end_addr_str);
+ node_id = atoi(node_id_str);
+
+ if ((gpa >= start_addr) && (gpa < end_addr)) {
+ return node_id;
+ }
+
+ region_desc = v3_cfg_next_branch(region_desc);
+ }
+
+ return -1;
+}
+
+
+
int v3_init_mem_map(struct v3_vm_info * vm) {
struct v3_mem_map * map = &(vm->mem_map);
- addr_t mem_pages = vm->mem_size >> 12;
-
- memset(&(map->base_region), 0, sizeof(struct v3_mem_region));
+ addr_t block_pages = V3_CONFIG_MEM_BLOCK_SIZE >> 12;
+ int i = 0;
- map->mem_regions.rb_node = NULL;
+ map->num_base_regions = (vm->mem_size / V3_CONFIG_MEM_BLOCK_SIZE) + \
+ ((vm->mem_size % V3_CONFIG_MEM_BLOCK_SIZE) > 0);
- // There is an underlying region that contains all of the guest memory
- // PrintDebug(info->vm_info, info, "Mapping %d pages of memory (%u bytes)\n", (int)mem_pages, (uint_t)info->mem_size);
- // 2MB page alignment needed for 2MB hardware nested paging
- map->base_region.guest_start = 0;
- map->base_region.guest_end = mem_pages * PAGE_SIZE_4KB;
+ map->mem_regions.rb_node = NULL;
-#ifdef V3_CONFIG_ALIGNED_PG_ALLOC
- map->base_region.host_addr = (addr_t)V3_AllocAlignedPages(mem_pages, vm->mem_align);
-#else
- map->base_region.host_addr = (addr_t)V3_AllocPages(mem_pages);
-#endif
+ map->base_regions = V3_Malloc(sizeof(struct v3_mem_region) * map->num_base_regions);
- if ((void*)map->base_region.host_addr == NULL) {
- PrintError(vm, VCORE_NONE,"Could not allocate guest memory\n");
- return -1;
+ if (map->base_regions == NULL) {
+ PrintError(vm, VCORE_NONE, "Could not allocate base region array\n");
+ return -1;
}
- // Clear the memory...
- memset(V3_VAddr((void *)map->base_region.host_addr), 0, mem_pages * PAGE_SIZE_4KB);
+ memset(map->base_regions, 0, sizeof(struct v3_mem_region) * map->num_base_regions);
+
+
+ for (i = 0; i < map->num_base_regions; i++) {
+ struct v3_mem_region * region = &(map->base_regions[i]);
+ int node_id = -1;
+
+ // 2MB page alignment needed for 2MB hardware nested paging
+ region->guest_start = V3_CONFIG_MEM_BLOCK_SIZE * i;
+ region->guest_end = region->guest_start + V3_CONFIG_MEM_BLOCK_SIZE;
+
+ // We assume that the xml config was smart enough to align the layout to the block size
+ // If they didn't we're going to ignore their settings
+ // and use whatever node the first byte of the block is assigned to
+ node_id = gpa_to_node_from_cfg(vm, region->guest_start);
+
+ V3_Print(vm, VCORE_NONE, "Allocating block %d on node %d\n", i, node_id);
+
+ if (node_id != -1) {
+ region->host_addr = (addr_t)V3_AllocPagesNode(block_pages, node_id);
+ } else {
+ region->host_addr = (addr_t)V3_AllocPages(block_pages);
+ }
+
+ if ((void *)region->host_addr == NULL) {
+ PrintError(vm, VCORE_NONE, "Could not allocate guest memory\n");
+ return -1;
+ }
+ // Clear the memory...
+ memset(V3_VAddr((void *)region->host_addr), 0, V3_CONFIG_MEM_BLOCK_SIZE);
- map->base_region.flags.read = 1;
- map->base_region.flags.write = 1;
- map->base_region.flags.exec = 1;
- map->base_region.flags.base = 1;
- map->base_region.flags.alloced = 1;
-
- map->base_region.unhandled = unhandled_err;
+ region->flags.read = 1;
+ region->flags.write = 1;
+ region->flags.exec = 1;
+ region->flags.base = 1;
+ region->flags.alloced = 1;
+
+ region->unhandled = unhandled_err;
+ }
v3_register_hypercall(vm, MEM_OFFSET_HCALL, mem_offset_hypercall, NULL);
void v3_delete_mem_map(struct v3_vm_info * vm) {
- struct rb_node * node = v3_rb_first(&(vm->mem_map.mem_regions));
+ struct v3_mem_map * map = &(vm->mem_map);
+ struct rb_node * node = v3_rb_first(&(map->mem_regions));
struct v3_mem_region * reg;
struct rb_node * tmp_node = NULL;
- addr_t mem_pages = vm->mem_size >> 12;
-
+ addr_t block_pages = V3_CONFIG_MEM_BLOCK_SIZE >> 12;
+ int i = 0;
+
while (node) {
reg = rb_entry(node, struct v3_mem_region, tree_node);
tmp_node = node;
v3_delete_mem_region(vm, reg);
}
- V3_FreePages((void *)(vm->mem_map.base_region.host_addr), mem_pages);
+ for (i = 0; i < map->num_base_regions; i++) {
+ struct v3_mem_region * region = &(map->base_regions[i]);
+ V3_FreePages((void *)(region->host_addr), block_pages);
+ }
+
+ V3_Free(map->base_regions);
+
}
// There is not registered region, so we check if its a valid address in the base region
- if (guest_addr > vm->mem_map.base_region.guest_end) {
- PrintError(vm, VCORE_NONE, "Guest Address Exceeds Base Memory Size (ga=0x%p), (limit=0x%p) (core=0x%x)\n",
- (void *)guest_addr, (void *)vm->mem_map.base_region.guest_end, core_id);
- v3_print_mem_map(vm);
-
- return NULL;
- }
-
- return &(vm->mem_map.base_region);
+ return v3_get_base_region(vm, guest_addr);
}
void v3_print_mem_map(struct v3_vm_info * vm) {
+ struct v3_mem_map * map = &(vm->mem_map);
struct rb_node * node = v3_rb_first(&(vm->mem_map.mem_regions));
- struct v3_mem_region * reg = &(vm->mem_map.base_region);
+ struct v3_mem_region * reg = NULL;
int i = 0;
V3_Print(vm, VCORE_NONE, "Memory Layout (all cores):\n");
+ V3_Print(vm, VCORE_NONE, "Base Memory: (%d regions)\n", map->num_base_regions);
+
+ for (i = 0; i < map->num_base_regions; i++) {
+ reg = &(map->base_regions[i]);
- V3_Print(vm, VCORE_NONE, "Base Region (all cores): 0x%p - 0x%p -> 0x%p\n",
- (void *)(reg->guest_start),
- (void *)(reg->guest_end - 1),
- (void *)(reg->host_addr));
+ V3_Print(vm, VCORE_NONE, "Base Region[%d] (all cores): 0x%p - 0x%p -> 0x%p\n",
+ i,
+ (void *)(reg->guest_start),
+ (void *)(reg->guest_end - 1),
+ (void *)(reg->host_addr));
+ }
// If the memory map is empty, don't print it
if (node == NULL) {
