X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_32pae.h;h=6d6e403f565c43e2bebac696759042e19872348a;hb=a4fd5bcc79e7cdf9a3bd879294566bff0666ced7;hp=0c3381a3a85c8e92e504757a01c85b46ac0099f6;hpb=fd9690bf0f032246f2d2c596e2467cccc45faff6;p=palacios.git diff --git a/palacios/src/palacios/vmm_direct_paging_32pae.h b/palacios/src/palacios/vmm_direct_paging_32pae.h index 0c3381a..6d6e403 100644 --- a/palacios/src/palacios/vmm_direct_paging_32pae.h +++ b/palacios/src/palacios/vmm_direct_paging_32pae.h @@ -27,10 +27,12 @@ #include #include +/* This always builds 3 level page tables - no large pages */ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info, addr_t fault_addr, - pf_error_t error_code) { + pf_error_t error_code, + addr_t *actual_start, addr_t *actual_end) { pdpe32pae_t * pdpe = NULL; pde32pae_t * pde = NULL; pte32pae_t * pte = NULL; @@ -39,16 +41,17 @@ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info, int pdpe_index = PDPE32PAE_INDEX(fault_addr); int pde_index = PDE32PAE_INDEX(fault_addr); int pte_index = PTE32PAE_INDEX(fault_addr); + - struct v3_shadow_region * region = v3_get_shadow_region(info->vm_info, info->cpu_id, fault_addr); + struct v3_mem_region * region = v3_get_mem_region(info->vm_info, info->vcpu_id, fault_addr); if (region == NULL) { - PrintError("Invalid region in passthrough page fault 32PAE, addr=%p\n", + PrintError(info->vm_info, info, "Invalid region in passthrough page fault 32PAE, addr=%p\n", (void *)fault_addr); return -1; } - host_addr = v3_get_shadow_addr(region, info->cpu_id, fault_addr); + PrintDebug(info->vm_info, info, "Direct Paging 32PAE page fault handler=%p\n", (void *)fault_addr); // Lookup the correct PDPE address based on the PAGING MODE if (info->shdw_pg_mode == SHADOW_PAGING) { @@ -56,23 +59,27 @@ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info, } else { pdpe = CR3_TO_PDPE32PAE_VA(info->direct_map_pt); } - + + PrintDebug(info->vm_info, info, "Top level pdpe error pdp address=%p\n", (void *)pdpe); // Fix up the PDPE entry if (pdpe[pdpe_index].present == 0) { - pde = (pde32pae_t *)create_generic_pt_page(); - + pde = (pde32pae_t *)create_generic_pt_page(info); + PrintDebug(info->vm_info, info, "Creating a new pd page=%p\n", (void *)pde); pdpe[pdpe_index].present = 1; // Set default PDPE Flags... pdpe[pdpe_index].pd_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pde)); } else { pde = V3_VAddr((void*)BASE_TO_PAGE_ADDR(pdpe[pdpe_index].pd_base_addr)); } + PrintDebug(info->vm_info, info, "Handling pde error pd base address =%p\n", (void *)pde); + *actual_start = BASE_TO_PAGE_ADDR_4KB(PAGE_BASE_ADDR_4KB(fault_addr)); + *actual_end = BASE_TO_PAGE_ADDR_4KB(PAGE_BASE_ADDR_4KB(fault_addr)+1)-1; // Fix up the PDE entry if (pde[pde_index].present == 0) { - pte = (pte32pae_t *)create_generic_pt_page(); - + pte = (pte32pae_t *)create_generic_pt_page(info); + PrintDebug(info->vm_info, info, "Creating a new pt page=%p\n", (void *)pte); pde[pde_index].present = 1; pde[pde_index].writable = 1; pde[pde_index].user_page = 1; @@ -82,6 +89,8 @@ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info, pte = V3_VAddr((void*)BASE_TO_PAGE_ADDR(pde[pde_index].pt_base_addr)); } + PrintDebug(info->vm_info, info, "Handling pte error pt base address=%p\n", (void *)pte); + // Fix up the PTE entry if (pte[pte_index].present == 0) { @@ -98,21 +107,29 @@ static inline int handle_passthrough_pagefault_32pae(struct guest_info * info, pte[pte_index].writable = 0; } + if (v3_gpa_to_hpa(info, fault_addr, &host_addr) == -1) { + PrintError(info->vm_info, info, "Could not translate fault address (%p)\n", (void *)fault_addr); + return -1; + } + pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr); + PrintDebug(info->vm_info, info, "PTE mapped to =%p\n", (void *)host_addr); + PrintDebug(info->vm_info, info, "PTE is =%llx\n", *(uint64_t *)&(pte[pte_index])); + } else { + return region->unhandled(info, fault_addr, fault_addr, region, error_code); } + } else { + return region->unhandled(info, fault_addr, fault_addr, region, error_code); } - if (region->flags.hook == 1) { - if ((error_code.write == 1) || (region->flags.read == 0)) { - return v3_handle_mem_hook(info, fault_addr, fault_addr, region, error_code); - } - } + PrintDebug(info->vm_info, info, "Handler ends with fault address=%p\n", (void *)fault_addr); return 0; } -static inline int invalidate_addr_32pae(struct guest_info * info, addr_t inv_addr) { +static inline int invalidate_addr_32pae_internal(struct guest_info * info, addr_t inv_addr, + addr_t *actual_start, uint64_t *actual_size) { pdpe32pae_t * pdpe = NULL; pde32pae_t * pde = NULL; pte32pae_t * pte = NULL; @@ -136,15 +153,21 @@ static inline int invalidate_addr_32pae(struct guest_info * info, addr_t inv_add if (pdpe[pdpe_index].present == 0) { + *actual_start = BASE_TO_PAGE_ADDR_1GB(PAGE_BASE_ADDR_1GB(inv_addr)); + *actual_size = PAGE_SIZE_1GB; return 0; } pde = V3_VAddr((void*)BASE_TO_PAGE_ADDR(pdpe[pdpe_index].pd_base_addr)); if (pde[pde_index].present == 0) { + *actual_start = BASE_TO_PAGE_ADDR_2MB(PAGE_BASE_ADDR_2MB(inv_addr)); + *actual_size = PAGE_SIZE_2MB; return 0; } else if (pde[pde_index].large_page) { pde[pde_index].present = 0; + *actual_start = BASE_TO_PAGE_ADDR_2MB(PAGE_BASE_ADDR_2MB(inv_addr)); + *actual_size = PAGE_SIZE_2MB; return 0; } @@ -152,9 +175,51 @@ static inline int invalidate_addr_32pae(struct guest_info * info, addr_t inv_add pte[pte_index].present = 0; + *actual_start = BASE_TO_PAGE_ADDR_4KB(PAGE_BASE_ADDR_4KB(inv_addr)); + *actual_size = PAGE_SIZE_4KB; return 0; } +static inline int invalidate_addr_32pae(struct guest_info * core, addr_t inv_addr, + addr_t *actual_start, addr_t *actual_end) +{ + uint64_t len; + int rc; + + rc = invalidate_addr_32pae_internal(core,inv_addr,actual_start,&len); + + *actual_end = *actual_start + len - 1; + + return rc; + + +} + +static inline int invalidate_addr_32pae_range(struct guest_info * core, addr_t inv_addr_start, addr_t inv_addr_end, + addr_t *actual_start, addr_t *actual_end) +{ + addr_t next; + addr_t start; + uint64_t len; + int rc; + + for (next=inv_addr_start; next<=inv_addr_end; ) { + rc = invalidate_addr_32pae_internal(core,next,&start, &len); + if (next==inv_addr_start) { + // first iteration, capture where we start invalidating + *actual_start = start; + } + if (rc) { + return rc; + } + next = start + len; + *actual_end = next; + } + // last iteration, actual_end is off by one + (*actual_end)--; + return 0; +} + #endif