X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest_mem.c;h=9c7703e4de4424a9a7ada51e685944202b4abe34;hb=31281ec866f7244baf965402aebc8e26046b43e0;hp=105322e6301406fcbb826533aaf91568b01cf50a;hpb=d4073a9dbe24ae160b8d6bd8fd5fd4ad8aa995a3;p=palacios.git diff --git a/palacios/src/palacios/vm_guest_mem.c b/palacios/src/palacios/vm_guest_mem.c index 105322e..9c7703e 100644 --- a/palacios/src/palacios/vm_guest_mem.c +++ b/palacios/src/palacios/vm_guest_mem.c @@ -1,57 +1,92 @@ +/* + * This file is part of the Palacios Virtual Machine Monitor developed + * by the V3VEE Project with funding from the United States National + * Science Foundation and the Department of Energy. + * + * The V3VEE Project is a joint project between Northwestern University + * and the University of New Mexico. You can find out more at + * http://www.v3vee.org + * + * Copyright (c) 2008, Jack Lange + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Jack Lange + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ + #include #include #include -extern struct vmm_os_hooks * os_hooks; +#ifndef V3_CONFIG_DEBUG_MEM_ERRORS +#undef PrintDebug +#define PrintDebug(fmt, args...) +#endif + +extern struct v3_os_hooks * os_hooks; /**********************************/ /* GROUP 0 */ /**********************************/ -int host_va_to_host_pa(addr_t host_va, addr_t * host_pa) { - if ((os_hooks) && (os_hooks)->vaddr_to_paddr) { +int v3_hva_to_hpa(addr_t hva, addr_t * hpa) { + if ((os_hooks) && (os_hooks)->vaddr_to_paddr) { - *host_pa = (addr_t)(os_hooks)->vaddr_to_paddr((void *)host_va); + *hpa = (addr_t)(os_hooks)->vaddr_to_paddr((void *)hva); - if (*host_pa == 0) { - PrintDebug("In HVA->HPA: Invalid HVA(%x)->HPA lookup\n", host_va); - return -1; + if (*hpa == 0) { + PrintDebug(VM_NONE, VCORE_NONE, "In HVA->HPA: Invalid HVA(%p)->HPA lookup\n", + (void *)hva); + return -1; + } + } else { + PrintDebug(VM_NONE, VCORE_NONE,"In HVA->HPA: os_hooks not defined\n"); + return -1; } - } else { - PrintDebug("In HVA->HPA: os_hooks not defined\n"); - return -1; - } - return 0; + return 0; } -int host_pa_to_host_va(addr_t host_pa, addr_t * host_va) { - if ((os_hooks) && (os_hooks)->paddr_to_vaddr) { +int v3_hpa_to_hva(addr_t hpa, addr_t * hva) { + if ((os_hooks) && (os_hooks)->paddr_to_vaddr) { - *host_va = (addr_t)(os_hooks)->paddr_to_vaddr((void *)host_pa); + *hva = (addr_t)(os_hooks)->paddr_to_vaddr((void *)hpa); - if (*host_va == 0) { - PrintDebug("In HPA->HVA: Invalid HPA(%x)->HVA lookup\n", host_pa); - return -1; + if (*hva == 0) { + PrintDebug(VM_NONE, VCORE_NONE,"In HPA->HVA: Invalid HPA(%p)->HVA lookup\n", + (void *)hpa); + return -1; + } + } else { + PrintDebug(VM_NONE, VCORE_NONE,"In HPA->HVA: os_hooks not defined\n"); + return -1; } - } else { - PrintDebug("In HPA->HVA: os_hooks not defined\n"); - return -1; - } - return 0; + return 0; } +int v3_gpa_to_hpa(struct guest_info * info, addr_t gpa, addr_t * hpa) { + struct v3_mem_region * reg = v3_get_mem_region(info->vm_info, info->vcpu_id, gpa); + if (reg == NULL) { + PrintDebug(info->vm_info,info,"In GPA->HPA: Could not find address in shadow map (addr=%p) (NULL REGION)\n", + (void *)gpa); + return -1; + } + + if (reg->flags.alloced == 0) { + //PrintDebug(info->vm_info, info, "In GPA->HPA: Tried to translate physical address of non allocated page (addr=%p)\n", + // (void *)gpa); + //v3_print_mem_map(info->vm_info); + return -1; + } + + *hpa = (gpa - reg->guest_start) + reg->host_addr; -int guest_pa_to_host_pa(struct guest_info * guest_info, addr_t guest_pa, addr_t * host_pa) { - // we use the shadow map here... - if (lookup_shadow_map_addr(&(guest_info->mem_map), guest_pa, host_pa) != HOST_REGION_PHYSICAL_MEMORY) { - PrintDebug("In GPA->HPA: Could not find address in shadow map (addr=%x)\n", guest_pa); - return -1; - } - - return 0; + return 0; } @@ -59,11 +94,11 @@ int guest_pa_to_host_pa(struct guest_info * guest_info, addr_t guest_pa, addr_t // This is a scan of the shadow map // For now we ignore it // -int host_pa_to_guest_pa(struct guest_info * guest_info, addr_t host_pa, addr_t * guest_pa) { - *guest_pa = 0; - PrintDebug("ERROR!!! HPA->GPA currently not implemented!!!\n"); +int v3_hpa_to_gpa(struct guest_info * guest_info, addr_t hpa, addr_t * gpa) { + *gpa = 0; + PrintDebug(guest_info->vm_info, guest_info, "ERROR!!! HPA->GPA currently not implemented!!!\n"); - return -1; + return -1; } @@ -74,122 +109,96 @@ int host_pa_to_guest_pa(struct guest_info * guest_info, addr_t host_pa, addr_t * /* !! Currently not implemented !! */ -// This will return negative until we implement host_pa_to_guest_pa() -int host_va_to_guest_pa(struct guest_info * guest_info, addr_t host_va, addr_t * guest_pa) { - addr_t host_pa = 0; - *guest_pa = 0; - - if (host_va_to_host_pa(host_va, &host_pa) != 0) { - PrintDebug("In HVA->GPA: Invalid HVA(%x)->HPA lookup\n", host_va); - return -1; - } +// This will return negative until we implement hpa_to_guest_pa() +int v3_hva_to_gpa(struct guest_info * guest_info, addr_t hva, addr_t * gpa) { + addr_t hpa = 0; + *gpa = 0; + + if (v3_hva_to_hpa(hva, &hpa) != 0) { + PrintDebug(guest_info->vm_info, guest_info, "In HVA->GPA: Invalid HVA(%p)->HPA lookup\n", + (void *)hva); + return -1; + } - if (host_pa_to_guest_pa(guest_info, host_pa, guest_pa) != 0) { - PrintDebug("In HVA->GPA: Invalid HPA(%x)->GPA lookup\n", host_pa); - return -1; - } + if (v3_hpa_to_gpa(guest_info, hpa, gpa) != 0) { + PrintDebug(guest_info->vm_info, guest_info, "In HVA->GPA: Invalid HPA(%p)->GPA lookup\n", + (void *)hpa); + return -1; + } - return 0; + return 0; } -int guest_pa_to_host_va(struct guest_info * guest_info, addr_t guest_pa, addr_t * host_va) { - addr_t host_pa = 0; +int v3_gpa_to_hva(struct guest_info * guest_info, addr_t gpa, addr_t * hva) { + addr_t hpa = 0; - *host_va = 0; + *hva = 0; - if (guest_pa_to_host_pa(guest_info, guest_pa, &host_pa) != 0) { - PrintDebug("In GPA->HVA: Invalid GPA(%x)->HPA lookup\n", guest_pa); - return -1; - } + if (v3_gpa_to_hpa(guest_info, gpa, &hpa) != 0) { + // PrintDebug(guest_info->vm_info, guest_info, "In GPA->HVA: Invalid GPA(%p)->HPA lookup\n", + // (void *)gpa); + return -1; + } - if (host_pa_to_host_va(host_pa, host_va) != 0) { - PrintDebug("In GPA->HVA: Invalid HPA(%x)->HVA lookup\n", host_pa); - return -1; - } - - return 0; -} - + if (v3_hpa_to_hva(hpa, hva) != 0) { + PrintDebug(guest_info->vm_info, guest_info, "In GPA->HVA: Invalid HPA(%p)->HVA lookup\n", + (void *)hpa); + return -1; + } -int guest_va_to_guest_pa(struct guest_info * guest_info, addr_t guest_va, addr_t * guest_pa) { - if (guest_info->mem_mode == PHYSICAL_MEM) { - // guest virtual address is the same as the physical - *guest_pa = guest_va; return 0; - } - - - if (guest_info->shdw_pg_mode == SHADOW_PAGING) { - // Guest Is in Paged mode - switch (guest_info->cpu_mode) { - case PROTECTED: - { - addr_t tmp_pa = 0; - pde32_t * pde = 0; - addr_t guest_pde = CR3_TO_PDE32(guest_info->shdw_pg_state.guest_cr3); +} - if (guest_pa_to_host_va(guest_info, guest_pde, (addr_t *)&pde) == -1) { - PrintDebug("In GVA->GPA: Invalid GPA(%x)->HVA PDE32 lookup\n", guest_pde); - return -1; - } +int v3_gva_to_gpa(struct guest_info * guest_info, addr_t gva, addr_t * gpa) { + v3_reg_t guest_cr3 = 0; + if (guest_info->mem_mode == PHYSICAL_MEM) { + // guest virtual address is the same as the physical + *gpa = gva; + return 0; + } - switch (pde32_lookup(pde, guest_va, &tmp_pa)) { - case PDE32_ENTRY_NOT_PRESENT: - *guest_pa = 0; - return -1; - case PDE32_ENTRY_LARGE_PAGE: - *guest_pa = tmp_pa; - return 0; - case PDE32_ENTRY_PTE32: - { - pte32_t * pte = 0; + if (guest_info->shdw_pg_mode == SHADOW_PAGING) { + guest_cr3 = guest_info->shdw_pg_state.guest_cr3; + } else { + guest_cr3 = guest_info->ctrl_regs.cr3; + } - if (guest_pa_to_host_va(guest_info, tmp_pa, (addr_t*)&pte) == -1) { - PrintDebug("In GVA->GPA: Invalid GPA(%x)->HVA PTE32 lookup\n", guest_pa); - return -1; + // Guest Is in Paged mode + switch (guest_info->cpu_mode) { + case PROTECTED: + if (v3_translate_guest_pt_32(guest_info, guest_cr3, gva, gpa) == -1) { + PrintDebug(guest_info->vm_info, guest_info, "Could not translate addr (%p) through 32 bit guest PT at %p\n", + (void *)gva, (void *)(addr_t)guest_cr3); + return -1; } - - PrintDebug("PTE host addr=%x, GVA=%x, GPA=%x(should be 0)\n", pte, guest_va, *guest_pa); - - if (pte32_lookup(pte, guest_va, guest_pa) != 0) { - PrintDebug("In GVA->GPA: PTE32 Lookup failure GVA=%x; PTE=%x\n", guest_va, pte); - // PrintPT32(PDE32_INDEX(guest_va) << 22, pte); - return -1; + break; + case PROTECTED_PAE: + if (v3_translate_guest_pt_32pae(guest_info, guest_cr3, gva, gpa) == -1) { + PrintDebug(guest_info->vm_info, guest_info, "Could not translate addr (%p) through 32 bitpae guest PT at %p\n", + (void *)gva, (void *)(addr_t)guest_cr3); + return -1; } - - return 0; - } + break; + case LONG: + case LONG_32_COMPAT: + case LONG_16_COMPAT: + if (v3_translate_guest_pt_64(guest_info, guest_cr3, gva, gpa) == -1) { + PrintDebug(guest_info->vm_info, guest_info, "Could not translate addr (%p) through 64 bit guest PT at %p\n", + (void *)gva, (void *)(addr_t)guest_cr3); + return -1; + } + break; default: - return -1; - } - } - case PROTECTED_PAE: - { - // Fill in - } - case LONG: - { - // Fill in - } - default: - return -1; + return -1; } - } else if (guest_info->shdw_pg_mode == NESTED_PAGING) { - - // Fill in - return -1; - } else { - return -1; - } - - - return 0; + + return 0; } @@ -199,10 +208,10 @@ int guest_va_to_guest_pa(struct guest_info * guest_info, addr_t guest_va, addr_t * * For now we ignore it... */ -int guest_pa_to_guest_va(struct guest_info * guest_info, addr_t guest_pa, addr_t * guest_va) { - *guest_va = 0; - PrintDebug("ERROR!!: GPA->GVA Not Implemented!!\n"); - return -1; +int v3_gpa_to_gva(struct guest_info * guest_info, addr_t gpa, addr_t * gva) { + *gva = 0; + PrintDebug(guest_info->vm_info, guest_info, "ERROR!!: GPA->GVA Not Implemented!!\n"); + return -1; } @@ -211,94 +220,104 @@ int guest_pa_to_guest_va(struct guest_info * guest_info, addr_t guest_pa, addr_t /**********************************/ -int guest_va_to_host_pa(struct guest_info * guest_info, addr_t guest_va, addr_t * host_pa) { - addr_t guest_pa = 0; +int v3_gva_to_hpa(struct guest_info * guest_info, addr_t gva, addr_t * hpa) { + addr_t gpa = 0; - *host_pa = 0; + *hpa = 0; - if (guest_va_to_guest_pa(guest_info, guest_va, &guest_pa) != 0) { - PrintDebug("In GVA->HPA: Invalid GVA(%x)->GPA lookup\n", guest_va); - return -1; - } + if (v3_gva_to_gpa(guest_info, gva, &gpa) != 0) { + PrintDebug(guest_info->vm_info, guest_info, "In GVA->HPA: Invalid GVA(%p)->GPA lookup\n", + (void *)gva); + return -1; + } - if (guest_pa_to_host_pa(guest_info, guest_pa, host_pa) != 0) { - PrintDebug("In GVA->HPA: Invalid GPA(%x)->HPA lookup\n", guest_pa); - return -1; - } + if (v3_gpa_to_hpa(guest_info, gpa, hpa) != 0) { + PrintDebug(guest_info->vm_info, guest_info, "In GVA->HPA: Invalid GPA(%p)->HPA lookup\n", + (void *)gpa); + return -1; + } - return 0; + return 0; } /* !! Currently not implemented !! */ -int host_pa_to_guest_va(struct guest_info * guest_info, addr_t host_pa, addr_t * guest_va) { - addr_t guest_pa = 0; +int v3_hpa_to_gva(struct guest_info * guest_info, addr_t hpa, addr_t * gva) { + addr_t gpa = 0; - *guest_va = 0; + *gva = 0; - if (host_pa_to_guest_pa(guest_info, host_pa, &guest_pa) != 0) { - PrintDebug("In HPA->GVA: Invalid HPA(%x)->GPA lookup\n", host_pa); - return -1; - } + if (v3_hpa_to_gpa(guest_info, hpa, &gpa) != 0) { + PrintDebug(guest_info->vm_info, guest_info, "In HPA->GVA: Invalid HPA(%p)->GPA lookup\n", + (void *)hpa); + return -1; + } - if (guest_pa_to_guest_va(guest_info, guest_pa, guest_va) != 0) { - PrintDebug("In HPA->GVA: Invalid GPA(%x)->GVA lookup\n", guest_pa); - return -1; - } + if (v3_gpa_to_gva(guest_info, gpa, gva) != 0) { + PrintDebug(guest_info->vm_info, guest_info, "In HPA->GVA: Invalid GPA(%p)->GVA lookup\n", + (void *)gpa); + return -1; + } - return 0; + return 0; } -int guest_va_to_host_va(struct guest_info * guest_info, addr_t guest_va, addr_t * host_va) { - addr_t guest_pa = 0; - addr_t host_pa = 0; +int v3_gva_to_hva(struct guest_info * guest_info, addr_t gva, addr_t * hva) { + addr_t gpa = 0; + addr_t hpa = 0; - *host_va = 0; + *hva = 0; - if (guest_va_to_guest_pa(guest_info, guest_va, &guest_pa) != 0) { - PrintDebug("In GVA->HVA: Invalid GVA(%x)->GPA lookup\n", guest_va); - return -1; - } + if (v3_gva_to_gpa(guest_info, gva, &gpa) != 0) { + PrintDebug(guest_info->vm_info, guest_info, "In GVA->HVA: Invalid GVA(%p)->GPA lookup\n", + (void *)gva); + return -1; + } - if (guest_pa_to_host_pa(guest_info, guest_pa, &host_pa) != 0) { - PrintDebug("In GVA->HVA: Invalid GPA(%x)->HPA lookup\n", guest_pa); - return -1; - } + if (v3_gpa_to_hpa(guest_info, gpa, &hpa) != 0) { + PrintDebug(guest_info->vm_info, guest_info, "In GVA->HVA: Invalid GPA(%p)->HPA lookup\n", + (void *)gpa); + return -1; + } - if (host_pa_to_host_va(host_pa, host_va) != 0) { - PrintDebug("In GVA->HVA: Invalid HPA(%x)->HVA lookup\n", host_pa); - return -1; - } + if (v3_hpa_to_hva(hpa, hva) != 0) { + PrintDebug(guest_info->vm_info, guest_info, "In GVA->HVA: Invalid HPA(%p)->HVA lookup\n", + (void *)hpa); + return -1; + } - return 0; + return 0; } /* !! Currently not implemented !! */ -int host_va_to_guest_va(struct guest_info * guest_info, addr_t host_va, addr_t * guest_va) { - addr_t host_pa = 0; - addr_t guest_pa = 0; +int v3_hva_to_gva(struct guest_info * guest_info, addr_t hva, addr_t * gva) { + addr_t hpa = 0; + addr_t gpa = 0; - *guest_va = 0; + *gva = 0; - if (host_va_to_host_pa(host_va, &host_pa) != 0) { - PrintDebug("In HVA->GVA: Invalid HVA(%x)->HPA lookup\n", host_va); - return -1; - } + if (v3_hva_to_hpa(hva, &hpa) != 0) { + PrintDebug(guest_info->vm_info, guest_info, "In HVA->GVA: Invalid HVA(%p)->HPA lookup\n", + (void *)hva); + return -1; + } - if (host_pa_to_guest_pa(guest_info, host_pa, &guest_pa) != 0) { - PrintDebug("In HVA->GVA: Invalid HPA(%x)->GPA lookup\n", host_va); - return -1; - } + if (v3_hpa_to_gpa(guest_info, hpa, &gpa) != 0) { + PrintDebug(guest_info->vm_info, guest_info, "In HVA->GVA: Invalid HPA(%p)->GPA lookup\n", + (void *)hva); + return -1; + } - if (guest_pa_to_guest_va(guest_info, guest_pa, guest_va) != 0) { - PrintDebug("In HVA->GVA: Invalid GPA(%x)->GVA lookup\n", guest_pa); - return -1; - } + if (v3_gpa_to_gva(guest_info, gpa, gva) != 0) { + PrintDebug(guest_info->vm_info, guest_info, "In HVA->GVA: Invalid GPA(%p)->GVA lookup\n", + (void *)gpa); + return -1; + } - return 0; + return 0; } @@ -309,101 +328,137 @@ int host_va_to_guest_va(struct guest_info * guest_info, addr_t host_va, addr_t * /* This is a straight address conversion + copy, * except for the tiny little issue of crossing page boundries..... */ -int read_guest_va_memory(struct guest_info * guest_info, addr_t guest_va, int count, char * dest) { - addr_t cursor = guest_va; - int bytes_read = 0; - +int v3_read_gva_memory(struct guest_info * guest_info, addr_t gva, int count, uchar_t * dest) { + addr_t cursor = gva; + int bytes_read = 0; - while (count > 0) { - int dist_to_pg_edge = (PAGE_ADDR(cursor) + PAGE_SIZE) - cursor; - int bytes_to_copy = (dist_to_pg_edge > count) ? count : dist_to_pg_edge; - addr_t host_addr = 0; + while (count > 0) { + int dist_to_pg_edge = (PAGE_ADDR(cursor) + PAGE_SIZE) - cursor; + int bytes_to_copy = (dist_to_pg_edge > count) ? count : dist_to_pg_edge; + addr_t host_addr = 0; - - /* JRL FIXME: - * This should be somewhere else.... - */ - /* - addr_t tmp_addr; - - addr_t shadow_pde = CR3_TO_PDE32(guest_info->shdw_pg_state.shadow_cr3); - // Check the Shadow Page Tables first (Virtual TLB) - if (pt32_lookup((pde32_t *)shadow_pde, cursor, &tmp_addr) == 0) { - host_addr = tmp_addr; + if (v3_gva_to_hva(guest_info, cursor, &host_addr) != 0) { + PrintDebug(guest_info->vm_info, guest_info, "Invalid GVA(%p)->HVA lookup\n", (void *)cursor); + return bytes_read; + } + + - if (host_pa_to_host_va(tmp_addr, &host_addr) != 0) { - return bytes_read; - } - } else { + memcpy(dest + bytes_read, (void*)host_addr, bytes_to_copy); - // No entry in the VTLB, do a guest page table walk - - if (guest_va_to_host_va(guest_info, cursor, &host_addr) != 0) { - PrintDebug("Invalid GVA(%x)->HVA lookup\n", cursor); - return bytes_read; - } + bytes_read += bytes_to_copy; + count -= bytes_to_copy; + cursor += bytes_to_copy; } -*/ - /* JRL: END GRUESOME HACK */ + + return bytes_read; +} + + + + +/* This is a straight address conversion + copy, + * except for the tiny little issue of crossing page boundries..... + */ +int v3_read_gpa_memory(struct guest_info * guest_info, addr_t gpa, int count, uchar_t * dest) { + addr_t cursor = gpa; + int bytes_read = 0; + + while (count > 0) { + int dist_to_pg_edge = (PAGE_ADDR(cursor) + PAGE_SIZE) - cursor; + int bytes_to_copy = (dist_to_pg_edge > count) ? count : dist_to_pg_edge; + addr_t host_addr = 0; + + if (v3_gpa_to_hva(guest_info, cursor, &host_addr) != 0) { + return bytes_read; + } - if (guest_va_to_host_va(guest_info, cursor, &host_addr) != 0) { - PrintDebug("Invalid GVA(%x)->HVA lookup\n", cursor); - return bytes_read; + /* + PrintDebug(info->vm_info, info, "Trying to read %d bytes\n", bytes_to_copy); + PrintDebug(info->vm_info, info, "Dist to page edge=%d\n", dist_to_pg_edge); + PrintDebug(info->vm_info, info, "PAGE_ADDR=0x%x\n", PAGE_ADDR(cursor)); + PrintDebug(info->vm_info, info, "guest_pa=0x%x\n", guest_pa); + */ + + memcpy(dest + bytes_read, (void*)host_addr, bytes_to_copy); + + bytes_read += bytes_to_copy; + count -= bytes_to_copy; + cursor += bytes_to_copy; } + + return bytes_read; +} + + +/* This clones v3_read_gva_memory + * We write only as far as page translations are available + */ +int v3_write_gva_memory(struct guest_info * guest_info, addr_t gva, int count, uchar_t * src) { + addr_t cursor = gva; + int bytes_written = 0; + + + + while (count > 0) { + int dist_to_pg_edge = (PAGE_ADDR(cursor) + PAGE_SIZE) - cursor; + int bytes_to_copy = (dist_to_pg_edge > count) ? count : dist_to_pg_edge; + addr_t host_addr = 0; + + + if (v3_gva_to_hva(guest_info, cursor, &host_addr) != 0) { + PrintDebug(guest_info->vm_info, guest_info, "Invalid GVA(%p)->HVA lookup\n", (void *)cursor); + return bytes_written; + } - memcpy(dest + bytes_read, (void*)host_addr, bytes_to_copy); + memcpy((void*)host_addr, + src + bytes_written, + bytes_to_copy); - bytes_read += bytes_to_copy; - count -= bytes_to_copy; - cursor += bytes_to_copy; - } + bytes_written += bytes_to_copy; + count -= bytes_to_copy; + cursor += bytes_to_copy; + } - return bytes_read; + return bytes_written; } +int v3_set_gva_memory(struct guest_info * guest_info, addr_t gva, int count, uchar_t src) { + addr_t cursor = gva; + int bytes_written = 0; + while (count > 0) { + int dist_to_pg_edge = (PAGE_ADDR(cursor) + PAGE_SIZE) - cursor; + int bytes_to_copy = (dist_to_pg_edge > count) ? count : dist_to_pg_edge; + addr_t host_addr = 0; - -/* This is a straight address conversion + copy, - * except for the tiny little issue of crossing page boundries..... - */ -int read_guest_pa_memory(struct guest_info * guest_info, addr_t guest_pa, int count, char * dest) { - addr_t cursor = guest_pa; - int bytes_read = 0; - - while (count > 0) { - int dist_to_pg_edge = (PAGE_ADDR(cursor) + PAGE_SIZE) - cursor; - int bytes_to_copy = (dist_to_pg_edge > count) ? count : dist_to_pg_edge; - addr_t host_addr = 0; - - if (guest_pa_to_host_va(guest_info, cursor, &host_addr) != 0) { - return bytes_read; - } - /* - PrintDebug("Trying to read %d bytes\n", bytes_to_copy); - PrintDebug("Dist to page edge=%d\n", dist_to_pg_edge); - PrintDebug("PAGE_ADDR=0x%x\n", PAGE_ADDR(cursor)); - PrintDebug("guest_pa=0x%x\n", guest_pa); - */ + if (v3_gva_to_hva(guest_info, cursor, &host_addr) != 0) { + PrintDebug(guest_info->vm_info, guest_info, "Invalid GVA(%p)->HVA lookup\n", (void *)cursor); + return bytes_written; + } + - memcpy(dest + bytes_read, (void*)host_addr, bytes_to_copy); - bytes_read += bytes_to_copy; - count -= bytes_to_copy; - cursor += bytes_to_copy; - } + memset((void*)host_addr, + src, + bytes_to_copy); + + bytes_written += bytes_to_copy; + count -= bytes_to_copy; + cursor += bytes_to_copy; + } - return bytes_read; + return bytes_written; } @@ -412,27 +467,52 @@ int read_guest_pa_memory(struct guest_info * guest_info, addr_t guest_pa, int co /* This is a straight address conversion + copy, * except for the tiny little issue of crossing page boundries..... */ -int write_guest_pa_memory(struct guest_info * guest_info, addr_t guest_pa, int count, char * src) { - addr_t cursor = guest_pa; - int bytes_written = 0; +int v3_write_gpa_memory(struct guest_info * guest_info, addr_t gpa, int count, uchar_t * src) { + addr_t cursor = gpa; + int bytes_written = 0; + + while (count > 0) { + int dist_to_pg_edge = (PAGE_ADDR(cursor) + PAGE_SIZE) - cursor; + int bytes_to_copy = (dist_to_pg_edge > count) ? count : dist_to_pg_edge; + addr_t host_addr; + + if (v3_gpa_to_hva(guest_info, cursor, &host_addr) != 0) { + return bytes_written; + } + - while (count > 0) { - int dist_to_pg_edge = (PAGE_ADDR(cursor) + PAGE_SIZE) - cursor; - int bytes_to_copy = (dist_to_pg_edge > count) ? count : dist_to_pg_edge; - addr_t host_addr; + memcpy((void*)host_addr, src + bytes_written, bytes_to_copy); - if (guest_pa_to_host_va(guest_info, cursor, &host_addr) != 0) { - return bytes_written; + bytes_written += bytes_to_copy; + count -= bytes_to_copy; + cursor += bytes_to_copy; } + return bytes_written; +} + + +int v3_set_gpa_memory(struct guest_info * guest_info, addr_t gpa, int count, uchar_t src) { + addr_t cursor = gpa; + int bytes_written = 0; + + while (count > 0) { + int dist_to_pg_edge = (PAGE_ADDR(cursor) + PAGE_SIZE) - cursor; + int bytes_to_copy = (dist_to_pg_edge > count) ? count : dist_to_pg_edge; + addr_t host_addr; + + if (v3_gpa_to_hva(guest_info, cursor, &host_addr) != 0) { + return bytes_written; + } - memcpy((void*)host_addr, src + bytes_written, bytes_to_copy); - bytes_written += bytes_to_copy; - count -= bytes_to_copy; - cursor += bytes_to_copy; - } + memset((void*)host_addr, src, bytes_to_copy); + + bytes_written += bytes_to_copy; + count -= bytes_to_copy; + cursor += bytes_to_copy; + } - return bytes_written; + return bytes_written; }