X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_32.h;h=ac6f054587c15777e8d671a0c55ca7d830337d6b;hb=0e26b3738daf436ba2d9a088ba620a3583d40de3;hp=c15712bb2d756b95a3a738a0699cf45df67e4d29;hpb=b06d0d0e5e57f5c4163a69efcabe6f96594ad814;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging_32.h b/palacios/src/palacios/vmm_direct_paging_32.h
index c15712b..ac6f054 100644
--- a/palacios/src/palacios/vmm_direct_paging_32.h
+++ b/palacios/src/palacios/vmm_direct_paging_32.h
@@ -18,7 +18,6 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-
 #ifndef __VMM_DIRECT_PAGING_32_H__
 #define __VMM_DIRECT_PAGING_32_H__
 
@@ -40,16 +39,14 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
     int pde_index = PDE32_INDEX(fault_addr);
     int pte_index = PTE32_INDEX(fault_addr);
     
-    struct v3_shadow_region * region = v3_get_shadow_region(info, fault_addr);
-    
+    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", 
 		   (void *)fault_addr);
 	return -1;
     }
     
-    host_addr = v3_get_shadow_addr(region, fault_addr);
-    
     // Lookup the correct PDE address based on the PAGING MODE
     if (info->shdw_pg_mode == SHADOW_PAGING) {
 	pde = CR3_TO_PDE32_VA(info->ctrl_regs.cr3);
@@ -74,35 +71,35 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
     // Fix up the PTE entry
     if (pte[pte_index].present == 0) {
 	
-	pte[pte_index].user_page = 1;
 	
-	if (region->host_type == SHDW_REGION_ALLOCATED) {
-	    // Full access
-	    pte[pte_index].present = 1;
-	    pte[pte_index].writable = 1;
-	    
-	    pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr);
-	} else if (region->host_type == SHDW_REGION_WRITE_HOOK) {
-	    // Only trap writes
+	if ((region->flags.alloced == 1) && 
+	    (region->flags.read == 1)) {
+
+	    pte[pte_index].user_page = 1;
+
 	    pte[pte_index].present = 1;
-	    pte[pte_index].writable = 0;
+
+	    if (region->flags.write == 1) {
+		pte[pte_index].writable = 1;
+	    } else {
+		pte[pte_index].writable = 0;
+	    }
+
+    	    if (v3_gpa_to_hpa(info, fault_addr, &host_addr) == -1) {
+		PrintError("Could not translate fault address (%p)\n", (void *)fault_addr);
+		return -1;
+    	    }
 	    
 	    pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr);
-	} else if (region->host_type == SHDW_REGION_FULL_HOOK) {
-	    // trap all accesses
-	    return v3_handle_mem_full_hook(info, fault_addr, fault_addr, region, error_code);
 	} else {
-	    PrintError("Unknown Region Type...\n");
-	    return -1;
+	    return region->unhandled(info, fault_addr, fault_addr, region, error_code);
 	}
-    }
-    
-    if ( (region->host_type == SHDW_REGION_WRITE_HOOK) && 
-	 (error_code.write == 1) ) {
-	return v3_handle_mem_wr_hook(info, fault_addr, fault_addr, region, error_code);
+    } else {
+	// We fix all permissions on the first pass, 
+	// so we only get here if its an unhandled exception
+	return region->unhandled(info, fault_addr, fault_addr, region, error_code);	    
     }
 
-    
     return 0;
 }
 
@@ -132,12 +129,16 @@ static inline int invalidate_addr_32(struct guest_info * info, addr_t inv_addr)
 	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;
 	return 0;
     }
 
     pte = V3_VAddr((void*)BASE_TO_PAGE_ADDR(pde[pde_index].pt_base_addr));
 
     pte[pte_index].present = 0;
+    pte[pte_index].writable = 0;
+    pte[pte_index].user_page = 0;
 
     return 0;
 }