X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fmmu%2Fvmm_shdw_pg_tlb_64.h;h=4f31b7fed947df72f042937b43e7256d6420cbdc;hb=1f9fa9cd9662a600f49a3b12fcc02fd2ffca93c8;hp=db59d7d43591dc9b2836b9a4495e31db97259bf9;hpb=cb373a2cd34024714299db092a90e947a9a8c80b;p=palacios.git

diff --git a/palacios/src/palacios/mmu/vmm_shdw_pg_tlb_64.h b/palacios/src/palacios/mmu/vmm_shdw_pg_tlb_64.h
index db59d7d..4f31b7f 100644
--- a/palacios/src/palacios/mmu/vmm_shdw_pg_tlb_64.h
+++ b/palacios/src/palacios/mmu/vmm_shdw_pg_tlb_64.h
@@ -271,7 +271,6 @@ static int handle_pdpe_shadow_pagefault_64(struct guest_info * info, addr_t faul
     return 0;
 }
 
-
 static int handle_pde_shadow_pagefault_64(struct guest_info * info, addr_t fault_addr, pf_error_t error_code,
 					  pde64_t * shadow_pd, pde64_t * guest_pd) {
     pt_access_status_t guest_pde_access;
@@ -332,23 +331,30 @@ static int handle_pde_shadow_pagefault_64(struct guest_info * info, addr_t fault
 	return 0;
     }
 
-    // Handle as a shadow large page if possible
-    if (guest_pde->large_page 
-	&& (info->vm_info->mem_align >= PAGE_SIZE_2MB)) {
-	if (handle_2MB_shadow_pagefault_pde_64(info, fault_addr, error_code, shadow_pde_access,
-		 	 		       (pde64_2MB_t *)shadow_pde, (pde64_2MB_t *)guest_pde) == -1) {
-	    PrintError("Error handling large pagefault with large page\n");
-	    return -1;
-	} else {
-	    return 0;
-	}
-    } 
-
     pte64_t * shadow_pt = NULL;
     pte64_t * guest_pt = NULL;
 
     // get the next shadow page level, allocate if not present
     if (shadow_pde_access == PT_ACCESS_NOT_PRESENT) {
+        // Check if  we can use large pages and the guest memory is properly aligned
+        // to potentially use a large page
+
+        if ((info->use_large_pages == 1) && (guest_pde->large_page == 1)) {
+	    addr_t guest_pa = BASE_TO_PAGE_ADDR_2MB(((pde64_2MB_t *)guest_pde)->page_base_addr);
+	    uint32_t page_size = v3_get_max_page_size(info, guest_pa, LONG);
+	    
+	    if (page_size == PAGE_SIZE_2MB) {
+		if (handle_2MB_shadow_pagefault_pde_64(info, fault_addr, error_code, shadow_pde_access,
+						       (pde64_2MB_t *)shadow_pde, (pde64_2MB_t *)guest_pde) == -1) {
+		    PrintError("Error handling large pagefault with large page\n");
+		    return -1;
+		}
+
+		return 0;
+	    }
+	    // Fallthrough to handle the region with small pages
+	}
+
 	struct shadow_page_data * shdw_page = create_new_shadow_pt(info);
 	shadow_pt = (pte64_t *)V3_VAddr((void *)shdw_page->page_pa);
 
@@ -357,7 +363,6 @@ static int handle_pde_shadow_pagefault_64(struct guest_info * info, addr_t fault
 	shadow_pde->present = 1;
 	shadow_pde->user_page = guest_pde->user_page;
 
-
 	if (guest_pde->large_page == 0) {
 	    shadow_pde->writable = guest_pde->writable;
 	} else {
@@ -421,7 +426,7 @@ static int handle_pte_shadow_pagefault_64(struct guest_info * info, addr_t fault
 
     PrintDebug("Handling PTE fault\n");
 
-    struct v3_mem_region * shdw_reg =  v3_get_mem_region(info->vm_info, info->cpu_id, guest_pa);
+    struct v3_mem_region * shdw_reg =  v3_get_mem_region(info->vm_info, info->vcpu_id, guest_pa);
 
 
 
@@ -553,7 +558,7 @@ static int handle_2MB_shadow_pagefault_pde_64(struct guest_info * info,
     PrintDebug("Handling 2MB fault with large page (guest_fault_pa=%p) (error_code=%x)\n", (void *)guest_fault_pa, *(uint_t*)&error_code);
     PrintDebug("LargeShadowPDE=%p, LargeGuestPDE=%p\n", large_shadow_pde, large_guest_pde);
 
-    struct v3_mem_region * shdw_reg = v3_get_mem_region(info->vm_info, info->cpu_id, guest_fault_pa);
+    struct v3_mem_region * shdw_reg = v3_get_mem_region(info->vm_info, info->vcpu_id, guest_fault_pa);
  
     if (shdw_reg == NULL) {
 	// Inject a machine check in the guest
@@ -635,7 +640,7 @@ static int handle_2MB_shadow_pagefault_pte_64(struct guest_info * info,
     PrintDebug("Handling 2MB 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_mem_region * shdw_reg = v3_get_mem_region(info->vm_info, info->cpu_id, guest_fault_pa);
+    struct v3_mem_region * shdw_reg = v3_get_mem_region(info->vm_info, info->vcpu_id, guest_fault_pa);
 
  
     if (shdw_reg == NULL) {