X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_32.h;h=c71baf03153826aa4312a7543c3c18352dbab822;hb=19c179d8c8a23c2612f9c12ec7cbedc299ce80e5;hp=42da5b14ac7df88ede0e7ac6a0bf92ef2d2cdb90;hpb=058a3adde5893927ae056a1d8fbccd5191d2446f;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging_32.h b/palacios/src/palacios/vmm_direct_paging_32.h
index 42da5b1..c71baf0 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__
 
@@ -41,7 +40,7 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
     int pte_index = PTE32_INDEX(fault_addr);
     
     struct v3_shadow_region * region = v3_get_shadow_region(info, fault_addr);
-    
+
     if (region == NULL) {
 	PrintError("Invalid region in passthrough page fault 32, addr=%p\n", 
 		   (void *)fault_addr);
@@ -64,7 +63,7 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
 	
 	pde[pde_index].present = 1;
 	pde[pde_index].writable = 1;
-	pde[pde_index].user_page = 1;
+	pde[pde_index].user_page = 0;
 	pde[pde_index].pt_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pte));
 	
     } else {
@@ -74,7 +73,7 @@ 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;
+	pte[pte_index].user_page = 0;
 	
 	if (region->host_type == SHDW_REGION_ALLOCATED) {
 	    // Full access
@@ -84,6 +83,7 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
 	    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");
 	    pte[pte_index].present = 1;
 	    pte[pte_index].writable = 0;
 	    
@@ -99,6 +99,7 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
     
     if ( (region->host_type == SHDW_REGION_WRITE_HOOK) && 
 	 (error_code.write == 1) ) {
+	PrintDebug("Triggering Direct paging Write hook\n");
 	return v3_handle_mem_wr_hook(info, fault_addr, fault_addr, region, error_code);
     }
 
@@ -107,4 +108,40 @@ static inline int handle_passthrough_pagefault_32(struct guest_info * info,
 }
 
 
+
+
+static inline int invalidate_addr_32(struct guest_info * info, addr_t inv_addr) {
+    pde32_t * pde = NULL;
+    pte32_t * pte = NULL;
+
+    // TODO:
+    // Call INVLPGA
+
+    // clear the page table entry
+    int pde_index = PDE32_INDEX(inv_addr);
+    int pte_index = PTE32_INDEX(inv_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);
+    } else {
+	pde = CR3_TO_PDE32_VA(info->direct_map_pt);
+    }    
+
+    if (pde[pde_index].present == 0) {
+	return 0;
+    } else if (pde[pde_index].large_page) {
+	pde[pde_index].present = 0;
+	return 0;
+    }
+
+    pte = V3_VAddr((void*)BASE_TO_PAGE_ADDR(pde[pde_index].pt_base_addr));
+
+    pte[pte_index].present = 0;
+
+    return 0;
+}
+
+
 #endif