From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Fri, 14 May 2010 23:36:53 +0000 (-0500)
Subject: moved direct paging implementation over to new memory region flags structure
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=fd9690bf0f032246f2d2c596e2467cccc45faff6;p=palacios.git

moved direct paging implementation over to new memory region flags structure
---

diff --git a/palacios/src/palacios/vmm_direct_paging_32.h b/palacios/src/palacios/vmm_direct_paging_32.h
index e7e4a5a..047f2a6 100644
--- a/palacios/src/palacios/vmm_direct_paging_32.h
+++ b/palacios/src/palacios/vmm_direct_paging_32.h
@@ -75,34 +75,26 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
 	
 	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
-	    PrintDebug("Faulted in a write hook page\n");
+	if ((region->flags.alloced == 1) && 
+	    (region->flags.read == 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;
+	    }
 	    
 	    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_hook(info, fault_addr, fault_addr, region, error_code);
-	} else {
-	    PrintError("Unknown Region Type...\n");
-	    return -1;
 	}
     }
-    
-    if ( (region->host_type == SHDW_REGION_WRITE_HOOK) && 
-	 (error_code.write == 1) ) {
-	PrintDebug("Triggering Direct paging Write hook\n");
-	return v3_handle_mem_hook(info, fault_addr, fault_addr, region, error_code);
-    }
 
+    if (region->flags.hook == 1) {
+	if ((error_code.write == 1) || (region->flags.read == 0))  {
+	    return v3_handle_mem_hook(info, fault_addr, fault_addr, region, error_code);	    
+	}
+    }
     
     return 0;
 }
diff --git a/palacios/src/palacios/vmm_direct_paging_32pae.h b/palacios/src/palacios/vmm_direct_paging_32pae.h
index 7ce823f..0c3381a 100644
--- a/palacios/src/palacios/vmm_direct_paging_32pae.h
+++ b/palacios/src/palacios/vmm_direct_paging_32pae.h
@@ -87,33 +87,25 @@ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info,
     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;
+	if ((region->flags.alloced == 1) && 
+	    (region->flags.read == 1)) {
 
-	    pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr);
+	    pte[pte_index].present = 1;
 
-	} else if (region->host_type == SHDW_REGION_WRITE_HOOK) {
-	    // Only trap writes
-	    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;
+	    }
 
 	    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_hook(info, fault_addr, fault_addr, region, error_code);
-
-	} else {
-	    PrintError("Unknown Region Type...\n");
-	    return -1;
 	}
     }
    
-    if ( (region->host_type == SHDW_REGION_WRITE_HOOK) && 
-	 (error_code.write == 1) ) {
-	return v3_handle_mem_hook(info, fault_addr, fault_addr, region, error_code);
+    if (region->flags.hook == 1) {
+	if ((error_code.write == 1) || (region->flags.read == 0)) {
+	    return v3_handle_mem_hook(info, fault_addr, fault_addr, region, error_code);
+	}
     }
 
     return 0;
diff --git a/palacios/src/palacios/vmm_direct_paging_64.h b/palacios/src/palacios/vmm_direct_paging_64.h
index 907a99a..96b8f21 100644
--- a/palacios/src/palacios/vmm_direct_paging_64.h
+++ b/palacios/src/palacios/vmm_direct_paging_64.h
@@ -30,8 +30,8 @@
 
 
 static inline int handle_passthrough_pagefault_64(struct guest_info * info, 
-						     addr_t fault_addr, 
-						     pf_error_t error_code) {
+						  addr_t fault_addr, 
+						  pf_error_t error_code) {
     pml4e64_t * pml = NULL;
     pdpe64_t * pdpe = NULL;
     pde64_t * pde = NULL;
@@ -111,33 +111,25 @@ static inline int handle_passthrough_pagefault_64(struct guest_info * info,
     if (pte[pte_index].present == 0) {
 	pte[pte_index].user_page = 1;
 	
-	if (region->host_type == SHDW_REGION_ALLOCATED) {
+	if ((region->flags.alloced == 1) && 
+	    (region->flags.read == 1)) {
 	    // 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
-	    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;
+	    }
 
 	    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_hook(info, fault_addr, fault_addr, region, error_code);
-
-	} else {
-	    PrintError("Unknown Region Type...\n");
-	    return -1;
 	}
     }
    
-    if ( (region->host_type == SHDW_REGION_WRITE_HOOK) && 
-	 (error_code.write == 1) ) {
-	return v3_handle_mem_hook(info, fault_addr, fault_addr, region, error_code);
+    if (region->flags.hook == 1) {
+	if ((error_code.write == 1) || (region->flags.read == 0)) {
+	    return v3_handle_mem_hook(info, fault_addr, fault_addr, region, error_code);
+	}
     }
 
     return 0;