refactored memory map

[palacios.releases.git] / palacios / src / palacios / mmu / vmm_shdw_pg_tlb_32.h

diff --git a/palacios/src/palacios/mmu/vmm_shdw_pg_tlb_32.h b/palacios/src/palacios/mmu/vmm_shdw_pg_tlb_32.h
index 4771c0e..c9f66f8 100644 (file)
--- a/palacios/src/palacios/mmu/vmm_shdw_pg_tlb_32.h
+++ b/palacios/src/palacios/mmu/vmm_shdw_pg_tlb_32.h
@@ -161,8 +161,6 @@ static inline int handle_shadow_pagefault_32(struct guest_info * info, addr_t fa
        guest_pde->accessed = 1;
       
 
-
-
        shadow_pde->pt_base_addr = PAGE_BASE_ADDR(shdw_page->page_pa);
     } else {
        shadow_pt = (pte32_t *)V3_VAddr((void *)BASE_TO_PAGE_ADDR(shadow_pde->pt_base_addr));
@@ -202,7 +200,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
@@ -248,8 +246,7 @@ 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)) {
+       if ((shdw_reg->flags.alloced == 1) && (shdw_reg->flags.read == 1)) {
            addr_t shadow_pa = v3_get_shadow_addr(shdw_reg, info->cpu_id, guest_pa);
       
            shadow_pte->page_base_addr = PAGE_BASE_ADDR(shadow_pa);
@@ -277,16 +274,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) {
+           // Page fault on unhandled memory region
+           
+           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;
            }
@@ -294,14 +289,14 @@ 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;
        }
 
 
@@ -336,7 +331,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) {
@@ -357,8 +352,8 @@ 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)) {
+       if ((shdw_reg->flags.alloced == 1) && 
+           (shdw_reg->flags.read  == 1)) {
            addr_t shadow_pa = v3_get_shadow_addr(shdw_reg, info->cpu_id, guest_fault_pa);
 
            shadow_pte->page_base_addr = PAGE_BASE_ADDR(shadow_pa);
@@ -374,29 +369,29 @@ 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) {
-               shadow_pte->writable = 0;
-           } else {
-               shadow_pte->writable = 1;
-           }
-
            //set according to VMM policy
            shadow_pte->write_through = large_guest_pde->write_through;
            shadow_pte->cache_disable = large_guest_pde->cache_disable;
            shadow_pte->global_page = large_guest_pde->global_page;
            //
       
+
+           if (shdw_reg->flags.write == 0) {
+               shadow_pte->writable = 0;
+           } else {
+               shadow_pte->writable = 1;
+           }
+
        } 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) {
+       if (shdw_reg->flags.write == 0) {
+           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;
            }