X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_32pae.h;h=6d6e403f565c43e2bebac696759042e19872348a;hb=a5d2c00cc461b4a60a1360a2a0bba55cef467bab;hp=e1a84f03c754dccf1b9bc3534b72912d65edcf41;hpb=03b23f614f0a00d3e23d5579f9abb87684af9ec8;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging_32pae.h b/palacios/src/palacios/vmm_direct_paging_32pae.h
index e1a84f0..6d6e403 100644
--- a/palacios/src/palacios/vmm_direct_paging_32pae.h
+++ b/palacios/src/palacios/vmm_direct_paging_32pae.h
@@ -27,10 +27,12 @@
 #include <palacios/vm_guest_mem.h>
 #include <palacios/vm_guest.h>
 
+/* This always builds 3 level page tables - no large pages */
 
 static inline int handle_passthrough_pagefault_32pae(struct guest_info * info, 
 						     addr_t fault_addr, 
-						     pf_error_t error_code) {
+						     pf_error_t error_code,
+						     addr_t *actual_start, addr_t *actual_end) {
     pdpe32pae_t * pdpe = NULL;
     pde32pae_t * pde = NULL;
     pte32pae_t * pte = NULL;
@@ -39,6 +41,7 @@ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info,
     int pdpe_index = PDPE32PAE_INDEX(fault_addr);
     int pde_index = PDE32PAE_INDEX(fault_addr);
     int pte_index = PTE32PAE_INDEX(fault_addr);
+    
 
     struct v3_mem_region * region =  v3_get_mem_region(info->vm_info, info->vcpu_id, fault_addr);
   
@@ -48,29 +51,35 @@ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info,
 	return -1;
     }
 
+    PrintDebug(info->vm_info, info, "Direct Paging 32PAE page fault handler=%p\n", (void *)fault_addr);
+
     // Lookup the correct PDPE address based on the PAGING MODE
     if (info->shdw_pg_mode == SHADOW_PAGING) {
 	pdpe = CR3_TO_PDPE32PAE_VA(info->ctrl_regs.cr3);
     } else {
 	pdpe = CR3_TO_PDPE32PAE_VA(info->direct_map_pt);
     }
-
+ 
+    PrintDebug(info->vm_info, info, "Top level pdpe error pdp address=%p\n", (void *)pdpe);
     // Fix up the PDPE entry
     if (pdpe[pdpe_index].present == 0) {
-	pde = (pde32pae_t *)create_generic_pt_page();
-   
+	pde = (pde32pae_t *)create_generic_pt_page(info);
+        PrintDebug(info->vm_info, info, "Creating a new pd page=%p\n", (void *)pde);
 	pdpe[pdpe_index].present = 1;
 	// Set default PDPE Flags...
 	pdpe[pdpe_index].pd_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pde));    
     } else {
 	pde = V3_VAddr((void*)BASE_TO_PAGE_ADDR(pdpe[pdpe_index].pd_base_addr));
     }
+    PrintDebug(info->vm_info, info, "Handling pde error pd base address =%p\n", (void *)pde);
 
+    *actual_start = BASE_TO_PAGE_ADDR_4KB(PAGE_BASE_ADDR_4KB(fault_addr));
+    *actual_end = BASE_TO_PAGE_ADDR_4KB(PAGE_BASE_ADDR_4KB(fault_addr)+1)-1;
 
     // Fix up the PDE entry
     if (pde[pde_index].present == 0) {
-	pte = (pte32pae_t *)create_generic_pt_page();
-
+	pte = (pte32pae_t *)create_generic_pt_page(info);
+        PrintDebug(info->vm_info, info, "Creating a new pt page=%p\n", (void *)pte);
 	pde[pde_index].present = 1;
 	pde[pde_index].writable = 1;
 	pde[pde_index].user_page = 1;
@@ -80,6 +89,8 @@ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info,
 	pte = V3_VAddr((void*)BASE_TO_PAGE_ADDR(pde[pde_index].pt_base_addr));
     }
 
+    PrintDebug(info->vm_info, info, "Handling pte error pt base address=%p\n", (void *)pte);
+
 
     // Fix up the PTE entry
     if (pte[pte_index].present == 0) {
@@ -102,12 +113,16 @@ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info,
 	    }
 
 	    pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr);
+            PrintDebug(info->vm_info, info, "PTE mapped to =%p\n", (void *)host_addr);
+            PrintDebug(info->vm_info, info, "PTE is =%llx\n", *(uint64_t *)&(pte[pte_index]));
 	} else {
 	    return region->unhandled(info, fault_addr, fault_addr, region, error_code);
 	}
     } else {
 	return region->unhandled(info, fault_addr, fault_addr, region, error_code);
     }
+   
+    PrintDebug(info->vm_info, info, "Handler ends with fault address=%p\n", (void *)fault_addr);
 
     return 0;
 }
@@ -167,15 +182,23 @@ static inline int invalidate_addr_32pae_internal(struct guest_info * info, addr_
 
 
 
-static inline int invalidate_addr_32pae(struct guest_info * core, addr_t inv_addr)
+static inline int invalidate_addr_32pae(struct guest_info * core, addr_t inv_addr,
+					addr_t *actual_start, addr_t *actual_end)
 {
-  addr_t start;
   uint64_t len;
+  int rc;
   
-  return invalidate_addr_32pae_internal(core,inv_addr,&start,&len);
+  rc = invalidate_addr_32pae_internal(core,inv_addr,actual_start,&len);
+
+  *actual_end = *actual_start + len - 1;
+
+  return rc;
+    
+
 }
    
-static inline int invalidate_addr_32pae_range(struct guest_info * core, addr_t inv_addr_start, addr_t inv_addr_end)
+static inline int invalidate_addr_32pae_range(struct guest_info * core, addr_t inv_addr_start, addr_t inv_addr_end,
+					      addr_t *actual_start, addr_t *actual_end)
 {
   addr_t next;
   addr_t start;
@@ -184,11 +207,18 @@ static inline int invalidate_addr_32pae_range(struct guest_info * core, addr_t i
   
   for (next=inv_addr_start; next<=inv_addr_end; ) {
     rc = invalidate_addr_32pae_internal(core,next,&start, &len);
+    if (next==inv_addr_start) { 
+      // first iteration, capture where we start invalidating
+      *actual_start = start;
+    }
     if (rc) { 
       return rc;
     }
     next = start + len;
+    *actual_end = next;
   }
+  // last iteration, actual_end is off by one
+  (*actual_end)--;
   return 0;
 }