X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_shadow_paging_32.h;h=c21b2f23625be5f8ba06b8f1a38f2c4ddf55591f;hb=30379ff13457e9687c5ab5acb67e92a5757fb5c6;hp=6acd9201c06ec0e18fe6c8d4e48717f448a8fd58;hpb=e4c0bf63a6e95019f79f7ff9915fd5d360d2c31a;p=palacios.git diff --git a/palacios/src/palacios/vmm_shadow_paging_32.h b/palacios/src/palacios/vmm_shadow_paging_32.h index 6acd920..c21b2f2 100644 --- a/palacios/src/palacios/vmm_shadow_paging_32.h +++ b/palacios/src/palacios/vmm_shadow_paging_32.h @@ -63,11 +63,11 @@ static inline int activate_shadow_pt_32(struct guest_info * info) { PrintError("CR3 Cache failed\n"); return -1; } else if (cached == 0) { - addr_t shadow_pt; - - shadow_pt = create_new_shadow_pt(info); + struct shadow_page_data * shdw_page = create_new_shadow_pt(info); + + shdw_page->cr3 = shdw_page->page_pa; - shadow_cr3->pdt_base_addr = (addr_t)V3_PAddr((void *)(addr_t)PAGE_BASE_ADDR(shadow_pt)); + shadow_cr3->pdt_base_addr = PAGE_BASE_ADDR(shdw_page->page_pa); PrintDebug( "Created new shadow page table %p\n", (void *)BASE_TO_PAGE_ADDR(shadow_cr3->pdt_base_addr)); } else { PrintDebug("Reusing cached shadow Page table\n"); @@ -133,7 +133,8 @@ static inline int handle_shadow_pagefault_32(struct guest_info * info, addr_t fa if (shadow_pde_access == PT_ACCESS_NOT_PRESENT) { - pte32_t * shadow_pt = (pte32_t *)create_new_shadow_pt(info); + struct shadow_page_data * shdw_page = create_new_shadow_pt(info); + pte32_t * shadow_pt = (pte32_t *)V3_VAddr((void *)shdw_page->page_pa); shadow_pde->present = 1; shadow_pde->user_page = guest_pde->user_page; @@ -207,8 +208,7 @@ static inline int handle_shadow_pagefault_32(struct guest_info * info, addr_t fa } } else if ((shadow_pde_access == PT_ACCESS_WRITE_ERROR) && - (guest_pde->large_page == 1) && - (((pde32_4MB_t *)guest_pde)->dirty == 0)) + (guest_pde->large_page == 1)) { // // Page Directory Entry marked read-only @@ -239,9 +239,9 @@ static inline int handle_shadow_pagefault_32(struct guest_info * info, addr_t fa PrintDebug("Manual Says to inject page fault into guest\n"); #ifdef DEBUG_SHADOW_PAGING PrintDebug("Guest PDE: (access=%d)\n\t", guest_pde_access); - PrintPTEntry(PAGE_PD32, fault_addr, guest_pde); + PrintPTEntry(info, PAGE_PD32, fault_addr, guest_pde); PrintDebug("Shadow PDE: (access=%d)\n\t", shadow_pde_access); - PrintPTEntry(PAGE_PD32, fault_addr, shadow_pde); + PrintPTEntry(info, PAGE_PD32, fault_addr, shadow_pde); #endif return 0; @@ -263,6 +263,7 @@ static int handle_large_pagefault_32(struct guest_info * info, pt_access_status_t shadow_pte_access = v3_can_access_pte32(shadow_pt, fault_addr, error_code); pte32_t * shadow_pte = (pte32_t *)&(shadow_pt[PTE32_INDEX(fault_addr)]); addr_t guest_fault_pa = BASE_TO_PAGE_ADDR_4MB(large_guest_pde->page_base_addr) + PAGE_OFFSET_4MB(fault_addr); + struct shadow_page_state * state = &(info->shdw_pg_state); struct v3_shadow_region * shdw_reg = v3_get_shadow_region(info, guest_fault_pa); @@ -288,7 +289,6 @@ static int handle_large_pagefault_32(struct guest_info * info, if ((shdw_reg->host_type == SHDW_REGION_ALLOCATED) || (shdw_reg->host_type == SHDW_REGION_WRITE_HOOK)) { - struct shadow_page_state * state = &(info->shdw_pg_state); addr_t shadow_pa = v3_get_shadow_addr(shdw_reg, guest_fault_pa); shadow_pte->page_base_addr = PAGE_BASE_ADDR(shadow_pa); @@ -305,7 +305,6 @@ static int handle_large_pagefault_32(struct guest_info * info, if (find_pte_map(state->cached_ptes, PAGE_ADDR(guest_fault_pa)) != NULL) { // Check if the entry is a page table... PrintDebug("Marking page as Guest Page Table (large page)\n"); - shadow_pte->vmm_info = PT32_GUEST_PT; shadow_pte->writable = 0; } else if (shdw_reg->host_type == SHDW_REGION_WRITE_HOOK) { shadow_pte->writable = 0; @@ -336,7 +335,10 @@ static int handle_large_pagefault_32(struct guest_info * info, PrintError("Special Page Fault handler returned error for address: %p\n", (void *)fault_addr); return -1; } - } else if (shadow_pte->vmm_info == PT32_GUEST_PT) { + } + + + if (find_pte_map(state->cached_ptes, PAGE_ADDR(guest_fault_pa)) != NULL) { struct shadow_page_state * state = &(info->shdw_pg_state); PrintDebug("Write operation on Guest PAge Table Page (large page)\n"); state->cached_cr3 = 0; @@ -370,6 +372,7 @@ static int handle_shadow_pte32_fault(struct guest_info * info, pte32_t * guest_pte = (pte32_t *)&(guest_pt[PTE32_INDEX(fault_addr)]);; 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 shadow_page_state * state = &(info->shdw_pg_state); struct v3_shadow_region * shdw_reg = v3_get_shadow_region(info, guest_pa); @@ -389,9 +392,9 @@ static int handle_shadow_pte32_fault(struct guest_info * info, #ifdef DEBUG_SHADOW_PAGING PrintDebug("Guest PTE: (access=%d)\n\t", guest_pte_access); - PrintPTEntry(PAGE_PT32, fault_addr, guest_pte); + PrintPTEntry(info, PAGE_PT32, fault_addr, guest_pte); PrintDebug("Shadow PTE: (access=%d)\n\t", shadow_pte_access); - PrintPTEntry(PAGE_PT32, fault_addr, shadow_pte); + PrintPTEntry(info, PAGE_PT32, fault_addr, shadow_pte); #endif /* Was the page fault caused by the Guest's page tables? */ @@ -401,6 +404,7 @@ static int handle_shadow_pte32_fault(struct guest_info * info, inject_guest_pf(info, fault_addr, error_code); return 0; } + if (shadow_pte_access == PT_ACCESS_OK) { @@ -417,7 +421,6 @@ static int handle_shadow_pte32_fault(struct guest_info * info, if ((shdw_reg->host_type == SHDW_REGION_ALLOCATED) || (shdw_reg->host_type == SHDW_REGION_WRITE_HOOK)) { - struct shadow_page_state * state = &(info->shdw_pg_state); addr_t shadow_pa = v3_get_shadow_addr(shdw_reg, guest_pa); shadow_pte->page_base_addr = PAGE_BASE_ADDR(shadow_pa); @@ -433,28 +436,27 @@ static int handle_shadow_pte32_fault(struct guest_info * info, guest_pte->accessed = 1; - if (find_pte_map(state->cached_ptes, PAGE_ADDR(guest_pa)) != NULL) { - // Check if the entry is a page table... - PrintDebug("Marking page as Guest Page Table %d\n", shadow_pte->writable); - shadow_pte->vmm_info = PT32_GUEST_PT; - } - - if (shdw_reg->host_type == SHDW_REGION_WRITE_HOOK) { - shadow_pte->writable = 0; - } else if (guest_pte->dirty == 1) { + if (guest_pte->dirty == 1) { shadow_pte->writable = guest_pte->writable; } else if ((guest_pte->dirty == 0) && (error_code.write == 1)) { shadow_pte->writable = guest_pte->writable; guest_pte->dirty = 1; - - if (shadow_pte->vmm_info == PT32_GUEST_PT) { - // Well that was quick... - struct shadow_page_state * state = &(info->shdw_pg_state); - PrintDebug("Immediate Write operation on Guest PAge Table Page\n"); + } else if ((guest_pte->dirty == 0) && (error_code.write == 0)) { + shadow_pte->writable = 0; + } + + // dirty flag has been set, check if its in the cache + if (find_pte_map(state->cached_ptes, PAGE_ADDR(guest_pa)) != NULL) { + if (error_code.write == 1) { state->cached_cr3 = 0; + shadow_pte->writable = guest_pte->writable; + } else { + shadow_pte->writable = 0; } + } - } else if ((guest_pte->dirty == 0) && (error_code.write == 0)) { // was = + // Write hooks trump all, and are set Read Only + if (shdw_reg->host_type == SHDW_REGION_WRITE_HOOK) { shadow_pte->writable = 0; } @@ -479,7 +481,7 @@ static int handle_shadow_pte32_fault(struct guest_info * info, shadow_pte->writable = guest_pte->writable; } - if (shadow_pte->vmm_info == PT32_GUEST_PT) { + if (find_pte_map(state->cached_ptes, PAGE_ADDR(guest_pa)) != NULL) { struct shadow_page_state * state = &(info->shdw_pg_state); PrintDebug("Write operation on Guest PAge Table Page\n"); state->cached_cr3 = 0;