X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_64.h;h=baae5d54d223b792df8f25e42b85bdfeaf574009;hb=2fb33705f951901f43a9fed966e96074fc693609;hp=80dce910d38e3c6fc08d9b12414ddb6d9fa4a6b8;hpb=3265eca7ca1814feaf011e5e690de7d4bc202aa4;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging_64.h b/palacios/src/palacios/vmm_direct_paging_64.h
index 80dce91..baae5d5 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 get_page_size() {
-
-    // Need to fix this....
-    return PAGE_SIZE_4KB; 
-
-
-#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;
@@ -121,15 +45,21 @@ static inline int handle_passthrough_pagefault_64(struct guest_info * core, addr
     struct v3_mem_region * region =  v3_get_mem_region(core->vm_info, core->cpu_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) ) {
-	page_size = get_page_size();
+    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) {