X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_mem.c;h=4248845379e107959fb34066abc76e047e091c16;hp=d37b3dae3514bbd861348297491b90f35678a4d6;hb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;hpb=058a3adde5893927ae056a1d8fbccd5191d2446f diff --git a/palacios/src/palacios/vmm_mem.c b/palacios/src/palacios/vmm_mem.c index d37b3da..4248845 100644 --- a/palacios/src/palacios/vmm_mem.c +++ b/palacios/src/palacios/vmm_mem.c @@ -21,12 +21,14 @@ #include #include #include +#include +#include +#include #define MEM_OFFSET_HCALL 0x1000 - static inline struct v3_shadow_region * insert_shadow_region(struct guest_info * info, struct v3_shadow_region * region); @@ -39,7 +41,7 @@ static int mem_offset_hypercall(struct guest_info * info, uint_t hcall_id, void } -void v3_init_shadow_map(struct guest_info * info) { +int v3_init_shadow_map(struct guest_info * info) { v3_shdw_map_t * map = &(info->mem_map); addr_t mem_pages = info->mem_size >> 12; @@ -47,12 +49,24 @@ void v3_init_shadow_map(struct guest_info * info) { map->hook_hva = (addr_t)V3_VAddr(V3_AllocPages(1)); // There is an underlying region that contains all of the guest memory + // PrintDebug("Mapping %d pages of memory (%u bytes)\n", (int)mem_pages, (uint_t)info->mem_size); + map->base_region.guest_start = 0; - map->base_region.guest_end = info->mem_size; + map->base_region.guest_end = mem_pages * PAGE_SIZE_4KB; map->base_region.host_type = SHDW_REGION_ALLOCATED; map->base_region.host_addr = (addr_t)V3_AllocPages(mem_pages); + + if ((void *)map->base_region.host_addr == NULL) { + PrintError("Could not allocate Guest memory\n"); + return -1; + } + + //memset(V3_VAddr((void *)map->base_region.host_addr), 0xffffffff, map->base_region.guest_end); + v3_register_hypercall(info, MEM_OFFSET_HCALL, mem_offset_hypercall, NULL); + + return 0; } void v3_delete_shadow_map(struct guest_info * info) { @@ -67,6 +81,9 @@ void v3_delete_shadow_map(struct guest_info * info) { v3_delete_shadow_region(info, reg); } + + V3_FreePage((void *)(info->mem_map.base_region.host_addr)); + V3_FreePage(V3_PAddr((void *)(info->mem_map.hook_hva))); } @@ -145,6 +162,22 @@ int v3_hook_full_mem(struct guest_info * info, addr_t guest_addr_start, addr_t g } +// This will unhook the memory hook registered at start address +// We do not support unhooking subregions +int v3_unhook_mem(struct guest_info * info, addr_t guest_addr_start) { + struct v3_shadow_region * reg = v3_get_shadow_region(info, guest_addr_start); + + if ((reg->host_type != SHDW_REGION_FULL_HOOK) || + (reg->host_type != SHDW_REGION_WRITE_HOOK)) { + PrintError("Trying to unhook a non hooked memory region (addr=%p)\n", (void *)guest_addr_start); + return -1; + } + + v3_delete_shadow_region(info, reg); + + return 0; +} + static inline @@ -181,9 +214,39 @@ struct v3_shadow_region * insert_shadow_region(struct guest_info * info, if ((ret = __insert_shadow_region(info, region))) { return ret; } - + v3_rb_insert_color(&(region->tree_node), &(info->mem_map.shdw_regions)); + + + // flush virtual page tables + // 3 cases shadow, shadow passthrough, and nested + if (info->shdw_pg_mode == SHADOW_PAGING) { + v3_mem_mode_t mem_mode = v3_get_vm_mem_mode(info); + + if (mem_mode == PHYSICAL_MEM) { + addr_t cur_addr; + + for (cur_addr = region->guest_start; + cur_addr < region->guest_end; + cur_addr += PAGE_SIZE_4KB) { + v3_invalidate_passthrough_addr(info, cur_addr); + } + } else { + v3_invalidate_shadow_pts(info); + } + + } else if (info->shdw_pg_mode == NESTED_PAGING) { + addr_t cur_addr; + + for (cur_addr = region->guest_start; + cur_addr < region->guest_end; + cur_addr += PAGE_SIZE_4KB) { + + v3_invalidate_nested_addr(info, cur_addr); + } + } + return NULL; } @@ -216,7 +279,8 @@ int v3_handle_mem_wr_hook(struct guest_info * info, addr_t guest_va, addr_t gues addr_t dst_addr = (addr_t)V3_VAddr((void *)v3_get_shadow_addr(reg, guest_pa)); - if (v3_emulate_write_op(info, guest_va, guest_pa, dst_addr, reg->write_hook, reg->priv_data) == -1) { + if (v3_emulate_write_op(info, guest_va, guest_pa, dst_addr, + reg->write_hook, reg->priv_data) == -1) { PrintError("Write hook emulation failed\n"); return -1; } @@ -230,12 +294,15 @@ int v3_handle_mem_full_hook(struct guest_info * info, addr_t guest_va, addr_t gu addr_t op_addr = info->mem_map.hook_hva; if (access_info.write == 1) { - if (v3_emulate_write_op(info, guest_va, guest_pa, op_addr, reg->write_hook, reg->priv_data) == -1) { + if (v3_emulate_write_op(info, guest_va, guest_pa, op_addr, + reg->write_hook, reg->priv_data) == -1) { PrintError("Write Full Hook emulation failed\n"); return -1; } } else { - if (v3_emulate_read_op(info, guest_va, guest_pa, op_addr, reg->read_hook, reg->write_hook, reg->priv_data) == -1) { + if (v3_emulate_read_op(info, guest_va, guest_pa, op_addr, + reg->read_hook, reg->write_hook, + reg->priv_data) == -1) { PrintError("Read Full Hook emulation failed\n"); return -1; } @@ -268,6 +335,8 @@ struct v3_shadow_region * v3_get_shadow_region(struct guest_info * info, addr_t if (guest_addr > info->mem_map.base_region.guest_end) { PrintError("Guest Address Exceeds Base Memory Size (ga=%p), (limit=%p)\n", (void *)guest_addr, (void *)info->mem_map.base_region.guest_end); + v3_print_mem_map(info); + return NULL; } @@ -276,11 +345,46 @@ struct v3_shadow_region * v3_get_shadow_region(struct guest_info * info, addr_t void v3_delete_shadow_region(struct guest_info * info, struct v3_shadow_region * reg) { - if (reg != NULL) { - v3_rb_erase(&(reg->tree_node), &(info->mem_map.shdw_regions)); + if (reg == NULL) { + return; + } + + // flush virtual page tables + // 3 cases shadow, shadow passthrough, and nested + if (info->shdw_pg_mode == SHADOW_PAGING) { + v3_mem_mode_t mem_mode = v3_get_vm_mem_mode(info); + + if (mem_mode == PHYSICAL_MEM) { + addr_t cur_addr; + + for (cur_addr = reg->guest_start; + cur_addr < reg->guest_end; + cur_addr += PAGE_SIZE_4KB) { + v3_invalidate_passthrough_addr(info, cur_addr); + } + } else { + v3_invalidate_shadow_pts(info); + } + + } else if (info->shdw_pg_mode == NESTED_PAGING) { + addr_t cur_addr; - V3_Free(reg); + for (cur_addr = reg->guest_start; + cur_addr < reg->guest_end; + cur_addr += PAGE_SIZE_4KB) { + + v3_invalidate_nested_addr(info, cur_addr); + } } + + + v3_rb_erase(&(reg->tree_node), &(info->mem_map.shdw_regions)); + + V3_Free(reg); + + // flush virtual page tables + // 3 cases shadow, shadow passthrough, and nested + } @@ -291,7 +395,7 @@ addr_t v3_get_shadow_addr(struct v3_shadow_region * reg, addr_t guest_addr) { (reg->host_type != SHDW_REGION_FULL_HOOK)) { return (guest_addr - reg->guest_start) + reg->host_addr; } else { - PrintDebug("MEM Region Invalid\n"); + // PrintError("MEM Region Invalid\n"); return 0; } @@ -299,28 +403,34 @@ addr_t v3_get_shadow_addr(struct v3_shadow_region * reg, addr_t guest_addr) { -void print_shadow_map(struct guest_info * info) { +void v3_print_mem_map(struct guest_info * info) { struct rb_node * node = v3_rb_first(&(info->mem_map.shdw_regions)); struct v3_shadow_region * reg = &(info->mem_map.base_region); int i = 0; - PrintDebug("Memory Layout:\n"); + V3_Print("Memory Layout:\n"); - PrintDebug("Base Region: 0x%p - 0x%p -> 0x%p\n", + V3_Print("Base Region: 0x%p - 0x%p -> 0x%p\n", (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) { + return; + } + do { reg = rb_entry(node, struct v3_shadow_region, tree_node); - PrintDebug("%d: 0x%p - 0x%p -> 0x%p\n", i, + V3_Print("%d: 0x%p - 0x%p -> 0x%p\n", i, (void *)(reg->guest_start), (void *)(reg->guest_end - 1), (void *)(reg->host_addr)); - PrintDebug("\t(%s) (WriteHook = 0x%p) (ReadHook = 0x%p)\n", + V3_Print("\t(%s) (WriteHook = 0x%p) (ReadHook = 0x%p)\n", v3_shdw_region_type_to_str(reg->host_type), (void *)(reg->write_hook), (void *)(reg->read_hook));