X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fmmu%2Fvmm_shdw_pg_swapbypass_64.h;h=b4068b22c62c82f119a12982b639ca2296aa498d;hb=11799589ba31ee388d35ec764cd69e837880ba08;hp=f0dcfdbcc6bf999dd47185ca9a4bfdf6af4ba814;hpb=9959b08bfa0a2a0ee51866199c5b1d7b2b690237;p=palacios.git

diff --git a/palacios/src/palacios/mmu/vmm_shdw_pg_swapbypass_64.h b/palacios/src/palacios/mmu/vmm_shdw_pg_swapbypass_64.h
index f0dcfdb..b4068b2 100644
--- a/palacios/src/palacios/mmu/vmm_shdw_pg_swapbypass_64.h
+++ b/palacios/src/palacios/mmu/vmm_shdw_pg_swapbypass_64.h
@@ -77,7 +77,7 @@ static inline int handle_shadow_pagefault_64(struct guest_info * info, addr_t fa
     PrintDebug("64 bit Shadow page fault handler: %p\n", (void *)fault_addr);
     PrintDebug("Handling PML fault\n");
 
-    if (guest_pa_to_host_va(info, guest_cr3, (addr_t*)&guest_pml) == -1) {
+    if (v3_gpa_to_hva(info, guest_cr3, (addr_t*)&guest_pml) == -1) {
 	PrintError("Invalid Guest PML4E Address: 0x%p\n",  (void *)guest_cr3);
 	return -1;
     } 
@@ -152,7 +152,7 @@ static inline int handle_shadow_pagefault_64(struct guest_info * info, addr_t fa
 
     // Continue processing at the next level
 
-    if (guest_pa_to_host_va(info, BASE_TO_PAGE_ADDR(guest_pml4e->pdp_base_addr), (addr_t *)&guest_pdp) == -1) {
+    if (v3_gpa_to_hva(info, BASE_TO_PAGE_ADDR(guest_pml4e->pdp_base_addr), (addr_t *)&guest_pdp) == -1) {
 	// Machine check the guest
 	PrintError("Invalid Guest PDP Address: 0x%p\n", (void *)BASE_TO_PAGE_ADDR(guest_pml4e->pdp_base_addr));
 	v3_raise_exception(info, MC_EXCEPTION);
@@ -253,7 +253,7 @@ static int handle_pdpe_shadow_pagefault_64(struct guest_info * info, addr_t faul
 
     // Continue processing at the next level
 
-    if (guest_pa_to_host_va(info, BASE_TO_PAGE_ADDR(guest_pdpe->pd_base_addr), (addr_t *)&guest_pd) == -1) {
+    if (v3_gpa_to_hva(info, BASE_TO_PAGE_ADDR(guest_pdpe->pd_base_addr), (addr_t *)&guest_pd) == -1) {
 	// Machine check the guest
 	PrintError("Invalid Guest PTE Address: 0x%p\n", (void *)BASE_TO_PAGE_ADDR(guest_pdpe->pd_base_addr));
 	v3_raise_exception(info, MC_EXCEPTION);
@@ -375,7 +375,7 @@ static int handle_pde_shadow_pagefault_64(struct guest_info * info, addr_t fault
 
     // Continue processing at the next level
     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
 	    PrintError("Invalid Guest PTE Address: 0x%p\n", (void *)BASE_TO_PAGE_ADDR(guest_pde->pt_base_addr));
 	    v3_raise_exception(info, MC_EXCEPTION);
@@ -408,7 +408,7 @@ static int handle_pte_shadow_pagefault_64(struct guest_info * info, addr_t fault
 
     PrintDebug("Handling PTE fault\n");
 
-    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);
 
 
 
@@ -452,9 +452,14 @@ static int handle_pte_shadow_pagefault_64(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);
       
@@ -480,14 +485,14 @@ static int handle_pte_shadow_pagefault_64(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;
 	    }
@@ -495,14 +500,16 @@ static int handle_pte_shadow_pagefault_64(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;
 	}
 
 
@@ -536,7 +543,7 @@ static int handle_2MB_shadow_pagefault_64(struct guest_info * info,
     PrintDebug("Handling 2MB 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) {
@@ -558,9 +565,14 @@ static int handle_2MB_shadow_pagefault_64(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);
 
@@ -573,7 +585,7 @@ static int handle_2MB_shadow_pagefault_64(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;
@@ -586,19 +598,16 @@ static int handle_2MB_shadow_pagefault_64(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 {