UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

KVM: selftests: Use virt_get_pte() when getting PTE pointer 

Use virt_get_pte() in vm_get_page_table_entry() instead of open coding
equivalent code.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20221006004512.666529-6-seanjc@google.com
This commit is contained in:
Sean Christopherson 2022-10-06 00:45:10 +00:00
parent ed0b58fc6f
commit 99d51c6eef
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/testing/selftests/kvm/lib/x86_64/processor.c
View File

@ -247,9 +247,7 @@ void virt_map_level(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
uint64_t *vm_get_page_table_entry(struct kvm_vm *vm, uint64_t vaddr) uint64_t *vm_get_page_table_entry(struct kvm_vm *vm, uint64_t vaddr)
{ {
uint16_t index[4];
uint64_t *pml4e, *pdpe, *pde; uint64_t *pml4e, *pdpe, *pde;
uint64_t *pte;
TEST_ASSERT(vm->mode == VM_MODE_PXXV48_4K, "Attempt to use " TEST_ASSERT(vm->mode == VM_MODE_PXXV48_4K, "Attempt to use "
"unknown or unsupported guest mode, mode: 0x%x", vm->mode); "unknown or unsupported guest mode, mode: 0x%x", vm->mode);
@ -264,32 +262,17 @@ uint64_t *vm_get_page_table_entry(struct kvm_vm *vm, uint64_t vaddr)
TEST_ASSERT(vaddr == (((int64_t)vaddr << 16) >> 16), TEST_ASSERT(vaddr == (((int64_t)vaddr << 16) >> 16),
"Canonical check failed. The virtual address is invalid."); "Canonical check failed. The virtual address is invalid.");
index[0] = (vaddr >> 12) & 0x1ffu; pml4e = virt_get_pte(vm, &vm->pgd, vaddr, PG_LEVEL_512G);
index[1] = (vaddr >> 21) & 0x1ffu;
index[2] = (vaddr >> 30) & 0x1ffu;
index[3] = (vaddr >> 39) & 0x1ffu;
pml4e = addr_gpa2hva(vm, vm->pgd); pdpe = virt_get_pte(vm, pml4e, vaddr, PG_LEVEL_1G);
TEST_ASSERT(pml4e[index[3]] & PTE_PRESENT_MASK, TEST_ASSERT(!(*pdpe & PTE_LARGE_MASK),
"Expected pml4e to be present for gva: 0x%08lx", vaddr);
pdpe = addr_gpa2hva(vm, PTE_GET_PFN(pml4e[index[3]]) * vm->page_size);
TEST_ASSERT(pdpe[index[2]] & PTE_PRESENT_MASK,
"Expected pdpe to be present for gva: 0x%08lx", vaddr);
TEST_ASSERT(!(pdpe[index[2]] & PTE_LARGE_MASK),
"Expected pdpe to map a pde not a 1-GByte page."); "Expected pdpe to map a pde not a 1-GByte page.");
pde = addr_gpa2hva(vm, PTE_GET_PFN(pdpe[index[2]]) * vm->page_size); pde = virt_get_pte(vm, pdpe, vaddr, PG_LEVEL_2M);
TEST_ASSERT(pde[index[1]] & PTE_PRESENT_MASK, TEST_ASSERT(!(*pde & PTE_LARGE_MASK),
"Expected pde to be present for gva: 0x%08lx", vaddr);
TEST_ASSERT(!(pde[index[1]] & PTE_LARGE_MASK),
"Expected pde to map a pte not a 2-MByte page."); "Expected pde to map a pte not a 2-MByte page.");
pte = addr_gpa2hva(vm, PTE_GET_PFN(pde[index[1]]) * vm->page_size); return virt_get_pte(vm, pde, vaddr, PG_LEVEL_4K);
TEST_ASSERT(pte[index[0]] & PTE_PRESENT_MASK,
"Expected pte to be present for gva: 0x%08lx", vaddr);
return &pte[index[0]];
} }
void virt_arch_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent) void virt_arch_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent)