changed shadow memory map to use Red Black Tree

[palacios.git] / palacios / src / palacios / vm_guest_mem.c

diff --git a/palacios/src/palacios/vm_guest_mem.c b/palacios/src/palacios/vm_guest_mem.c
index f4cd053..b8db954 100644 (file)
--- a/palacios/src/palacios/vm_guest_mem.c
+++ b/palacios/src/palacios/vm_guest_mem.c
@@ -66,12 +66,15 @@ int host_pa_to_host_va(addr_t host_pa, addr_t * host_va) {
 
 
 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...
-  host_region_type_t reg_type = lookup_shadow_map_addr(&(guest_info->mem_map), guest_pa, host_pa);
+  struct v3_shadow_region * shdw_reg = v3_get_shadow_region(guest_info, guest_pa);
 
-  if (reg_type != HOST_REGION_PHYSICAL_MEMORY) {
-    PrintError("In GPA->HPA: Could not find address in shadow map (addr=%p) (reg_type=%d)\n", 
-               (void *)guest_pa, reg_type);
+  *host_pa = v3_get_shadow_addr(shdw_reg, guest_pa);
+
+  if ((shdw_reg == NULL) ||
+      (shdw_reg->host_type == SHDW_REGION_INVALID) ||
+      (shdw_reg->host_type == SHDW_REGION_FULL_HOOK)){
+    PrintError("In GPA->HPA: Could not find address in shadow map (addr=%p) (reg_type=%s)\n", 
+              (void *)guest_pa, v3_shdw_region_type_to_str(shdw_reg->host_type));
     return -1;
   }
 
@@ -151,7 +154,7 @@ int guest_va_to_guest_pa(struct guest_info * guest_info, addr_t guest_va, addr_t
     return 0;
   }
 
-  if (guest_info->mem_mode == SHADOW_PAGING) {
+  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;
@@ -161,13 +164,28 @@ int guest_va_to_guest_pa(struct guest_info * guest_info, addr_t guest_va, addr_t
   // Guest Is in Paged mode
   switch (guest_info->cpu_mode) {
   case PROTECTED:
-    return v3_translate_guest_pt_32(guest_info, guest_cr3, guest_va, guest_pa);
+    if (v3_translate_guest_pt_32(guest_info, guest_cr3, guest_va, guest_pa) == -1) {
+      PrintDebug("Could not translate addr (%p) through 32 bit guest PT at %p\n", 
+                (void *)guest_va, (void *)(addr_t)guest_cr3);
+      return -1;
+    }
+    break;
   case PROTECTED_PAE:
-    return v3_translate_guest_pt_32pae(guest_info, guest_cr3, guest_va, guest_pa);
+    if (v3_translate_guest_pt_32pae(guest_info, guest_cr3, guest_va, guest_pa) == -1) {
+      PrintDebug("Could not translate addr (%p) through 32 bitpae guest PT at %p\n", 
+                (void *)guest_va, (void *)(addr_t)guest_cr3);
+      return -1;
+    }
+    break;
   case LONG:
   case LONG_32_COMPAT:
   case LONG_16_COMPAT:
-    return v3_translate_guest_pt_64(guest_info, guest_cr3, guest_va, guest_pa);
+    if (v3_translate_guest_pt_64(guest_info, guest_cr3, guest_va, guest_pa) == -1) {
+      PrintDebug("Could not translate addr (%p) through 64 bit guest PT at %p\n", 
+                (void *)guest_va, (void *)(addr_t)guest_cr3);
+      return -1;
+    }
+    break;
   default:
     return -1;
   }