github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-05-05 06:56:57 +00:00
Code Issues Projects Releases Wiki Activity

Add page mask MACRO

Browse Source 
Add 'CPU_PAGE_MASK' used for calculate address,
Change IA32E_REF_MASK from 0x7ffffffffffff000 to 0x000ffffffffff000
for MMU/EPT entry, bit62:52(ignore) bit63(VE/XD)
if we want to obtain the address from the MMU/EPT entry,need to clear
bit63:52 by IA32E_REF_MASK

Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com>
This commit is contained in:
Mingqiang Chi 2018-03-16 14:09:40 +08:00 committed by Jack Ren
parent 2efcbe3ab8
commit 35f5eef658
3 changed files with 6 additions and 5 deletions
hypervisor
arch/x86
mmu.c
include/arch/x86
cpu.hmmu.h

4
hypervisor/arch/x86/mmu.c
View File

@ -640,7 +640,7 @@ void obtain_last_page_table_entry(struct map_params *map_params,
}
/* Obtain page table entry from PD table*/
table_addr = (void *)(table_entry&IA32E_REF_MASK);
table_addr = (void *)(table_entry & IA32E_REF_MASK);
table_entry = get_table_entry(map_params, addr,
table_addr, IA32E_PD);
table_present = check_page_table_present(map_params, table_entry);
@ -667,7 +667,7 @@ void obtain_last_page_table_entry(struct map_params *map_params,
}
/* Obtain page table entry from PT table*/
table_addr = (void *)(table_entry&IA32E_REF_MASK);
table_addr = (void *)(table_entry & IA32E_REF_MASK);
table_entry = get_table_entry(map_params, addr,
table_addr, IA32E_PT);
table_present = check_page_table_present(map_params, table_entry);

1
hypervisor/include/arch/x86/cpu.h
View File

@ -41,6 +41,7 @@
/* Define page size */
#define CPU_PAGE_SHIFT 12
#define CPU_PAGE_SIZE 0x1000
#define CPU_PAGE_MASK 0xFFFFFFFFFFFFF000
/* Define CPU stack alignment */
#define CPU_STACK_ALIGN 16

6
hypervisor/include/arch/x86/mmu.h
View File

@ -167,7 +167,7 @@
#define IA32E_INDEX_MASK_BITS 9
#define IA32E_NUM_ENTRIES 512
#define IA32E_INDEX_MASK (uint64_t)(IA32E_NUM_ENTRIES - 1)
#define IA32E_REF_MASK 0x7FFFFFFFFFFFF000
#define IA32E_REF_MASK 0x000FFFFFFFFFF000
#define IA32E_FIRST_BLOCK_INDEX 1
/* Macro to get PML4 index given an address */
@ -238,8 +238,8 @@
#define MMU_MEM_ATTR_TYPE_WRITE_PROTECTED \
(IA32E_PDPTE_PAT_BIT | IA32E_COMM_PCD_BIT | IA32E_COMM_PWT_BIT)
#define ROUND_PAGE_UP(addr) (((addr) + CPU_PAGE_SIZE - 1) & IA32E_REF_MASK)
#define ROUND_PAGE_DOWN(addr) ((addr) & IA32E_REF_MASK)
#define ROUND_PAGE_UP(addr) (((addr) + CPU_PAGE_SIZE - 1) & CPU_PAGE_MASK)
#define ROUND_PAGE_DOWN(addr) ((addr) & CPU_PAGE_MASK)
struct map_params {
/* enum _page_table_type: HOST or EPT*/