Refactoring and additions to direct paging (nested and passthrough)

[palacios.git] / palacios / src / palacios / vmm_direct_paging_32.h

diff --git a/palacios/src/palacios/vmm_direct_paging_32.h b/palacios/src/palacios/vmm_direct_paging_32.h
index ac6f054..435c3b0 100644 (file)
--- a/palacios/src/palacios/vmm_direct_paging_32.h
+++ b/palacios/src/palacios/vmm_direct_paging_32.h
@@ -26,11 +26,16 @@
 #include <palacios/vmm.h>
 #include <palacios/vm_guest_mem.h>
 #include <palacios/vm_guest.h>
+#include <palacios/vmm_ctrl_regs.h>
 
 
+/* This always build 2 level page tables - no large pages are used */
+
 static inline int handle_passthrough_pagefault_32(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) {
+
     // Check to see if pde and pte exist (create them if not)
     pde32_t * pde = NULL;
     pte32_t * pte = NULL;
@@ -42,7 +47,7 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
     struct v3_mem_region * region = v3_get_mem_region(info->vm_info, info->vcpu_id, fault_addr);
 
     if (region == NULL) {
-       PrintError("Invalid region in passthrough page fault 32, addr=%p\n", 
+        PrintError(info->vm_info, info, "Invalid region in passthrough page fault 32, addr=%p\n", 
                   (void *)fault_addr);
        return -1;
     }
@@ -55,9 +60,12 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
     }
 
 
+    *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 = (pte32_t *)create_generic_pt_page();
+       pte = (pte32_t *)create_generic_pt_page(info);
        
        pde[pde_index].present = 1;
        pde[pde_index].writable = 1;
@@ -86,7 +94,7 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
            }
 
            if (v3_gpa_to_hpa(info, fault_addr, &host_addr) == -1) {
-               PrintError("Could not translate fault address (%p)\n", (void *)fault_addr);
+               PrintError(info->vm_info, info, "Could not translate fault address (%p)\n", (void *)fault_addr);
                return -1;
            }
            
@@ -106,7 +114,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 +135,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 +153,51 @@ 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 *actual_start, addr_t *actual_end)
+{
+  uint64_t len;
+  int rc;
+
+  rc = invalidate_addr_32_internal(core,inv_addr,actual_start,&len);
+
+  *actual_end = *actual_start + len - 1;
+
+  return rc;
+}
+   
+static inline int invalidate_addr_32_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;
+  uint64_t len;
+  int rc;
+  
+  for (next=inv_addr_start; next<=inv_addr_end; ) {
+    rc = invalidate_addr_32_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;
+}
+
+
+
 #endif