X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fmmu%2Fvmm_shdw_pg_swapbypass_32.h;h=1aee15a47d8626d953c7b7b63e1b2c4f35ac796f;hb=0a95faece166467bc0a308af196a82731de5f7dc;hp=1feb2e5bf80f9188b975f850382270b52062d92b;hpb=9959b08bfa0a2a0ee51866199c5b1d7b2b690237;p=palacios.git

diff --git a/palacios/src/palacios/mmu/vmm_shdw_pg_swapbypass_32.h b/palacios/src/palacios/mmu/vmm_shdw_pg_swapbypass_32.h
index 1feb2e5..1aee15a 100644
--- a/palacios/src/palacios/mmu/vmm_shdw_pg_swapbypass_32.h
+++ b/palacios/src/palacios/mmu/vmm_shdw_pg_swapbypass_32.h
@@ -68,7 +68,7 @@ static inline int handle_shadow_pagefault_32(struct guest_info * info, addr_t fa
     PrintDebug("Shadow page fault handler: %p\n", (void*) fault_addr );
     PrintDebug("Handling PDE32 Fault\n");
 
-    if (guest_pa_to_host_va(info, guest_cr3, (addr_t*)&guest_pd) == -1) {
+    if (v3_gpa_to_hva(info, guest_cr3, (addr_t*)&guest_pd) == -1) {
 	PrintError("Invalid Guest PDE Address: 0x%p\n",  (void *)guest_cr3);
 	return -1;
     } 
@@ -174,7 +174,7 @@ static inline int handle_shadow_pagefault_32(struct guest_info * info, addr_t fa
 
       
     if (guest_pde->large_page == 0) {
-	if (guest_pa_to_host_va(info, BASE_TO_PAGE_ADDR(guest_pde->pt_base_addr), (addr_t*)&guest_pt) == -1) {
+	if (v3_gpa_to_hva(info, BASE_TO_PAGE_ADDR(guest_pde->pt_base_addr), (addr_t*)&guest_pt) == -1) {
 	    // Machine check the guest
 	    PrintDebug("Invalid Guest PTE Address: 0x%p\n", (void *)BASE_TO_PAGE_ADDR(guest_pde->pt_base_addr));
 	    v3_raise_exception(info, MC_EXCEPTION);
@@ -205,7 +205,7 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
     pte32_t * shadow_pte = (pte32_t *)&(shadow_pt[PTE32_INDEX(fault_addr)]);
     addr_t guest_pa = BASE_TO_PAGE_ADDR((addr_t)(guest_pte->page_base_addr)) +  PAGE_OFFSET(fault_addr);
 
-    struct v3_shadow_region * shdw_reg =  v3_get_shadow_region(info->vm_info, info->cpu_id, guest_pa);
+    struct v3_mem_region * shdw_reg =  v3_get_mem_region(info->vm_info, info->cpu_id, guest_pa);
 
     if (shdw_reg == NULL) {
 	// Inject a machine check in the guest
@@ -338,9 +338,14 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
 	// Page Table Entry Not Present
 	PrintDebug("guest_pa =%p\n", (void *)guest_pa);
 
-	if ((shdw_reg->host_type == SHDW_REGION_ALLOCATED) ||
-	    (shdw_reg->host_type == SHDW_REGION_WRITE_HOOK)) {
-	    addr_t shadow_pa = v3_get_shadow_addr(shdw_reg, info->cpu_id, guest_pa);
+	if ((shdw_reg->flags.alloced == 1) ||
+	    (shdw_reg->flags.read == 1)) {
+	    addr_t shadow_pa = 0;
+
+	    if (v3_gpa_to_hpa(info, guest_pa, &shadow_pa) == -1) {
+		PrintError("could not translate page fault address (%p)\n", (void *)guest_pa);
+		return -1;
+	    }
       
 	    shadow_pte->page_base_addr = PAGE_BASE_ADDR(shadow_pa);
 
@@ -367,16 +372,14 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
 	    }
 
 
-
-	    // Write hooks trump all, and are set Read Only
-	    if (shdw_reg->host_type == SHDW_REGION_WRITE_HOOK) {
+	    if (shdw_reg->flags.write == 0) {
 		shadow_pte->writable = 0;
 	    }
 
 	} else {
 	    // Page fault handled by hook functions
 
-	    if (v3_handle_mem_hook(info, fault_addr, guest_pa, shdw_reg, error_code) == -1) {
+	    if (shdw_reg->unhandled(info, fault_addr, guest_pa, shdw_reg, error_code) == -1) {
 		PrintError("Special Page fault handler returned error for address: %p\n",  (void *)fault_addr);
 		return -1;
 	    }
@@ -384,15 +387,16 @@ static int handle_pte_shadow_pagefault_32(struct guest_info * info, addr_t fault
     } else if (shadow_pte_access == PT_ACCESS_WRITE_ERROR) {
 	guest_pte->dirty = 1;
 
-	if (shdw_reg->host_type == SHDW_REGION_WRITE_HOOK) {
-	    if (v3_handle_mem_hook(info, fault_addr, guest_pa, shdw_reg, error_code) == -1) {
+
+	if (shdw_reg->flags.write == 1) {
+	    PrintDebug("Shadow PTE Write Error\n");
+	    shadow_pte->writable = guest_pte->writable;
+	} else {
+	    if (shdw_reg->unhandled(info, fault_addr, guest_pa, shdw_reg, error_code) == -1) {
 		PrintError("Special Page fault handler returned error for address: %p\n",  (void *)fault_addr);
 		return -1;
 	    }
-	} else {
-	    PrintDebug("Shadow PTE Write Error\n");
-	    shadow_pte->writable = guest_pte->writable;
-	}
+	} 
 
 
 	return 0;
@@ -426,7 +430,7 @@ static int handle_4MB_shadow_pagefault_32(struct guest_info * info,
     PrintDebug("Handling 4MB fault (guest_fault_pa=%p) (error_code=%x)\n", (void *)guest_fault_pa, *(uint_t*)&error_code);
     PrintDebug("ShadowPT=%p, LargeGuestPDE=%p\n", shadow_pt, large_guest_pde);
 
-    struct v3_shadow_region * shdw_reg = v3_get_shadow_region(info->vm_info, info->cpu_id, guest_fault_pa);
+    struct v3_mem_region * shdw_reg = v3_get_mem_region(info->vm_info, info->cpu_id, guest_fault_pa);
 
  
     if (shdw_reg == NULL) {
@@ -447,10 +451,14 @@ static int handle_4MB_shadow_pagefault_32(struct guest_info * info,
     if (shadow_pte_access == PT_ACCESS_NOT_PRESENT) {
 	// Get the guest physical address of the fault
 
-	if ((shdw_reg->host_type == SHDW_REGION_ALLOCATED) || 
-	    (shdw_reg->host_type == SHDW_REGION_WRITE_HOOK)) {
-	    addr_t shadow_pa = v3_get_shadow_addr(shdw_reg, info->cpu_id, guest_fault_pa);
+	if ((shdw_reg->flags.alloced == 1) || 
+	    (shdw_reg->flags.read == 1)) {
+	    addr_t shadow_pa = 0;
 
+	    if (v3_gpa_to_hpa(info, guest_fault_pa, &shadow_pa) == -1) {
+		PrintError("could not translate page fault address (%p)\n", (void *)guest_fault_pa);
+		return -1;
+	    }
 	    shadow_pte->page_base_addr = PAGE_BASE_ADDR(shadow_pa);
 
 	    PrintDebug("\tMapping shadow page (%p)\n", (void *)BASE_TO_PAGE_ADDR(shadow_pte->page_base_addr));
@@ -464,7 +472,7 @@ static int handle_4MB_shadow_pagefault_32(struct guest_info * info,
 	     */
 	    shadow_pte->user_page = 1;
 
-	    if (shdw_reg->host_type == SHDW_REGION_WRITE_HOOK) {
+	    if (shdw_reg->flags.write == 0) {
 		shadow_pte->writable = 0;
 	    } else {
 		shadow_pte->writable = 1;
@@ -477,21 +485,16 @@ static int handle_4MB_shadow_pagefault_32(struct guest_info * info,
 	    //
       
 	} else {
-	    if (v3_handle_mem_hook(info, fault_addr, guest_fault_pa, shdw_reg, error_code) == -1) {
+	    if (shdw_reg->unhandled(info, fault_addr, guest_fault_pa, shdw_reg, error_code) == -1) {
 		PrintError("Special Page Fault handler returned error for address: %p\n", (void *)fault_addr);
 		return -1;
 	    }
 	}
     } else if (shadow_pte_access == PT_ACCESS_WRITE_ERROR) {
-
-	if (shdw_reg->host_type == SHDW_REGION_WRITE_HOOK) {
-
-	    if (v3_handle_mem_hook(info, fault_addr, guest_fault_pa, shdw_reg, error_code) == -1) {
-		PrintError("Special Page Fault handler returned error for address: %p\n", (void *)fault_addr);
-		return -1;
-	    }
-	}
-
+	if (shdw_reg->unhandled(info, fault_addr, guest_fault_pa, shdw_reg, error_code) == -1) {
+	    PrintError("Special Page Fault handler returned error for address: %p\n", (void *)fault_addr);
+	    return -1;
+	}	
     } else {
 	PrintError("Error in large page fault handler...\n");
 	PrintError("This case should have been handled at the top level handler\n");
@@ -522,7 +525,7 @@ static inline int handle_shadow_invlpg_32(struct guest_info * info, addr_t vaddr
     pde32_t * guest_pd = NULL;
     pde32_t * guest_pde;
 
-    if (guest_pa_to_host_va(info, guest_cr3, (addr_t*)&guest_pd) == -1) {
+    if (v3_gpa_to_hva(info, guest_cr3, (addr_t*)&guest_pd) == -1) {
 	PrintError("Invalid Guest PDE Address: 0x%p\n",  (void *)guest_cr3);
 	return -1;
     }