Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


lots of fixes
[palacios.git] / palacios / src / palacios / vmm_shadow_paging_32.h
index 03e1f7a..fc2df95 100644 (file)
@@ -85,10 +85,10 @@ 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");
+           PrintError("Could not inject guest page fault for vaddr %p\n", (void *)fault_addr);
            return -1;
        }
        return 0;
@@ -104,7 +104,7 @@ static inline int handle_shadow_pagefault_32(struct guest_info * info, addr_t fa
                   shadow_pde_access, guest_pde_access);
        
        if (inject_guest_pf(info, fault_addr, error_code) == -1) {
-           PrintError("Could not inject guest page fault\n");
+           PrintError("Could not inject guest page fault for vaddr %p\n", (void *)fault_addr);
            return -1;
        }
        return 0;
@@ -118,7 +118,7 @@ static inline int handle_shadow_pagefault_32(struct guest_info * info, addr_t fa
               (shadow_pde_access != PT_ACCESS_OK)) {
        // inject page fault in guest
        if (inject_guest_pf(info, fault_addr, error_code) == -1) {
-           PrintError("Could not inject guest page fault\n");
+           PrintError("Could not inject guest page fault for vaddr %p\n", (void *)fault_addr);
            return -1;
        }
        PrintDebug("Unknown Error occurred (shadow_pde_access=%d)\n", shadow_pde_access);
@@ -197,7 +197,6 @@ static inline int handle_shadow_pagefault_32(struct guest_info * info, addr_t fa
 }
 
 
-
 static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault_addr, pf_error_t error_code,
                                          pte32_t * shadow_pt, pte32_t * guest_pt) {
 
@@ -228,53 +227,100 @@ 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 ((error_code.write == 0) && (is_swapped_pte32(guest_pte))) {
-           PrintError("Page fault on swapped out page (pte=%x)\n", *(uint32_t *)guest_pte);
+       if (is_swapped_pte32(guest_pte)) {
 
-           addr_t swp_pg_addr = v3_get_swapped_pg_addr(info, shadow_pte, guest_pte);
+           pf_error_t swap_perms;
 
-           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;
-               }
+
+           /*
+           int sym_ret = v3_get_vaddr_perms(info, fault_addr, guest_pte, &swap_perms);
+           sym_ret = 0;
+           */
+           addr_t swp_pg_addr = 0;
+
+
+
+#ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
+           if (error_code.write == 0) {
+               info->swap_state.read_faults++;
            } else {
-               /* 
-                *  Setup shadow paging state
-                */
-               
-               /* We need some way to check permissions.... */
-               
-               shadow_pte->accessed = 1;
-               shadow_pte->writable = 0;
+               info->swap_state.write_faults++;
+           }
+#endif
+
 
-               if (fault_addr & 0xc0000000) {
-                   shadow_pte->user_page = 0;
-               } else {
-                   shadow_pte->user_page = 1;
+           swp_pg_addr = v3_get_swapped_pg_addr(info,  guest_pte);
+
+           if (swp_pg_addr != 0) {
+               PrintDebug("Swapped page address=%p\n", (void *)swp_pg_addr);
+
+               /*
+               if (info->cpl == 0) {
+                   PrintError("Swapped Page fault in kernel mode.... bad...\n");
+                   goto inject;
                }
+               */
 
-               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;
-           }
-       } else {
-           if (inject_guest_pf(info, fault_addr, error_code) == -1) {
-               PrintError("Could not inject guest page fault\n");
-               return -1;
+               int sym_ret = v3_get_vaddr_perms(info, fault_addr, guest_pte, &swap_perms);
+
+               if (sym_ret == -1) {
+                   PrintError("Symcall error...\n");
+                   return -1;
+               } else if (sym_ret == 0) {
+
+
+                   if (swap_perms.present == 0) {
+                       PrintError("Nonpresent swapped page\n");
+                   }
+                   
+                   // swap_perms.write ==1 || error_code.write == 0
+                   // swap_perms.user == 0 || error_code.user == 1
+                   
+                   // This checks for permissions violations that require a guest PF injection
+                   if ( (swap_perms.present == 1) && 
+                        ( (swap_perms.write == 1) || 
+                          (error_code.write == 0) ) &&
+                        ( (swap_perms.user == 1) || 
+                          (error_code.user == 0) ) ) {
+                       addr_t swp_pg_pa = 0;
+                       
+                       swp_pg_pa = v3_map_swp_page(info, shadow_pte, guest_pte, (void *)swp_pg_addr);
+
+                       PrintDebug("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);
+                       
+                       shadow_pte->writable = swap_perms.write;
+                       shadow_pte->user_page = swap_perms.user;
+                       
+                       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_pa;
+                       
+#ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
+                       info->swap_state.mapped_pages++;
+#endif
+                       //              PrintError("Swap fault handled\n");
+                       return 0;
+                   }
+               }
+           } else {
+               PrintDebug("Not a sym swappable page\n");
            }
+
        }
-#else
+#endif
+       //   inject:
+
        if (inject_guest_pf(info, fault_addr, error_code) == -1) {
-           PrintError("Could not inject guest page fault\n");
+           PrintError("Could not inject guest page fault for vaddr %p\n", (void *)fault_addr);
            return -1;
-       }
-#endif
+       }       
 
        return 0; 
     }
@@ -355,7 +401,7 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
     } else {
        // Inject page fault into the guest     
        if (inject_guest_pf(info, fault_addr, error_code) == -1) {
-           PrintError("Could not inject guest page fault\n");
+           PrintError("Could not inject guest page fault for vaddr %p\n", (void *)fault_addr);
            return -1;
        }