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

hv:refine modify_or_del_pte/pde/pdpte()function

Browse Source 
1. Print warning message instead of ASSERT when
     the caller try to modify the attribute for
     memory region that is not present.
  2. To avoid above warning  message for memory region
     below 1M,its attribute may be updated by Service
     VM when updating MTTR setting.

Tracked-On: #3992
Signed-off-by: Yonghua Huang <yonghua.huang@intel.com>
Reviewed-by: Fei Li <fei1.li@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Yonghua Huang 2019-11-01 17:23:21 +08:00 committed by wenlingz
parent 6ae2d9f22b
commit d74497eb17
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
hypervisor/arch/x86/pagetable.c
View File

@ -96,14 +96,21 @@ static void modify_or_del_pte(const uint64_t *pde, uint64_t vaddr_start, uint64_
for (; index < PTRS_PER_PTE; index++) { for (; index < PTRS_PER_PTE; index++) {
uint64_t *pte = pt_page + index; uint64_t *pte = pt_page + index;
if ((mem_ops->pgentry_present(*pte) == 0UL) && (type == MR_MODIFY)) { if ((mem_ops->pgentry_present(*pte) == 0UL)) {
ASSERT(false, "invalid op, pte not present"); /*suppress warning message for low memory (< 1MBytes),as service VM
* will update MTTR attributes for this region by default whether it
* is present or not.
*/
if ((type == MR_MODIFY) && (vaddr >= MEM_1M)) {
pr_warn("%s, vaddr: 0x%llx pte is not present.\n", __func__, vaddr);
}
} else { } else {
local_modify_or_del_pte(pte, prot_set, prot_clr, type, mem_ops); local_modify_or_del_pte(pte, prot_set, prot_clr, type, mem_ops);
vaddr += PTE_SIZE; }
if (vaddr >= vaddr_end) {
break; vaddr += PTE_SIZE;
} if (vaddr >= vaddr_end) {
break;
} }
} }
} }
@ -127,8 +134,10 @@ static void modify_or_del_pde(const uint64_t *pdpte, uint64_t vaddr_start, uint6
uint64_t *pde = pd_page + index; uint64_t *pde = pd_page + index;
uint64_t vaddr_next = (vaddr & PDE_MASK) + PDE_SIZE; uint64_t vaddr_next = (vaddr & PDE_MASK) + PDE_SIZE;
if ((mem_ops->pgentry_present(*pde) == 0UL) && (type == MR_MODIFY)) { if (mem_ops->pgentry_present(*pde) == 0UL) {
ASSERT(false, "invalid op, pde not present"); if (type == MR_MODIFY) {
pr_warn("%s, addr: 0x%llx pde is not present.\n", __func__, vaddr);
}
} else { } else {
if (pde_large(*pde) != 0UL) { if (pde_large(*pde) != 0UL) {
if ((vaddr_next > vaddr_end) || (!mem_aligned_check(vaddr, PDE_SIZE))) { if ((vaddr_next > vaddr_end) || (!mem_aligned_check(vaddr, PDE_SIZE))) {
@ -143,11 +152,11 @@ static void modify_or_del_pde(const uint64_t *pdpte, uint64_t vaddr_start, uint6
} }
} }
modify_or_del_pte(pde, vaddr, vaddr_end, prot_set, prot_clr, mem_ops, type); modify_or_del_pte(pde, vaddr, vaddr_end, prot_set, prot_clr, mem_ops, type);
if (vaddr_next >= vaddr_end) {
break; /* done */
}
vaddr = vaddr_next;
} }
if (vaddr_next >= vaddr_end) {
break; /* done */
}
vaddr = vaddr_next;
} }
} }
@ -170,8 +179,10 @@ static void modify_or_del_pdpte(const uint64_t *pml4e, uint64_t vaddr_start, uin
uint64_t *pdpte = pdpt_page + index; uint64_t *pdpte = pdpt_page + index;
uint64_t vaddr_next = (vaddr & PDPTE_MASK) + PDPTE_SIZE; uint64_t vaddr_next = (vaddr & PDPTE_MASK) + PDPTE_SIZE;
if ((mem_ops->pgentry_present(*pdpte) == 0UL) && (type == MR_MODIFY)) { if (mem_ops->pgentry_present(*pdpte) == 0UL) {
ASSERT(false, "invalid op, pdpte not present"); if (type == MR_MODIFY) {
pr_warn("%s, vaddr: 0x%llx pdpte is not present.\n", __func__, vaddr);
}
} else { } else {
if (pdpte_large(*pdpte) != 0UL) { if (pdpte_large(*pdpte) != 0UL) {
if ((vaddr_next > vaddr_end) || if ((vaddr_next > vaddr_end) ||
@ -187,11 +198,11 @@ static void modify_or_del_pdpte(const uint64_t *pml4e, uint64_t vaddr_start, uin
} }
} }
modify_or_del_pde(pdpte, vaddr, vaddr_end, prot_set, prot_clr, mem_ops, type); modify_or_del_pde(pdpte, vaddr, vaddr_end, prot_set, prot_clr, mem_ops, type);
if (vaddr_next >= vaddr_end) {
break; /* done */
}
vaddr = vaddr_next;
} }
if (vaddr_next >= vaddr_end) {
break; /* done */
}
vaddr = vaddr_next;
} }
} }