X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_paging.h;h=7c472d776e716bde175eaaa8a4b2d186ed1ebc90;hb=a71d13e84ccd2ea959299c7f01513e6f9e593b7d;hp=caba35f6d175aa5b48dbf4e9b96259eda88283b7;hpb=074523a44f8e4e91f0945633b36cd39cc1d959f9;p=palacios.git

diff --git a/palacios/include/palacios/vmm_paging.h b/palacios/include/palacios/vmm_paging.h
index caba35f..7c472d7 100644
--- a/palacios/include/palacios/vmm_paging.h
+++ b/palacios/include/palacios/vmm_paging.h
@@ -93,17 +93,18 @@ the host state in the vmcs before entering the guest.
 
 
 
-#define MAX_PTE32_ENTRIES          1024
 #define MAX_PDE32_ENTRIES          1024
+#define MAX_PTE32_ENTRIES          1024
 
-#define MAX_PTE32PAE_ENTRIES       512
-#define MAX_PDE32PAE_ENTRIES       512
 #define MAX_PDPE32PAE_ENTRIES      4
+#define MAX_PDE32PAE_ENTRIES       512
+#define MAX_PTE32PAE_ENTRIES       512
 
-#define MAX_PTE64_ENTRIES          512
-#define MAX_PDE64_ENTRIES          512
-#define MAX_PDPE64_ENTRIES         512
 #define MAX_PML4E64_ENTRIES        512
+#define MAX_PDPE64_ENTRIES         512
+#define MAX_PDE64_ENTRIES          512
+#define MAX_PTE64_ENTRIES          512
+
 
 
 /* Converts an address into a page table index */
@@ -187,12 +188,12 @@ the host state in the vmcs before entering the guest.
 
 
 
-#define CR3_TO_PDE32_PA(cr3) ((addr_t)(((ulong_t)cr3) & 0xfffff000))
-#define CR3_TO_PDPTRE_PA(cr3) ((addr_t)(((ulong_t)cr3) & 0xffffffe0))
+#define CR3_TO_PDE32_PA(cr3) ((addr_t)(((uint_t)cr3) & 0xfffff000))
+#define CR3_TO_PDPE32PAE_PA(cr3) ((addr_t)(((uint_t)cr3) & 0xffffffe0))
 #define CR3_TO_PML4E64_PA(cr3)  ((addr_t)(((ullong_t)cr3) & 0x000ffffffffff000LL))
 
-#define CR3_TO_PDE32_VA(cr3) ((pde32_t *)V3_VAddr((void *)(addr_t)(((ulong_t)cr3) & 0xfffff000)))
-#define CR3_TO_PDPTRE_VA(cr3) (V3_VAddr((void *)(((ulong_t)cr3) & 0xffffffe0)))
+#define CR3_TO_PDE32_VA(cr3) ((pde32_t *)V3_VAddr((void *)(addr_t)(((uint_t)cr3) & 0xfffff000)))
+#define CR3_TO_PDPE32PAE_VA(cr3) ((pdpe32pae_t *)V3_VAddr((void *)(addr_t)(((uint_t)cr3) & 0xffffffe0)))
 #define CR3_TO_PML4E64_VA(cr3)  ((pml4e64_t *)V3_VAddr((void *)(addr_t)(((ullong_t)cr3) & 0x000ffffffffff000LL)))
 
 
@@ -224,6 +225,13 @@ the host state in the vmcs before entering the guest.
 typedef enum {PT_ENTRY_NOT_PRESENT, PT_ENTRY_LARGE_PAGE, PT_ENTRY_PAGE} pt_entry_type_t;
 typedef enum {PT_ACCESS_OK, PT_ACCESS_NOT_PRESENT, PT_ACCESS_WRITE_ERROR, PT_ACCESS_USER_ERROR} pt_access_status_t;
 
+
+typedef struct gen_pt {
+  uint_t present        : 1;
+  uint_t writable       : 1;
+  uint_t user_page      : 1;
+} __attribute__((packed)) gen_pt_t;
+
 typedef struct pde32 {
   uint_t present         : 1;
   uint_t writable        : 1;
@@ -465,6 +473,18 @@ void delete_page_tables_32(pde32_t * pde);
 void delete_page_tables_32PAE(pdpe32pae_t * pdpe);
 void delete_page_tables_64(pml4e64_t *  pml4);
 
+struct guest_info;
+
+int v3_translate_guest_pt_32(struct guest_info * info, v3_reg_t guest_cr3, addr_t vaddr, addr_t * paddr);
+int v3_translate_guest_pt_32pae(struct guest_info * info, v3_reg_t guest_cr3, addr_t vaddr, addr_t * paddr);
+int v3_translate_guest_pt_64(struct guest_info * info, v3_reg_t guest_cr3, addr_t vaddr, addr_t * paddr);
+
+int v3_translate_host_pt_32(v3_reg_t host_cr3, addr_t vaddr, addr_t * paddr);
+int v3_translate_host_pt_32pae(v3_reg_t host_cr3, addr_t vaddr, addr_t * paddr);
+int v3_translate_host_pt_64(v3_reg_t host_cr3, addr_t vaddr, addr_t * paddr);
+
+
+/* Should these be static? */
 pt_entry_type_t pde32_lookup(pde32_t * pd, addr_t addr, addr_t * entry);
 pt_entry_type_t pte32_lookup(pte32_t * pt, addr_t addr, addr_t * entry);
 
@@ -482,8 +502,18 @@ pt_entry_type_t pte64_lookup(pte64_t * pt, addr_t addr, addr_t * entry);
 
 
 
-pt_access_status_t can_access_pde32(pde32_t * pde, addr_t addr, pf_error_t access_type);
-pt_access_status_t can_access_pte32(pte32_t * pte, addr_t addr, pf_error_t access_type);
+pt_access_status_t inline v3_can_access_pde32(pde32_t * pde, addr_t addr, pf_error_t access_type);
+pt_access_status_t inline v3_can_access_pte32(pte32_t * pte, addr_t addr, pf_error_t access_type);
+
+pt_access_status_t inline v3_can_access_pdpe32pae(pdpe32pae_t * pdpe, addr_t addr, pf_error_t access_type);
+pt_access_status_t inline v3_can_access_pde32pae(pde32pae_t * pde, addr_t addr, pf_error_t access_type);
+pt_access_status_t inline v3_can_access_pte32pae(pte32pae_t * pte, addr_t addr, pf_error_t access_type);
+
+pt_access_status_t inline v3_can_access_pml4e64(pml4e64_t * pmle, addr_t addr, pf_error_t access_type);
+pt_access_status_t inline v3_can_access_pdpe64(pdpe64_t * pdpe, addr_t addr, pf_error_t access_type);
+pt_access_status_t inline v3_can_access_pde64(pde64_t * pde, addr_t addr, pf_error_t access_type);
+pt_access_status_t inline v3_can_access_pte32(pte32_t * pte, addr_t addr, pf_error_t access_type);
+