Skip to content

Commit 2103a8b

Browse files
jsmattsonjrsean-jc
authored andcommitted
KVM: selftests: Use a loop to walk guest page tables
Walk the guest page tables via a loop when searching for a PTE, instead of using unique variables for each level of the page tables. This simplifies the code and makes it easier to support 5-level paging in the future. Signed-off-by: Jim Mattson <jmattson@google.com> Reviewed-by: Yosry Ahmed <yosry.ahmed@linux.dev> Link: https://patch.msgid.link/20251028225827.2269128-3-jmattson@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent ae5b498 commit 2103a8b

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

tools/testing/selftests/kvm/lib/x86/processor.c

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,8 @@ static bool vm_is_target_pte(uint64_t *pte, int *level, int current_level)
307307
uint64_t *__vm_get_page_table_entry(struct kvm_vm *vm, uint64_t vaddr,
308308
int *level)
309309
{
310-
uint64_t *pml4e, *pdpe, *pde;
310+
uint64_t *pte = &vm->pgd;
311+
int current_level;
311312

312313
TEST_ASSERT(!vm->arch.is_pt_protected,
313314
"Walking page tables of protected guests is impossible");
@@ -328,19 +329,15 @@ uint64_t *__vm_get_page_table_entry(struct kvm_vm *vm, uint64_t vaddr,
328329
TEST_ASSERT(vaddr == (((int64_t)vaddr << 16) >> 16),
329330
"Canonical check failed. The virtual address is invalid.");
330331

331-
pml4e = virt_get_pte(vm, &vm->pgd, vaddr, PG_LEVEL_512G);
332-
if (vm_is_target_pte(pml4e, level, PG_LEVEL_512G))
333-
return pml4e;
334-
335-
pdpe = virt_get_pte(vm, pml4e, vaddr, PG_LEVEL_1G);
336-
if (vm_is_target_pte(pdpe, level, PG_LEVEL_1G))
337-
return pdpe;
338-
339-
pde = virt_get_pte(vm, pdpe, vaddr, PG_LEVEL_2M);
340-
if (vm_is_target_pte(pde, level, PG_LEVEL_2M))
341-
return pde;
332+
for (current_level = vm->pgtable_levels;
333+
current_level > PG_LEVEL_4K;
334+
current_level--) {
335+
pte = virt_get_pte(vm, pte, vaddr, current_level);
336+
if (vm_is_target_pte(pte, level, current_level))
337+
return pte;
338+
}
342339

343-
return virt_get_pte(vm, pde, vaddr, PG_LEVEL_4K);
340+
return virt_get_pte(vm, pte, vaddr, PG_LEVEL_4K);
344341
}
345342

346343
uint64_t *vm_get_page_table_entry(struct kvm_vm *vm, uint64_t vaddr)

0 commit comments

Comments
 (0)