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=2dcaada2a202d377b96c71d029bce0165ad835c3;hpb=a0c519f730b179ea90b3f3ac861133906b4f8645;p=palacios.git diff --git a/palacios/include/palacios/vmm_paging.h b/palacios/include/palacios/vmm_paging.h index 2dcaada..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 */ @@ -123,51 +124,76 @@ the host state in the vmcs before entering the guest. /* Gets the base address needed for a Page Table entry */ /* Deprecate these :*/ -#define PD32_BASE_ADDR(x) (((uint_t)x) >> 12) -#define PT32_BASE_ADDR(x) (((uint_t)x) >> 12) -#define PD32_4MB_BASE_ADDR(x) (((uint_t)x) >> 22) - -#define PML4E64_BASE_ADDR(x) (((ullong_t)x) >> 12) -#define PDPE64_BASE_ADDR(x) (((ullong_t)x) >> 12) -#define PDE64_BASE_ADDR(x) (((ullong_t)x) >> 12) -#define PTE64_BASE_ADDR(x) (((ullong_t)x) >> 12) -/* Accessor functions for the page table structures */ -#define PDE32_T_ADDR(x) (((x).pt_base_addr) << 12) -#define PTE32_T_ADDR(x) (((x).page_base_addr) << 12) -#define PDE32_4MB_T_ADDR(x) (((x).page_base_addr) << 22) - +/* + #define PD32_BASE_ADDR(x) (((uint_t)x) >> 12) + #define PT32_BASE_ADDR(x) (((uint_t)x) >> 12) + #define PD32_4MB_BASE_ADDR(x) (((uint_t)x) >> 22) + + #define PML4E64_BASE_ADDR(x) (((ullong_t)x) >> 12) + #define PDPE64_BASE_ADDR(x) (((ullong_t)x) >> 12) + #define PDE64_BASE_ADDR(x) (((ullong_t)x) >> 12) + #define PTE64_BASE_ADDR(x) (((ullong_t)x) >> 12) + + // Accessor functions for the page table structures + #define PDE32_T_ADDR(x) (((x).pt_base_addr) << 12) + #define PTE32_T_ADDR(x) (((x).page_base_addr) << 12) + #define PDE32_4MB_T_ADDR(x) (((x).page_base_addr) << 22) +*/ /* Replace The above with these... */ -#define PAGE_BASE_ADDR(x) (((uint_t)x) >> 12) -#define LARGE_PAGE_BASE_ADDR(x) (((uint_t)x) >> 22) -#define BASE_TO_PAGE_ADDR(x) (((uint_t)x) << 12) -#define LARGE_BASE_TO_PAGE_ADDR(x) (((uint_t)x) << 22) +#define PAGE_BASE_ADDR(x) ((x) >> 12) +#define PAGE_BASE_ADDR_2MB(x) ((x) >> 21) +#define PAGE_BASE_ADDR_4MB(x) ((x) >> 22) + +#define BASE_TO_PAGE_ADDR(x) (((addr_t)x) << 12) +#define BASE_TO_PAGE_ADDR_2MB(x) (((addr_t)x) << 21) +#define BASE_TO_PAGE_ADDR_4MB(x) (((addr_t)x) << 22) +/* *** */ +/* Deprecated */ +/* + #define PT32_PAGE_OFFSET(x) (((uint_t)x) & 0xfff) + #define PD32_4MB_PAGE_OFFSET(x) (((uint_t)x) & 0x003fffff) + + #define PT32_PAGE_ADDR(x) (((uint_t)x) & 0xfffff000) + #define PD32_4MB_PAGE_ADDR(x) (((uint_t)x) & 0xffc00000) + + #define PT32_PAGE_POWER 12 + #define PAGE_ALIGNED_ADDR(x) (((uint_t) (x)) >> 12) + //#define PAGE_ADDR(x) (PAGE_ALIGNED_ADDR(x) << 12) + #define PAGE_POWER 12 + #define PAGE_SIZE 4096 +*/ +/* use these instead */ +#define PAGE_OFFSET(x) ((x) & 0xfff) +#define PAGE_OFFSET_2MB(x) ((x) & 0x1fffff) +#define PAGE_OFFSET_4MB(x) ((x) & 0x3fffff) +#define PAGE_POWER 12 +#define PAGE_POWER_2MB 22 +#define PAGE_POWER_4MB 21 -#define PT32_PAGE_ADDR(x) (((uint_t)x) & 0xfffff000) -#define PT32_PAGE_OFFSET(x) (((uint_t)x) & 0xfff) -#define PT32_PAGE_POWER 12 +// We shift instead of mask because we don't know the address size +#define PAGE_ADDR(x) (((x) >> PAGE_POWER) << PAGE_POWER) +#define PAGE_ADDR_2MB(x) (((x) >> PAGE_POWER_2MB) << PAGE_POWER_2MB) +#define PAGE_ADDR_4MB(x) (((x) >> PAGE_POWER_4MB) << PAGE_POWER_4MB) -#define PD32_4MB_PAGE_ADDR(x) (((uint_t)x) & 0xffc00000) -#define PD32_4MB_PAGE_OFFSET(x) (((uint_t)x) & 0x003fffff) +#define PAGE_SIZE 4096 +#define PAGE_SIZE_2MB (4096 * 512) #define PAGE_SIZE_4MB (4096 * 1024) -/* The following should be phased out */ -#define PAGE_OFFSET(x) ((((uint_t)x) & 0xfff)) -#define PAGE_ALIGNED_ADDR(x) (((uint_t) (x)) >> 12) -#define PAGE_ADDR(x) (PAGE_ALIGNED_ADDR(x) << 12) -#define PAGE_POWER 12 -#define PAGE_SIZE 4096 -/* ** */ +/* *** */ -#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))) @@ -181,10 +207,30 @@ the host state in the vmcs before entering the guest. +/* We'll use the general form for now.... + typedef enum {PDE32_ENTRY_NOT_PRESENT, PDE32_ENTRY_PTE32, PDE32_ENTRY_LARGE_PAGE} pde32_entry_type_t; + typedef enum {PTE32_ENTRY_NOT_PRESENT, PTE32_ENTRY_PAGE} pte32_entry_type_t; + + typedef enum {PDPE32PAE_ENTRY_NOT_PRESENT, PDPE32PAE_ENTRY_PAGE} pdpe32pae_entry_type_t; + typedef enum {PDE32PAE_ENTRY_NOT_PRESENT, PDE32PAE_ENTRY_PTE32, PDE32PAE_ENTRY_LARGE_PAGE} pde32pae_entry_type_t; + typedef enum {PTE32PAE_ENTRY_NOT_PRESENT, PTE32PAE_ENTRY_PAGE} pte32pae_entry_type_t; + + typedef enum {PML4E64_ENTRY_NOT_PRESENT, PML4E64_ENTRY_PAGE} pml4e64_entry_type_t; + typedef enum {PDPE64_ENTRY_NOT_PRESENT, PDPE64_ENTRY_PTE32, PDPE64_ENTRY_LARGE_PAGE} pdpe64_entry_type_t; + typedef enum {PDE64_ENTRY_NOT_PRESENT, PDE64_ENTRY_PTE32, PDE64_ENTRY_LARGE_PAGE} pde64_entry_type_t; + typedef enum {PTE64_ENTRY_NOT_PRESENT, PTE64_ENTRY_PAGE} pte64_entry_type_t; +*/ + -/* PDE 32 bit PAGE STRUCTURES */ -typedef enum {PDE32_ENTRY_NOT_PRESENT, PDE32_ENTRY_PTE32, PDE32_ENTRY_LARGE_PAGE} pde32_entry_type_t; -typedef enum {PT_ACCESS_OK, PT_ENTRY_NOT_PRESENT, PT_WRITE_ERROR, PT_USER_ERROR} pt_access_status_t; +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; @@ -208,7 +254,7 @@ typedef struct pde32_4MB { uint_t cache_disable : 1; uint_t accessed : 1; uint_t dirty : 1; - uint_t one : 1; + uint_t large_page : 1; uint_t global_page : 1; uint_t vmm_info : 3; uint_t pat : 1; @@ -263,7 +309,7 @@ typedef struct pde32pae { uint_t rsvd : 28; } __attribute__((packed)) pde32pae_t; -typedef struct pde32pae_4MB { +typedef struct pde32pae_2MB { uint_t present : 1; uint_t writable : 1; uint_t user_page : 1; @@ -275,11 +321,11 @@ typedef struct pde32pae_4MB { uint_t global_page : 1; uint_t vmm_info : 3; uint_t pat : 1; - uint_t rsvd : 9; - uint_t page_base_addr : 14; + uint_t rsvd : 8; + uint_t page_base_addr : 15; uint_t rsvd2 : 28; -} __attribute__((packed)) pde32pae_4MB_t; +} __attribute__((packed)) pde32pae_2MB_t; typedef struct pte32pae { uint_t present : 1; @@ -323,12 +369,12 @@ typedef struct pml4e64 { typedef struct pdpe64 { uint_t present : 1; uint_t writable : 1; - uint_t user_page : 1; + uint_t user_page : 1; uint_t write_through : 1; uint_t cache_disable : 1; uint_t accessed : 1; - uint_t reserved : 1; - uint_t large_page : 1; + uint_t avail : 1; + uint_t large_page : 1; uint_t zero : 1; uint_t vmm_info : 3; ullong_t pd_base_addr : 40; @@ -337,6 +383,25 @@ typedef struct pdpe64 { } __attribute__((packed)) pdpe64_t; +// We Don't support this +typedef struct pdpe64_1GB { + uint_t present : 1; + uint_t writable : 1; + uint_t user_page : 1; + uint_t write_through : 1; + uint_t cache_disable : 1; + uint_t accessed : 1; + uint_t dirty : 1; + uint_t large_page : 1; + uint_t global_page : 1; + uint_t vmm_info : 3; + uint_t pat : 1; + uint_t rsvd : 17; + ullong_t page_base_addr : 22; + uint_t available : 11; + uint_t no_execute : 1; +} __attribute__((packed)) pdpe64_1GB_t; + typedef struct pde64 { @@ -346,15 +411,34 @@ typedef struct pde64 { uint_t write_through : 1; uint_t cache_disable : 1; uint_t accessed : 1; - uint_t reserved : 1; - uint_t large_page : 1; - uint_t reserved2 : 1; + uint_t avail : 1; + uint_t large_page : 1; + uint_t global_page : 1; uint_t vmm_info : 3; ullong_t pt_base_addr : 40; uint_t available : 11; uint_t no_execute : 1; } __attribute__((packed)) pde64_t; +typedef struct pde64_2MB { + uint_t present : 1; + uint_t writable : 1; + uint_t user_page : 1; + uint_t write_through : 1; + uint_t cache_disable : 1; + uint_t accessed : 1; + uint_t dirty : 1; + uint_t large_page : 1; + uint_t global_page : 1; + uint_t vmm_info : 3; + uint_t pat : 1; + uint_t rsvd : 8; + ullong_t page_base_addr : 31; + uint_t available : 11; + uint_t no_execute : 1; +} __attribute__((packed)) pde64_2MB_t; + + typedef struct pte64 { uint_t present : 1; uint_t writable : 1; @@ -389,17 +473,47 @@ void delete_page_tables_32(pde32_t * pde); void delete_page_tables_32PAE(pdpe32pae_t * pdpe); void delete_page_tables_64(pml4e64_t * pml4); -pde32_entry_type_t pde32_lookup(pde32_t * pd, addr_t addr, addr_t * entry); -int pte32_lookup(pte32_t * pte, addr_t addr, addr_t * entry); +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); + +pt_entry_type_t pdpe32pae_lookup(pdpe32pae_t * pdp, addr_t addr, addr_t * entry); +pt_entry_type_t pde32pae_lookup(pde32pae_t * pd, addr_t addr, addr_t * entry); +pt_entry_type_t pte32pae_lookup(pte32pae_t * pt, addr_t addr, addr_t * entry); + +pt_entry_type_t pml4e64_lookup(pml4e64_t * pml, addr_t addr, addr_t * entry); +pt_entry_type_t pdpe64_lookup(pdpe64_t * pdp, addr_t addr, addr_t * entry); +pt_entry_type_t pde64_lookup(pde64_t * pd, addr_t addr, addr_t * entry); +pt_entry_type_t pte64_lookup(pte64_t * pt, addr_t addr, addr_t * entry); + + + + + -// This assumes that the page table resides in the host address space -// IE. IT DOES NO VM ADDR TRANSLATION -int pt32_lookup(pde32_t * pd, addr_t vaddr, addr_t * paddr); +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); -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);