added user page bits to enable write hook faulting

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

diff --git a/palacios/src/palacios/vmm_shadow_paging_32.h b/palacios/src/palacios/vmm_shadow_paging_32.h
index bc83a7c..e3367c2 100644 (file)
--- a/palacios/src/palacios/vmm_shadow_paging_32.h
+++ b/palacios/src/palacios/vmm_shadow_paging_32.h
@@ -33,9 +33,16 @@ static inline int activate_shadow_pt_32(struct guest_info * info) {
     shadow_cr3->pwt = guest_cr3->pwt;
     shadow_cr3->pcd = guest_cr3->pcd;
   
+#ifdef CONFIG_SYMBIOTIC_SWAP
+    v3_swap_flush(info);
+#endif
+
     return 0;
 }
 
+
+
+
 /* 
  * *
  * * 
@@ -78,8 +85,8 @@ static inline int handle_shadow_pagefault_32(struct guest_info * info, addr_t fa
   
     /* Was the page fault caused by the Guest's page tables? */
     if (is_guest_pf(guest_pde_access, shadow_pde_access) == 1) {
-       PrintDebug("Injecting PDE pf to guest: (guest access error=%d) (pf error code=%d)\n", 
-                  *(uint_t *)&guest_pde_access, *(uint_t *)&error_code);
+       PrintDebug("Injecting PDE pf to guest: (guest access error=%d) (shdw access error=%d)  (pf error code=%d)\n", 
+                  *(uint_t *)&guest_pde_access, *(uint_t *)&shadow_pde_access, *(uint_t *)&error_code);
        if (inject_guest_pf(info, fault_addr, error_code) == -1) {
            PrintError("Could not inject guest page fault\n");
            return -1;
@@ -221,11 +228,63 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
 
        PrintDebug("Access error injecting pf to guest (guest access error=%d) (pf error code=%d)\n", 
                   guest_pte_access, *(uint_t*)&error_code);
+       
+#ifdef CONFIG_SYMBIOTIC_SWAP
+       if (is_swapped_pte32(guest_pte)) {
+
+#ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
+           if (error_code.write == 0) {
+               info->swap_state.read_faults++;
+           } else {
+               info->swap_state.write_faults++;
+           }
+#endif
+           if (error_code.write == 0) {
+               V3_Print("Page fault on swapped out page (vaddr=%p) (pte=%x) (error_code=%x)\n", 
+                        (void *)fault_addr, *(uint32_t *)guest_pte, *(uint32_t *)&error_code);
+               
+               addr_t swp_pg_addr = v3_get_swapped_pg_addr(info, shadow_pte, guest_pte);
+               
+               if (swp_pg_addr == 0) {
+                   if (inject_guest_pf(info, fault_addr, error_code) == -1) {
+                       PrintError("Could not inject guest page fault\n");
+                       return -1;
+                   }
+               } else {
+                   /* 
+                    *  Setup shadow paging state
+                    */
+                   
+                   /* We need some way to check permissions.... */
+                   
+                   shadow_pte->accessed = 1;
+                   shadow_pte->writable = 0;
+                   
+                   if ((fault_addr & 0xc0000000) == 0xc0000000) {
+                       shadow_pte->user_page = 0;
+                   } else {
+                       shadow_pte->user_page = 1;
+                   }
+                   
+                   shadow_pte->write_through = 0;
+                   shadow_pte->cache_disable = 0;
+                   shadow_pte->global_page = 0;
+                   
+                   shadow_pte->present = 1;
+                   
+                   shadow_pte->page_base_addr = swp_pg_addr;
+               }
+               
+               return 0;
+           }
+       }
+#endif
+       
 
        if (inject_guest_pf(info, fault_addr, error_code) == -1) {
            PrintError("Could not inject guest page fault\n");
            return -1;
-       }
+       }       
 
        return 0; 
     }