X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_64.h;h=217373ab037330bdc9080ede1d90da499d106b3a;hb=5d1bbcc86de011e3f0d115b6f10fd8645cdf855e;hp=0a13170b7d1bf73e335769928b7a4aa379a72a9d;hpb=a61b05a7a19a758d54817bb82ba5fff783d5dc68;p=palacios.git diff --git a/palacios/src/palacios/vmm_direct_paging_64.h b/palacios/src/palacios/vmm_direct_paging_64.h index 0a13170..217373a 100644 --- a/palacios/src/palacios/vmm_direct_paging_64.h +++ b/palacios/src/palacios/vmm_direct_paging_64.h @@ -29,82 +29,6 @@ // Reference: AMD Software Developer Manual Vol.2 Ch.5 "Page Translation and Protection" -static int check_large_page_ok() { - - // Need to fix this.... - return 0; - - -#if 0 - struct v3_mem_region * base_reg = &(info->vm_info->mem_map.base_region); - - /* If the guest has been configured for 2MiB pages, then we must check for hooked regions of - * memory which may overlap with the 2MiB page containing the faulting address (due to - * potentially differing access policies in place for e.g. i/o devices and APIC). A 2MiB page - * can be used if a) no region overlaps the page [or b) a region does overlap but fully contains - * the page]. The [bracketed] text pertains to the #if 0'd code below, state D. TODO modify this - * note if someone decides to enable this optimization. It can be tested with the SeaStar - * mapping. - * - * Examples: (CAPS regions are returned by v3_get_next_mem_region; state A returns the base reg) - * - * |region| |region| 2MiB mapped (state A) - * |reg| |REG| 2MiB mapped (state B) - * |region| |reg| |REG| |region| |reg| 4KiB mapped (state C) - * |reg| |reg| |--REGION---| [2MiB mapped (state D)] - * |--------------------------------------------| RAM - * ^ fault addr - * |----|----|----|----|----|page|----|----|----| 2MB pages - * >>>>>>>>>>>>>>>>>>>> search space - */ - addr_t pg_start = 0UL, pg_end = 0UL; // 2MiB page containing the faulting address - struct v3_mem_region * pg_next_reg = NULL; // next immediate mem reg after page start addr - bool use_large_page = false; - - if (region == NULL) { - PrintError("%s: invalid region, addr=%p\n", __FUNCTION__, (void *)fault_addr); - return -1; - } - - // set use_large_page here - if (info->vm_info->paging_size == PAGING_2MB) { - - // guest page maps to a host page + offset (so when we shift, it aligns with a host page) - pg_start = PAGE_ADDR_2MB(fault_addr); - pg_end = (pg_start + PAGE_SIZE_2MB); - - PrintDebug("%s: page [%p,%p) contains address\n", __FUNCTION__, (void *)pg_start, (void *)pg_end); - - pg_next_reg = v3_get_next_mem_region(info->vm_info, info->cpu_id, pg_start); - - if (pg_next_reg == NULL) { - PrintError("%s: Error: address not in base region, %p\n", __FUNCTION__, (void *)fault_addr); - return -1; - } - - if ((pg_next_reg->base == 1) { // next region == base region - use_large_page = 1; // State A - } else { -#if 0 // State B/C and D optimization - use_large_page = (pg_next_reg->guest_end >= pg_end) && - ((pg_next_reg->guest_start >= pg_end) || (pg_next_reg->guest_start <= pg_start)); - PrintDebug("%s: region [%p,%p) %s partial overlap with page\n", __FUNCTION__, - (void *)pg_next_reg->guest_start, (void *)pg_next_reg->guest_end, - (use_large_page ? "does not have" : "has")); -#else // State B/C - use_large_page = (pg_next_reg->guest_start >= pg_end); - PrintDebug("%s: region [%p,%p) %s overlap with page\n", __FUNCTION__, - (void *)pg_next_reg->guest_start, (void *)pg_next_reg->guest_end, - (use_large_page ? "does not have" : "has")); -#endif - } - } - - PrintDebug("%s: Address gets a 2MiB page? %s\n", __FUNCTION__, (use_large_page ? "yes" : "no")); -#endif -} - - static inline int handle_passthrough_pagefault_64(struct guest_info * core, addr_t fault_addr, pf_error_t error_code) { pml4e64_t * pml = NULL; pdpe64_t * pdpe = NULL; @@ -118,18 +42,24 @@ static inline int handle_passthrough_pagefault_64(struct guest_info * core, addr int pde_index = PDE64_INDEX(fault_addr); int pte_index = PTE64_INDEX(fault_addr); - struct v3_mem_region * region = v3_get_mem_region(core->vm_info, core->cpu_id, fault_addr); - int use_large_page = 0; + struct v3_mem_region * region = v3_get_mem_region(core->vm_info, core->vcpu_id, fault_addr); + int page_size = PAGE_SIZE_4KB; + if (region == NULL) { + PrintError("%s: invalid region, addr=%p\n", __FUNCTION__, (void *)fault_addr); + return -1; + } /* Check if: * 1. the guest is configured to use large pages and * 2. the memory regions can be referenced by a large page */ - if ((core->use_large_pages == 1) && (check_large_page_ok() == 1)) { - use_large_page = 1; + if ((core->use_large_pages == 1) || (core->use_giant_pages == 1)) { + page_size = v3_get_max_page_size(core, fault_addr, LONG); } + PrintDebug("Using page size of %dKB\n", page_size / 1024); + // Lookup the correct PML address based on the PAGING MODE if (core->shdw_pg_mode == SHADOW_PAGING) { @@ -167,7 +97,7 @@ static inline int handle_passthrough_pagefault_64(struct guest_info * core, addr } // Fix up the 2MiB PDE and exit here - if (use_large_page == 1) { + if (page_size == PAGE_SIZE_2MB) { pde2mb = (pde64_2MB_t *)pde; // all but these two lines are the same for PTE pde2mb[pde_index].large_page = 1; @@ -200,10 +130,13 @@ static inline int handle_passthrough_pagefault_64(struct guest_info * core, addr return region->unhandled(core, fault_addr, fault_addr, region, error_code); } - } - // Continue with the 4KiB page heirarchy + // All done + return 0; + } + // Continue with the 4KiB page heirarchy + // Fix up the PDE entry if (pde[pde_index].present == 0) { pte = (pte64_t *)create_generic_pt_page(); @@ -217,7 +150,6 @@ static inline int handle_passthrough_pagefault_64(struct guest_info * core, addr pte = V3_VAddr((void*)BASE_TO_PAGE_ADDR_4KB(pde[pde_index].pt_base_addr)); } - // Fix up the PTE entry if (pte[pte_index].present == 0) { pte[pte_index].user_page = 1; @@ -286,6 +218,8 @@ static inline int invalidate_addr_64(struct guest_info * core, addr_t inv_addr) return 0; } else if (pdpe[pdpe_index].large_page == 1) { // 1GiB pdpe[pdpe_index].present = 0; + pdpe[pdpe_index].writable = 0; + pdpe[pdpe_index].user_page = 0; return 0; } @@ -295,12 +229,16 @@ static inline int invalidate_addr_64(struct guest_info * core, addr_t inv_addr) return 0; } else if (pde[pde_index].large_page == 1) { // 2MiB pde[pde_index].present = 0; + pde[pde_index].writable = 0; + pde[pde_index].user_page = 0; return 0; } pte = V3_VAddr((void*)BASE_TO_PAGE_ADDR(pde[pde_index].pt_base_addr)); pte[pte_index].present = 0; // 4KiB + pte[pte_index].writable = 0; + pte[pte_index].user_page = 0; return 0; }