X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_32.h;h=9d3a5c94f0b74785c5c3cd618d9da96667137f9c;hb=9feccf93cd8327d1d30a404a92f19716bf5a1e96;hp=7f9ed8442a1460fc2940f112cd2c4459cdb52218;hpb=acaadd79c597c8d5180fbfbec79c01fef3dff003;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging_32.h b/palacios/src/palacios/vmm_direct_paging_32.h
index 7f9ed84..9d3a5c9 100644
--- a/palacios/src/palacios/vmm_direct_paging_32.h
+++ b/palacios/src/palacios/vmm_direct_paging_32.h
@@ -57,7 +57,7 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
 
     // Fix up the PDE entry
     if (pde[pde_index].present == 0) {
-	pte = (pte32_t *)create_generic_pt_page();
+	pte = (pte32_t *)create_generic_pt_page(info);
 	
 	pde[pde_index].present = 1;
 	pde[pde_index].writable = 1;
@@ -106,7 +106,8 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
 
 
 
-static inline int invalidate_addr_32(struct guest_info * info, addr_t inv_addr) {
+static inline int invalidate_addr_32_internal(struct guest_info * info, addr_t inv_addr,
+					      addr_t *actual_start, uint64_t *actual_size) {
     pde32_t * pde = NULL;
     pte32_t * pte = NULL;
 
@@ -126,11 +127,15 @@ static inline int invalidate_addr_32(struct guest_info * info, addr_t inv_addr)
     }    
 
     if (pde[pde_index].present == 0) {
+        *actual_start = BASE_TO_PAGE_ADDR_4MB(PAGE_BASE_ADDR_4MB(inv_addr));
+        *actual_size = PAGE_SIZE_4MB;
 	return 0;
     } else if (pde[pde_index].large_page) {
 	pde[pde_index].present = 0;
 	pde[pde_index].writable = 0;
 	pde[pde_index].user_page = 0;
+        *actual_start = BASE_TO_PAGE_ADDR_4MB(PAGE_BASE_ADDR_4MB(inv_addr));
+        *actual_size = PAGE_SIZE_4MB;
 	return 0;
     }
 
@@ -140,8 +145,38 @@ static inline int invalidate_addr_32(struct guest_info * info, addr_t inv_addr)
     pte[pte_index].writable = 0;
     pte[pte_index].user_page = 0;
 
+    *actual_start = BASE_TO_PAGE_ADDR_4KB(PAGE_BASE_ADDR_4KB(inv_addr));
+    *actual_size = PAGE_SIZE_4KB;
+
     return 0;
 }
 
 
+static inline int invalidate_addr_32(struct guest_info * core, addr_t inv_addr)
+{
+  addr_t start;
+  uint64_t len;
+  
+  return invalidate_addr_32_internal(core,inv_addr,&start,&len);
+}
+   
+static inline int invalidate_addr_32_range(struct guest_info * core, addr_t inv_addr_start, addr_t inv_addr_end)
+{
+  addr_t next;
+  addr_t start;
+  uint64_t len;
+  int rc;
+  
+  for (next=inv_addr_start; next<=inv_addr_end; ) {
+    rc = invalidate_addr_32_internal(core,next,&start, &len);
+    if (rc) { 
+      return rc;
+    }
+    next = start + len;
+  }
+  return 0;
+}
+
+
+
 #endif