X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvm_guest_mem.c;h=21c1b54cec464642ad9e726bf2f9e2817f7f5fe4;hb=fa7a42a55338e5fa49ec760b367225ca752df4fd;hp=7b98d83d6969ad3aba79255074383b96862657bb;hpb=639fdba00d36b2a60fad3d28703459354cf8744f;p=palacios.git

diff --git a/palacios/src/palacios/vm_guest_mem.c b/palacios/src/palacios/vm_guest_mem.c
index 7b98d83..21c1b54 100644
--- a/palacios/src/palacios/vm_guest_mem.c
+++ b/palacios/src/palacios/vm_guest_mem.c
@@ -115,78 +115,79 @@ 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) {
-    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 = 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 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->mem_mode == PHYSICAL_MEM) {
+    // guest virtual address is the same as the physical
+    *guest_pa = guest_va;
+    return 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;
-	    }
 
-	    return 0;
-	  }
-	default:
-	  return -1;
-	}
+  // 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 = 0;
+      
+      if (guest_info->shdw_pg_mode == SHADOW_PAGING) {
+	guest_pde = CR3_TO_PDE32(guest_info->shdw_pg_state.guest_cr3);
+      } else if (guest_info->shdw_pg_mode == NESTED_PAGING) {
+	guest_pde = CR3_TO_PDE32(guest_info->ctrl_regs.cr3);
       }
-      case PROTECTED_PAE_PG:
-	{
-	  // Fill in
-	}
-      case LONG_PG:
+      
+      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 PDE32_ENTRY_NOT_PRESENT: 
+	*guest_pa = 0;
+	return -1;
+      case PDE32_ENTRY_LARGE_PAGE:
+	*guest_pa = tmp_pa;
+	return 0;
+      case PDE32_ENTRY_PTE32:
 	{
-	  // Fill in
+	  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;
+	  }
+	  
+	  return 0;
 	}
-    default:
-      return -1;
+      default:
+	return -1;
+      }
     }
-  } else if (guest_info->page_mode == NESTED_PAGING) {
-
-    // Fill in
-
-  } else {
+  case PROTECTED_PAE:
+    {
+      // Fill in
+    }
+  case LONG:
+    {
+      // Fill in
+    }
+  default:
     return -1;
   }
-
-
+  
+  
+  
   return 0;
 }
 
@@ -318,10 +319,43 @@ int read_guest_va_memory(struct guest_info * guest_info, addr_t guest_va, int co
     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 (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);
     
@@ -352,8 +386,7 @@ int read_guest_pa_memory(struct guest_info * guest_info, addr_t guest_pa, int co
 
     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);