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

mmu: identify VA and PA in mmu.c

Browse Source 
- read/write page table entries should use VA which defined as "void *"
- the address data in page table entries should us PA which defined as
  "uint64_t"

Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Jason Chen CJ 2018-04-03 21:58:32 +08:00 committed by Jack Ren
parent e078ce7aae
commit 8682552273
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -424,10 +424,10 @@ static void *walk_paging_struct(void *addr, void *table_base,
* sub-table * sub-table
*/ */
MEM_WRITE64(table_base + table_offset, MEM_WRITE64(table_base + table_offset,
(uint64_t) sub_table_addr | table_present); HVA2HPA(sub_table_addr) | table_present);
} else { } else {
/* Get address of the sub-table */ /* Get address of the sub-table */
sub_table_addr = (void *)(table_entry & IA32E_REF_MASK); sub_table_addr = HPA2HVA(table_entry & IA32E_REF_MASK);
} }
} }
@ -617,7 +617,7 @@ int obtain_last_page_table_entry(struct map_params *map_params,
if (table_present == PT_NOT_PRESENT) { if (table_present == PT_NOT_PRESENT) {
/* PML4E not present, return PML4 base address */ /* PML4E not present, return PML4 base address */
entry->entry_level = IA32E_PML4; entry->entry_level = IA32E_PML4;
entry->entry_base = (uint64_t)table_addr; entry->entry_base = table_addr;
entry->entry_present = PT_NOT_PRESENT; entry->entry_present = PT_NOT_PRESENT;
entry->page_size = check_mmu_1gb_support(map_params) ? entry->page_size = check_mmu_1gb_support(map_params) ?
(PAGE_SIZE_1G) : (PAGE_SIZE_2M); (PAGE_SIZE_1G) : (PAGE_SIZE_2M);
@ -627,7 +627,7 @@ int obtain_last_page_table_entry(struct map_params *map_params,
} }
/* Obtain page table entry from PDPT table*/ /* Obtain page table entry from PDPT table*/
table_addr = (void *)(table_entry & IA32E_REF_MASK); table_addr = HPA2HVA(table_entry & IA32E_REF_MASK);
ret = get_table_entry(addr, table_addr, IA32E_PDPT, &table_entry); ret = get_table_entry(addr, table_addr, IA32E_PDPT, &table_entry);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -635,7 +635,7 @@ int obtain_last_page_table_entry(struct map_params *map_params,
if (table_present == PT_NOT_PRESENT) { if (table_present == PT_NOT_PRESENT) {
/* PDPTE not present, return PDPT base address */ /* PDPTE not present, return PDPT base address */
entry->entry_level = IA32E_PDPT; entry->entry_level = IA32E_PDPT;
entry->entry_base = (uint64_t)table_addr; entry->entry_base = table_addr;
entry->entry_present = PT_NOT_PRESENT; entry->entry_present = PT_NOT_PRESENT;
entry->page_size = check_mmu_1gb_support(map_params) ? entry->page_size = check_mmu_1gb_support(map_params) ?
(PAGE_SIZE_1G) : (PAGE_SIZE_2M); (PAGE_SIZE_1G) : (PAGE_SIZE_2M);
@ -646,7 +646,7 @@ int obtain_last_page_table_entry(struct map_params *map_params,
if (table_entry & IA32E_PDPTE_PS_BIT) { if (table_entry & IA32E_PDPTE_PS_BIT) {
/* 1GB page size, return the base addr of the pg entry*/ /* 1GB page size, return the base addr of the pg entry*/
entry->entry_level = IA32E_PDPT; entry->entry_level = IA32E_PDPT;
entry->entry_base = (uint64_t)table_addr; entry->entry_base = table_addr;
entry->page_size = check_mmu_1gb_support(map_params) ? entry->page_size = check_mmu_1gb_support(map_params) ?
(PAGE_SIZE_1G) : (PAGE_SIZE_2M); (PAGE_SIZE_1G) : (PAGE_SIZE_2M);
entry->entry_present = PT_PRESENT; entry->entry_present = PT_PRESENT;
@ -656,7 +656,7 @@ int obtain_last_page_table_entry(struct map_params *map_params,
} }
/* Obtain page table entry from PD table*/ /* Obtain page table entry from PD table*/
table_addr = (void *)(table_entry & IA32E_REF_MASK); table_addr = HPA2HVA(table_entry & IA32E_REF_MASK);
ret = get_table_entry(addr, table_addr, IA32E_PD, &table_entry); ret = get_table_entry(addr, table_addr, IA32E_PD, &table_entry);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -664,7 +664,7 @@ int obtain_last_page_table_entry(struct map_params *map_params,
if (table_present == PT_NOT_PRESENT) { if (table_present == PT_NOT_PRESENT) {
/* PDE not present, return PDE base address */ /* PDE not present, return PDE base address */
entry->entry_level = IA32E_PD; entry->entry_level = IA32E_PD;
entry->entry_base = (uint64_t)table_addr; entry->entry_base = table_addr;
entry->entry_present = PT_NOT_PRESENT; entry->entry_present = PT_NOT_PRESENT;
entry->page_size = PAGE_SIZE_2M; entry->page_size = PAGE_SIZE_2M;
entry->entry_off = fetch_page_table_offset(addr, IA32E_PD); entry->entry_off = fetch_page_table_offset(addr, IA32E_PD);
@ -675,7 +675,7 @@ int obtain_last_page_table_entry(struct map_params *map_params,
if (table_entry & IA32E_PDE_PS_BIT) { if (table_entry & IA32E_PDE_PS_BIT) {
/* 2MB page size, return the base addr of the pg entry*/ /* 2MB page size, return the base addr of the pg entry*/
entry->entry_level = IA32E_PD; entry->entry_level = IA32E_PD;
entry->entry_base = (uint64_t)table_addr; entry->entry_base = table_addr;
entry->entry_present = PT_PRESENT; entry->entry_present = PT_PRESENT;
entry->page_size = PAGE_SIZE_2M; entry->page_size = PAGE_SIZE_2M;
entry->entry_off = fetch_page_table_offset(addr, IA32E_PD); entry->entry_off = fetch_page_table_offset(addr, IA32E_PD);
@ -684,7 +684,7 @@ int obtain_last_page_table_entry(struct map_params *map_params,
} }
/* Obtain page table entry from PT table*/ /* Obtain page table entry from PT table*/
table_addr = (void *)(table_entry & IA32E_REF_MASK); table_addr = HPA2HVA(table_entry & IA32E_REF_MASK);
ret = get_table_entry(addr, table_addr, IA32E_PT, &table_entry); ret = get_table_entry(addr, table_addr, IA32E_PT, &table_entry);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -692,7 +692,7 @@ int obtain_last_page_table_entry(struct map_params *map_params,
entry->entry_present = ((table_present == PT_PRESENT) entry->entry_present = ((table_present == PT_PRESENT)
? (PT_PRESENT):(PT_NOT_PRESENT)); ? (PT_PRESENT):(PT_NOT_PRESENT));
entry->entry_level = IA32E_PT; entry->entry_level = IA32E_PT;
entry->entry_base = (uint64_t)table_addr; entry->entry_base = table_addr;
entry->page_size = PAGE_SIZE_4K; entry->page_size = PAGE_SIZE_4K;
entry->entry_off = fetch_page_table_offset(addr, IA32E_PT); entry->entry_off = fetch_page_table_offset(addr, IA32E_PT);
entry->entry_val = table_entry; entry->entry_val = table_entry;
@ -837,8 +837,8 @@ static uint64_t break_page_table(struct map_params *map_params, void *paddr,
* (here &0x07) * (here &0x07)
*/ */
MEM_WRITE64(entry.entry_base + entry.entry_off, MEM_WRITE64(entry.entry_base + entry.entry_off,
((entry.entry_val & 0x07) | (entry.entry_val & 0x07) |
((uint64_t)sub_tab_addr))); HVA2HPA(sub_tab_addr));
} else { } else {
/* Write the table entry to map this memory, /* Write the table entry to map this memory,
* SDM chapter4 figure 4-11 * SDM chapter4 figure 4-11
@ -846,8 +846,8 @@ static uint64_t break_page_table(struct map_params *map_params, void *paddr,
* bit5(A) bit6(D or Ignore) * bit5(A) bit6(D or Ignore)
*/ */
MEM_WRITE64(entry.entry_base + entry.entry_off, MEM_WRITE64(entry.entry_base + entry.entry_off,
((entry.entry_val & 0x7f) | (entry.entry_val & 0x7f) |
((uint64_t)sub_tab_addr))); HVA2HPA(sub_tab_addr));
} }
} }

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

@ -255,7 +255,7 @@ struct map_params {
struct entry_params { struct entry_params {
uint32_t entry_level; uint32_t entry_level;
uint32_t entry_present; uint32_t entry_present;
uint64_t entry_base; void *entry_base;
uint64_t entry_off; uint64_t entry_off;
uint64_t entry_val; uint64_t entry_val;
uint64_t page_size; uint64_t page_size;