X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_direct_paging_32.h;h=ac6f054587c15777e8d671a0c55ca7d830337d6b;hb=9a32111c4074aafd55cd9590a24bd5c751a6fe61;hp=ff421bcd37701cf5fa437cc28ba4c4e3da747a03;hpb=a568601e28c34c590815d1d2a16e85fbca352ebd;p=palacios.git

diff --git a/palacios/src/palacios/vmm_direct_paging_32.h b/palacios/src/palacios/vmm_direct_paging_32.h
index ff421bc..ac6f054 100644
--- a/palacios/src/palacios/vmm_direct_paging_32.h
+++ b/palacios/src/palacios/vmm_direct_paging_32.h
@@ -18,7 +18,6 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-
 #ifndef __VMM_DIRECT_PAGING_32_H__
 #define __VMM_DIRECT_PAGING_32_H__
 
@@ -30,75 +29,118 @@
 
 
 static inline int handle_passthrough_pagefault_32(struct guest_info * info, 
-							   addr_t fault_addr, 
-							   pf_error_t error_code) {
-  // Check to see if pde and pte exist (create them if not)
-  pde32_t * pde = CR3_TO_PDE32_VA(info->ctrl_regs.cr3);
-  pte32_t * pte = NULL;
-  addr_t host_addr = 0;
-  
-  int pde_index = PDE32_INDEX(fault_addr);
-  int pte_index = PTE32_INDEX(fault_addr);
-
-  struct v3_shadow_region * region = v3_get_shadow_region(info, fault_addr);
-
-  if ((region == NULL) || 
-      (region->host_type == SHDW_REGION_INVALID)) {
-    PrintError("Invalid region in passthrough page fault 32PAE, addr=%p\n", 
-	       (void *)fault_addr);
-    return -1;
-  }
-
-  host_addr = v3_get_shadow_addr(region, fault_addr);
-
-  // Fix up the PDE entry
-  if (pde[pde_index].present == 0) {
-    pte = (pte32_t *)create_generic_pt_page();
+						  addr_t fault_addr, 
+						  pf_error_t error_code) {
+    // Check to see if pde and pte exist (create them if not)
+    pde32_t * pde = NULL;
+    pte32_t * pte = NULL;
+    addr_t host_addr = 0;
+    
+    int pde_index = PDE32_INDEX(fault_addr);
+    int pte_index = PTE32_INDEX(fault_addr);
     
-    pde[pde_index].present = 1;
-    pde[pde_index].writable = 1;
-    pde[pde_index].user_page = 1;
-    pde[pde_index].pt_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pte));
+    struct v3_mem_region * region = v3_get_mem_region(info->vm_info, info->vcpu_id, fault_addr);
 
-  } else {
-    pte = V3_VAddr((void*)BASE_TO_PAGE_ADDR(pde[pde_index].pt_base_addr));
-  }
+    if (region == NULL) {
+	PrintError("Invalid region in passthrough page fault 32, addr=%p\n", 
+		   (void *)fault_addr);
+	return -1;
+    }
+    
+    // Lookup the correct PDE address based on the PAGING MODE
+    if (info->shdw_pg_mode == SHADOW_PAGING) {
+	pde = CR3_TO_PDE32_VA(info->ctrl_regs.cr3);
+    } else {
+	pde = CR3_TO_PDE32_VA(info->direct_map_pt);
+    }
+
+
+    // Fix up the PDE entry
+    if (pde[pde_index].present == 0) {
+	pte = (pte32_t *)create_generic_pt_page();
+	
+	pde[pde_index].present = 1;
+	pde[pde_index].writable = 1;
+	pde[pde_index].user_page = 1;
+	pde[pde_index].pt_base_addr = PAGE_BASE_ADDR((addr_t)V3_PAddr(pte));
+	
+    } else {
+	pte = V3_VAddr((void*)BASE_TO_PAGE_ADDR(pde[pde_index].pt_base_addr));
+    }
+    
+    // Fix up the PTE entry
+    if (pte[pte_index].present == 0) {
+	
+	
+	if ((region->flags.alloced == 1) && 
+	    (region->flags.read == 1)) {
+
+	    pte[pte_index].user_page = 1;
+
+	    pte[pte_index].present = 1;
+
+	    if (region->flags.write == 1) {
+		pte[pte_index].writable = 1;
+	    } else {
+		pte[pte_index].writable = 0;
+	    }
+
+    	    if (v3_gpa_to_hpa(info, fault_addr, &host_addr) == -1) {
+		PrintError("Could not translate fault address (%p)\n", (void *)fault_addr);
+		return -1;
+    	    }
+	    
+	    pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr);
+	} else {
+	    return region->unhandled(info, fault_addr, fault_addr, region, error_code);
+	}
+    } else {
+	// We fix all permissions on the first pass, 
+	// so we only get here if its an unhandled exception
+	return region->unhandled(info, fault_addr, fault_addr, region, error_code);	    
+    }
+
+    return 0;
+}
 
-  // Fix up the PTE entry
-  if (pte[pte_index].present == 0) {
 
-    pte[pte_index].user_page = 1;
 
-    if (region->host_type == SHDW_REGION_ALLOCATED) {
-      // Full access
-      pte[pte_index].present = 1;
-      pte[pte_index].writable = 1;
 
-      pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr);
-    } else if (region->host_type == SHDW_REGION_WRITE_HOOK) {
-      // Only trap writes
-      pte[pte_index].present = 1;
-      pte[pte_index].writable = 0;
+static inline int invalidate_addr_32(struct guest_info * info, addr_t inv_addr) {
+    pde32_t * pde = NULL;
+    pte32_t * pte = NULL;
 
-      pte[pte_index].page_base_addr = PAGE_BASE_ADDR(host_addr);
-    } else if (region->host_type == SHDW_REGION_FULL_HOOK) {
-      // trap all accesses
-      return v3_handle_mem_full_hook(info, fault_addr, fault_addr, region, error_code);
-    } else {
-      PrintError("Unknown Region Type...\n");
-      return -1;
-    }
-  } else {
-    if ( (region->host_type == SHDW_REGION_WRITE_HOOK) && 
-	 (error_code.write == 1) ) {
-      return v3_handle_mem_wr_hook(info, fault_addr, fault_addr, region, error_code);
+    // TODO:
+    // Call INVLPGA
+
+    // clear the page table entry
+    int pde_index = PDE32_INDEX(inv_addr);
+    int pte_index = PTE32_INDEX(inv_addr);
+
+    
+    // Lookup the correct PDE address based on the PAGING MODE
+    if (info->shdw_pg_mode == SHADOW_PAGING) {
+	pde = CR3_TO_PDE32_VA(info->ctrl_regs.cr3);
     } else {
-      PrintError("Weird...\n");
-      return -1;
+	pde = CR3_TO_PDE32_VA(info->direct_map_pt);
+    }    
+
+    if (pde[pde_index].present == 0) {
+	return 0;
+    } else if (pde[pde_index].large_page) {
+	pde[pde_index].present = 0;
+	pde[pde_index].writable = 0;
+	pde[pde_index].user_page = 0;
+	return 0;
     }
-  }
 
-  return 0;
+    pte = V3_VAddr((void*)BASE_TO_PAGE_ADDR(pde[pde_index].pt_base_addr));
+
+    pte[pte_index].present = 0;
+    pte[pte_index].writable = 0;
+    pte[pte_index].user_page = 0;
+
+    return 0;
 }