X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_shadow_paging_32.h;h=e3367c2258f2bf3ccfe7affb7667dc7898fff945;hb=19c179d8c8a23c2612f9c12ec7cbedc299ce80e5;hp=2760400bb37845c830beacb0d82d5e5f47601764;hpb=6fe9fe338ec19b212b43bb2c25322dce3cdbb490;p=palacios.git

diff --git a/palacios/src/palacios/vmm_shadow_paging_32.h b/palacios/src/palacios/vmm_shadow_paging_32.h
index 2760400..e3367c2 100644
--- a/palacios/src/palacios/vmm_shadow_paging_32.h
+++ b/palacios/src/palacios/vmm_shadow_paging_32.h
@@ -85,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;
@@ -228,46 +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)) {
-	    PrintError("Page fault on swapped out page (pte=%x)\n", *(uint32_t *)guest_pte);
-
- 	    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;
-		}
+#ifdef CONFIG_SYMBIOTIC_SWAP_TELEMETRY
+	    if (error_code.write == 0) {
+		info->swap_state.read_faults++;
 	    } else {
-		/* 
-		 *  Setup shadow paging state
-		 */
+		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);
 		
-		/* We need some way to check permissions.... */
-
-		shadow_pte->accessed = 1;
-		shadow_pte->writable = 1;
-		shadow_pte->write_through = 0;
-		shadow_pte->cache_disable = 0;
-		shadow_pte->global_page = 0;
-		shadow_pte->user_page = 1;
-		shadow_pte->present = 1;
+		addr_t swp_pg_addr = v3_get_swapped_pg_addr(info, shadow_pte, guest_pte);
 		
-		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;
+		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;
 	    }
 	}
-#else
+#endif
+	
+
 	if (inject_guest_pf(info, fault_addr, error_code) == -1) {
 	    PrintError("Could not inject guest page fault\n");
 	    return -1;
-	}
-#endif
+	}	
 
 	return 0; 
     }