KVM: selftests: Replace "u64 nested_paddr" with "gpa_t l2_gpa"

In x86's nested TDP APIs, use the appropriate gpa_t typedef and rename
variables from nested_paddr to l2_gpa to match KVM x86's nomenclature.

No functional change intended.

Link: https://patch.msgid.link/20260420212004.3938325-19-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
This commit is contained in:
Sean Christopherson
2026-04-20 14:20:03 -07:00
parent df079910f9
commit abc374191d
2 changed files with 7 additions and 9 deletions

View File

@@ -1514,7 +1514,7 @@ void virt_map_level(struct kvm_vm *vm, gva_t gva, u64 paddr,
void vm_enable_tdp(struct kvm_vm *vm);
bool kvm_cpu_has_tdp(void);
void tdp_map(struct kvm_vm *vm, u64 nested_paddr, u64 paddr, u64 size);
void tdp_map(struct kvm_vm *vm, gpa_t l2_gpa, u64 paddr, u64 size);
void tdp_identity_map_default_memslots(struct kvm_vm *vm);
void tdp_identity_map_1g(struct kvm_vm *vm, u64 addr, u64 size);
u64 *tdp_get_pte(struct kvm_vm *vm, u64 l2_gpa);

View File

@@ -495,26 +495,24 @@ bool kvm_cpu_has_tdp(void)
return kvm_cpu_has_ept() || kvm_cpu_has_npt();
}
void __tdp_map(struct kvm_vm *vm, u64 nested_paddr, u64 paddr,
u64 size, int level)
void __tdp_map(struct kvm_vm *vm, gpa_t l2_gpa, u64 paddr, u64 size, int level)
{
size_t page_size = PG_LEVEL_SIZE(level);
size_t npages = size / page_size;
TEST_ASSERT(nested_paddr + size > nested_paddr, "Vaddr overflow");
TEST_ASSERT(l2_gpa + size > l2_gpa, "L2 GPA overflow");
TEST_ASSERT(paddr + size > paddr, "Paddr overflow");
while (npages--) {
__virt_pg_map(vm, &vm->stage2_mmu, nested_paddr, paddr, level);
nested_paddr += page_size;
__virt_pg_map(vm, &vm->stage2_mmu, l2_gpa, paddr, level);
l2_gpa += page_size;
paddr += page_size;
}
}
void tdp_map(struct kvm_vm *vm, u64 nested_paddr, u64 paddr,
u64 size)
void tdp_map(struct kvm_vm *vm, gpa_t l2_gpa, u64 paddr, u64 size)
{
__tdp_map(vm, nested_paddr, paddr, size, PG_LEVEL_4K);
__tdp_map(vm, l2_gpa, paddr, size, PG_LEVEL_4K);
}
/* Prepare an identity extended page table that maps all the