X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_paging.c;h=85c8d9e4461bd5f55c908b0597c32a485a95b1a9;hb=3a47eb153e415d718e5d5601b79767b7335a149f;hp=a5ef2dfe9aa1d6fd6cae078db798db0e7dd18778;hpb=9526410ca7474542623aa2e74b2ce001dd7ec55e;p=palacios.git

diff --git a/palacios/src/palacios/vmm_paging.c b/palacios/src/palacios/vmm_paging.c
index a5ef2df..85c8d9e 100644
--- a/palacios/src/palacios/vmm_paging.c
+++ b/palacios/src/palacios/vmm_paging.c
@@ -46,6 +46,11 @@ static pt_entry_type_t pte64_lookup(pte64_t * pt, addr_t addr, addr_t * entry);
 
 
 
+#ifndef DEBUG_SHADOW_PAGING
+#undef PrintDebug
+#define PrintDebug(fmt, args...)
+#endif
+
 
 
 void delete_page_tables_32(pde32_t * pde) {
@@ -639,7 +644,7 @@ pt_access_status_t inline v3_can_access_pdpe64(pdpe64_t * pdpe, addr_t addr, pf_
 }
 
 pt_access_status_t inline v3_can_access_pde64(pde64_t * pde, addr_t addr, pf_error_t access_type) {
-  gen_pt_t * entry = (gen_pt_t *)&pde[PDE32_INDEX(addr)];
+  gen_pt_t * entry = (gen_pt_t *)&pde[PDE64_INDEX(addr)];
   return can_access_pt_entry(entry, access_type);
 }
 
@@ -664,7 +669,6 @@ pt_access_status_t inline v3_can_access_pte64(pte64_t * pte, addr_t addr, pf_err
 pde32_t * create_passthrough_pts_32(struct guest_info * guest_info) {
   addr_t current_page_addr = 0;
   int i, j;
-  struct shadow_map * map = &(guest_info->mem_map);
 
   pde32_t * pde = V3_VAddr(V3_AllocPages(1));
 
@@ -674,14 +678,10 @@ pde32_t * create_passthrough_pts_32(struct guest_info * guest_info) {
     
 
     for (j = 0; j < MAX_PTE32_ENTRIES; j++) {
-      struct shadow_region * region = get_shadow_region_by_addr(map, current_page_addr);
+      struct v3_shadow_region * region =  v3_get_shadow_region(guest_info, current_page_addr);
 
       if (!region || 
-	  (region->host_type == HOST_REGION_HOOK) || 
-	  (region->host_type == HOST_REGION_UNALLOCATED) || 
-	  (region->host_type == HOST_REGION_MEMORY_MAPPED_DEVICE) || 
-	  (region->host_type == HOST_REGION_REMOTE) ||
-	  (region->host_type == HOST_REGION_SWAPPED)) {
+	  (region->host_type == SHDW_REGION_FULL_HOOK)) {
 	pte[j].present = 0;
 	pte[j].writable = 0;
 	pte[j].user_page = 0;
@@ -696,7 +696,14 @@ pde32_t * create_passthrough_pts_32(struct guest_info * guest_info) {
       } else {
 	addr_t host_addr;
 	pte[j].present = 1;
-	pte[j].writable = 1;
+
+	if (region->host_type == SHDW_REGION_WRITE_HOOK) {
+	  pte[j].writable = 0;
+	  PrintDebug("Marking Write hook host_addr %p as RO\n", (void *)current_page_addr);
+	} else {
+	  pte[j].writable = 1;
+	}
+	  
 	pte[j].user_page = 1;
 	pte[j].write_through = 0;
 	pte[j].cache_disable = 0;
@@ -761,7 +768,6 @@ pde32_t * create_passthrough_pts_32(struct guest_info * guest_info) {
 pdpe32pae_t * create_passthrough_pts_32PAE(struct guest_info * guest_info) {
   addr_t current_page_addr = 0;
   int i, j, k;
-  struct shadow_map * map = &(guest_info->mem_map);
 
   pdpe32pae_t * pdpe = V3_VAddr(V3_AllocPages(1));
   memset(pdpe, 0, PAGE_SIZE);
@@ -778,14 +784,10 @@ pdpe32pae_t * create_passthrough_pts_32PAE(struct guest_info * guest_info) {
       
       
       for (k = 0; k < MAX_PTE32PAE_ENTRIES; k++) {
-	struct shadow_region * region = get_shadow_region_by_addr(map, current_page_addr);
+	struct v3_shadow_region * region = v3_get_shadow_region(guest_info, current_page_addr);
 	
 	if (!region || 
-	    (region->host_type == HOST_REGION_HOOK) || 
-	    (region->host_type == HOST_REGION_UNALLOCATED) || 
-	    (region->host_type == HOST_REGION_MEMORY_MAPPED_DEVICE) || 
-	    (region->host_type == HOST_REGION_REMOTE) ||
-	    (region->host_type == HOST_REGION_SWAPPED)) {
+	    (region->host_type == SHDW_REGION_FULL_HOOK)) {
 	  pte[k].present = 0;
 	  pte[k].writable = 0;
 	  pte[k].user_page = 0;
@@ -801,7 +803,13 @@ pdpe32pae_t * create_passthrough_pts_32PAE(struct guest_info * guest_info) {
 	} else {
 	  addr_t host_addr;
 	  pte[k].present = 1;
-	  pte[k].writable = 1;
+	
+	  if (region->host_type == SHDW_REGION_WRITE_HOOK) {
+	    pte[k].writable = 0;
+	  } else {
+	    pte[k].writable = 1;
+	  }
+
 	  pte[k].user_page = 1;
 	  pte[k].write_through = 0;
 	  pte[k].cache_disable = 0;
@@ -900,7 +908,6 @@ pdpe32pae_t * create_passthrough_pts_32PAE(struct guest_info * guest_info) {
 pml4e64_t * create_passthrough_pts_64(struct guest_info * info) {
   addr_t current_page_addr = 0;
   int i, j, k, m;
-  struct shadow_map * map = &(info->mem_map);
   
   pml4e64_t * pml = V3_VAddr(V3_AllocPages(1));
 
@@ -918,16 +925,12 @@ pml4e64_t * create_passthrough_pts_64(struct guest_info * info) {
 
 
 	for (m = 0; m < MAX_PTE64_ENTRIES; m++) {
-	  struct shadow_region * region = get_shadow_region_by_addr(map, current_page_addr);
+	  struct v3_shadow_region * region = v3_get_shadow_region(info, current_page_addr);
 	  
 
 	  
 	  if (!region || 
-	      (region->host_type == HOST_REGION_HOOK) || 
-	      (region->host_type == HOST_REGION_UNALLOCATED) || 
-	      (region->host_type == HOST_REGION_MEMORY_MAPPED_DEVICE) || 
-	      (region->host_type == HOST_REGION_REMOTE) ||
-	      (region->host_type == HOST_REGION_SWAPPED)) {
+	      (region->host_type == SHDW_REGION_FULL_HOOK)) {
 	    pte[m].present = 0;
 	    pte[m].writable = 0;
 	    pte[m].user_page = 0;
@@ -942,7 +945,13 @@ pml4e64_t * create_passthrough_pts_64(struct guest_info * info) {
 	  } else {
 	    addr_t host_addr;
 	    pte[m].present = 1;
-	    pte[m].writable = 1;
+
+	    if (region->host_type == SHDW_REGION_WRITE_HOOK) {
+	      pte[m].writable = 0;
+	    } else {
+	      pte[m].writable = 1;
+	    }
+	
 	    pte[m].user_page = 1;
 	    pte[m].write_through = 0;
 	    pte[m].cache_disable = 0;