X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_shadow_paging_32.h;h=9febd7c209e8303befafc688647a518dd9b41e7e;hb=4290e5f20a4ea5e5f32cb8228ac4d7446dc1021b;hp=4614232fcf17fd0bc452b7639b8ee09fea510a98;hpb=7c9087090f06a3fdf041f650912c36b6b12d7a82;p=palacios.git

diff --git a/palacios/src/palacios/vmm_shadow_paging_32.h b/palacios/src/palacios/vmm_shadow_paging_32.h
index 4614232..9febd7c 100644
--- a/palacios/src/palacios/vmm_shadow_paging_32.h
+++ b/palacios/src/palacios/vmm_shadow_paging_32.h
@@ -33,6 +33,10 @@ 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;
 }
 
@@ -81,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;
@@ -192,7 +196,15 @@ static inline int handle_shadow_pagefault_32(struct guest_info * info, addr_t fa
     return 0;
 }
 
+#ifdef CONFIG_SYMBIOTIC_SWAP
+
+static int sym_swap_callback(struct guest_info * info) {
+
+    return 0;
+}
+
 
+#endif
 
 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) {
@@ -224,26 +236,67 @@ 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);
 
-	    if (inject_guest_pf(info, fault_addr, error_code) == -1) {
-		PrintError("Could not inject guest page fault\n");
-		return -1;
-	    }
-	} else {
-	    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 {
+		info->swap_state.write_faults++;
 	    }
+#endif
+
+	    // This will trigger a callback...
+	    v3_sym_get_addr_info(info, fault_addr, sym_swap_callback);
+
+	    return 0;
+
+	    /*
+	      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 {
+
+		    
+	      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; 
     }