*** empty log message ***

[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 d1c8bee..105322e 100644 (file)
--- a/palacios/src/palacios/vm_guest_mem.c
+++ b/palacios/src/palacios/vm_guest_mem.c
@@ -15,9 +15,11 @@ int host_va_to_host_pa(addr_t host_va, addr_t * host_pa) {
     *host_pa = (addr_t)(os_hooks)->vaddr_to_paddr((void *)host_va);
   
     if (*host_pa == 0) {
+      PrintDebug("In HVA->HPA: Invalid HVA(%x)->HPA lookup\n", host_va);
       return -1;
     }
   } else {
+    PrintDebug("In HVA->HPA: os_hooks not defined\n");
     return -1;
   }
   return 0;
@@ -30,9 +32,11 @@ int host_pa_to_host_va(addr_t host_pa, addr_t * host_va) {
     *host_va = (addr_t)(os_hooks)->paddr_to_vaddr((void *)host_pa);
     
     if (*host_va == 0) {
+      PrintDebug("In HPA->HVA: Invalid HPA(%x)->HVA lookup\n", host_pa);
       return -1;
     }
   } else {
+    PrintDebug("In HPA->HVA: os_hooks not defined\n");
     return -1;
   }
   return 0;
@@ -43,6 +47,7 @@ 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...
   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;
   }
 
@@ -56,6 +61,7 @@ int guest_pa_to_host_pa(struct guest_info * guest_info, addr_t guest_pa, addr_t
 // 
 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");
 
   return -1;
 }
@@ -70,14 +76,16 @@ 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;
+  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;
   }
 
   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;
   }
 
@@ -88,15 +96,17 @@ int host_va_to_guest_pa(struct guest_info * guest_info, addr_t host_va, addr_t *
 
 
 int guest_pa_to_host_va(struct guest_info * guest_info, addr_t guest_pa, addr_t * host_va) {
-  addr_t host_pa;
+  addr_t host_pa = 0;
 
   *host_va = 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 (host_pa_to_host_va(host_pa, host_va) != 0) {
+    PrintDebug("In GPA->HVA: Invalid HPA(%x)->HVA lookup\n", host_pa);
     return -1;
   }
 
@@ -105,41 +115,51 @@ int guest_pa_to_host_va(struct guest_info * guest_info, addr_t guest_pa, addr_t
 
 
 int guest_va_to_guest_pa(struct guest_info * guest_info, addr_t guest_va, addr_t * guest_pa) {
-  if (guest_info->page_mode == SHADOW_PAGING) {
+  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 REAL:
     case PROTECTED:
-    case LONG:
-    case PROTECTED_PAE:
-      // guest virtual address is the same as the physical
-      *guest_pa = guest_va;
-      return 0;
-    case PROTECTED_PG:
       {
-       addr_t tmp_pa;
-       pde32_t * pde;
-       addr_t guest_pde = CR3_TO_PDE32(guest_info->shdw_pg_state.guest_cr3.r_reg);
+       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;
        }
 
+
        switch (pde32_lookup(pde, guest_va, &tmp_pa)) {
-       case NOT_PRESENT: 
+       case PDE32_ENTRY_NOT_PRESENT: 
          *guest_pa = 0;
          return -1;
-       case LARGE_PAGE:
+       case PDE32_ENTRY_LARGE_PAGE:
          *guest_pa = tmp_pa;
          return 0;
-       case PTE32:
+       case PDE32_ENTRY_PTE32:
          {
-           pte32_t * pte;
+           pte32_t * pte = 0;
+
 
            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;
            }
            
+           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;
            }
 
@@ -149,21 +169,21 @@ int guest_va_to_guest_pa(struct guest_info * guest_info, addr_t guest_va, addr_t
          return -1;
        }
       }
-      case PROTECTED_PAE_PG:
+      case PROTECTED_PAE:
        {
          // Fill in
        }
-      case LONG_PG:
+      case LONG:
        {
          // Fill in
        }
     default:
       return -1;
     }
-  } else if (guest_info->page_mode == NESTED_PAGING) {
+  } else if (guest_info->shdw_pg_mode == NESTED_PAGING) {
 
     // Fill in
-
+    return -1;
   } else {
     return -1;
   }
@@ -181,6 +201,7 @@ int guest_va_to_guest_pa(struct guest_info * guest_info, addr_t guest_va, addr_t
  */
 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;
 }
 
@@ -191,15 +212,17 @@ 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;
+  addr_t guest_pa = 0;
 
   *host_pa = 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 (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;
   }
 
@@ -208,15 +231,17 @@ int guest_va_to_host_pa(struct guest_info * guest_info, addr_t guest_va, addr_t
 
 /* !! 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;
+  addr_t guest_pa = 0;
 
   *guest_va = 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 (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;
   }
 
@@ -227,20 +252,23 @@ int host_pa_to_guest_va(struct guest_info * guest_info, addr_t host_pa, addr_t *
 
 
 int guest_va_to_host_va(struct guest_info * guest_info, addr_t guest_va, addr_t * host_va) {
-  addr_t guest_pa;
-  addr_t host_pa;
+  addr_t guest_pa = 0;
+  addr_t host_pa = 0;
 
   *host_va = 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 (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 (host_pa_to_host_va(host_pa, host_va) != 0) {
+    PrintDebug("In GVA->HVA: Invalid HPA(%x)->HVA lookup\n", host_pa);
     return -1;
   }
 
@@ -250,20 +278,23 @@ int guest_va_to_host_va(struct guest_info * guest_info, addr_t guest_va, addr_t
 
 /* !! 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;
-  addr_t guest_pa;
+  addr_t host_pa = 0;
+  addr_t guest_pa = 0;
 
   *guest_va = 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 (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 (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;
   }
 
@@ -282,14 +313,50 @@ int read_guest_va_memory(struct guest_info * guest_info, addr_t guest_va, int co
   addr_t cursor = guest_va;
   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;
+    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 (host_pa_to_host_va(tmp_addr, &host_addr) != 0) {
+       return bytes_read;
+      }
+    } else {
+    
+      // 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;
+      }
+    }
+*/
+    /* JRL: END GRUESOME HACK */
+
+
+    
     if (guest_va_to_host_va(guest_info, cursor, &host_addr) != 0) {
+      PrintDebug("Invalid GVA(%x)->HVA lookup\n", cursor);
       return bytes_read;
     }
+    
+    
 
     memcpy(dest + bytes_read, (void*)host_addr, bytes_to_copy);
     
@@ -316,12 +383,12 @@ int read_guest_pa_memory(struct guest_info * guest_info, addr_t guest_pa, int co
   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;
+    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);