Skip to content

Commit ae5b498

Browse files
jsmattsonjrsean-jc
authored andcommitted
KVM: selftests: Use a loop to create guest page tables
Walk the guest page tables via a loop when creating new mappings, 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-2-jmattson@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent ff736db commit ae5b498

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

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

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ static uint64_t *virt_create_upper_pte(struct kvm_vm *vm,
218218
void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, int level)
219219
{
220220
const uint64_t pg_size = PG_LEVEL_SIZE(level);
221-
uint64_t *pml4e, *pdpe, *pde;
222-
uint64_t *pte;
221+
uint64_t *pte = &vm->pgd;
222+
int current_level;
223223

224224
TEST_ASSERT(vm->mode == VM_MODE_PXXV48_4K,
225225
"Unknown or unsupported guest mode, mode: 0x%x", vm->mode);
@@ -243,20 +243,17 @@ void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, int level)
243243
* Allocate upper level page tables, if not already present. Return
244244
* early if a hugepage was created.
245245
*/
246-
pml4e = virt_create_upper_pte(vm, &vm->pgd, vaddr, paddr, PG_LEVEL_512G, level);
247-
if (*pml4e & PTE_LARGE_MASK)
248-
return;
249-
250-
pdpe = virt_create_upper_pte(vm, pml4e, vaddr, paddr, PG_LEVEL_1G, level);
251-
if (*pdpe & PTE_LARGE_MASK)
252-
return;
253-
254-
pde = virt_create_upper_pte(vm, pdpe, vaddr, paddr, PG_LEVEL_2M, level);
255-
if (*pde & PTE_LARGE_MASK)
256-
return;
246+
for (current_level = vm->pgtable_levels;
247+
current_level > PG_LEVEL_4K;
248+
current_level--) {
249+
pte = virt_create_upper_pte(vm, pte, vaddr, paddr,
250+
current_level, level);
251+
if (*pte & PTE_LARGE_MASK)
252+
return;
253+
}
257254

258255
/* Fill in page table entry. */
259-
pte = virt_get_pte(vm, pde, vaddr, PG_LEVEL_4K);
256+
pte = virt_get_pte(vm, pte, vaddr, PG_LEVEL_4K);
260257
TEST_ASSERT(!(*pte & PTE_PRESENT_MASK),
261258
"PTE already present for 4k page at vaddr: 0x%lx", vaddr);
262259
*pte = PTE_PRESENT_MASK | PTE_WRITABLE_MASK | (paddr & PHYSICAL_PAGE_MASK);

0 commit comments

Comments
 (0)