Skip to content

Commit abc3741

Browse files
committed
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>
1 parent df07991 commit abc3741

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

tools/testing/selftests/kvm/include/x86/processor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1514,7 +1514,7 @@ void virt_map_level(struct kvm_vm *vm, gva_t gva, u64 paddr,
15141514

15151515
void vm_enable_tdp(struct kvm_vm *vm);
15161516
bool kvm_cpu_has_tdp(void);
1517-
void tdp_map(struct kvm_vm *vm, u64 nested_paddr, u64 paddr, u64 size);
1517+
void tdp_map(struct kvm_vm *vm, gpa_t l2_gpa, u64 paddr, u64 size);
15181518
void tdp_identity_map_default_memslots(struct kvm_vm *vm);
15191519
void tdp_identity_map_1g(struct kvm_vm *vm, u64 addr, u64 size);
15201520
u64 *tdp_get_pte(struct kvm_vm *vm, u64 l2_gpa);

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -495,26 +495,24 @@ bool kvm_cpu_has_tdp(void)
495495
return kvm_cpu_has_ept() || kvm_cpu_has_npt();
496496
}
497497

498-
void __tdp_map(struct kvm_vm *vm, u64 nested_paddr, u64 paddr,
499-
u64 size, int level)
498+
void __tdp_map(struct kvm_vm *vm, gpa_t l2_gpa, u64 paddr, u64 size, int level)
500499
{
501500
size_t page_size = PG_LEVEL_SIZE(level);
502501
size_t npages = size / page_size;
503502

504-
TEST_ASSERT(nested_paddr + size > nested_paddr, "Vaddr overflow");
503+
TEST_ASSERT(l2_gpa + size > l2_gpa, "L2 GPA overflow");
505504
TEST_ASSERT(paddr + size > paddr, "Paddr overflow");
506505

507506
while (npages--) {
508-
__virt_pg_map(vm, &vm->stage2_mmu, nested_paddr, paddr, level);
509-
nested_paddr += page_size;
507+
__virt_pg_map(vm, &vm->stage2_mmu, l2_gpa, paddr, level);
508+
l2_gpa += page_size;
510509
paddr += page_size;
511510
}
512511
}
513512

514-
void tdp_map(struct kvm_vm *vm, u64 nested_paddr, u64 paddr,
515-
u64 size)
513+
void tdp_map(struct kvm_vm *vm, gpa_t l2_gpa, u64 paddr, u64 size)
516514
{
517-
__tdp_map(vm, nested_paddr, paddr, size, PG_LEVEL_4K);
515+
__tdp_map(vm, l2_gpa, paddr, size, PG_LEVEL_4K);
518516
}
519517

520518
/* Prepare an identity extended page table that maps all the

0 commit comments

Comments
 (0)