Skip to content

Commit d2e5038

Browse files
yosrym93sean-jc
authored andcommitted
KVM: selftests: Make sure vm->vpages_mapped is always up-to-date
Call paths leading to __virt_pg_map() are currently: (a) virt_pg_map() -> virt_arch_pg_map() -> __virt_pg_map() (b) virt_map_level() -> __virt_pg_map() For (a), calls to virt_pg_map() from kvm_util.c make sure they update vm->vpages_mapped, but other callers do not. Move the sparsebit_set() call into virt_pg_map() to make sure all callers are captured. For (b), call sparsebit_set_num() from virt_map_level(). It's tempting to have a single the call inside __virt_pg_map(), however: - The call path in (a) is not x86-specific, while (b) is. Moving the call into __virt_pg_map() would require doing something similar for other archs implementing virt_pg_map(). - Future changes will reusue __virt_pg_map() for nested PTEs, which should not update vm->vpages_mapped, i.e. a triple underscore version that does not update vm->vpages_mapped would need to be provided. Signed-off-by: Yosry Ahmed <yosry.ahmed@linux.dev> Link: https://patch.msgid.link/20251021074736.1324328-12-yosry.ahmed@linux.dev Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 1de4dc1 commit d2e5038

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

tools/testing/selftests/kvm/include/kvm_util.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,6 +1230,7 @@ void virt_arch_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr);
12301230
static inline void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)
12311231
{
12321232
virt_arch_pg_map(vm, vaddr, paddr);
1233+
sparsebit_set(vm->vpages_mapped, vaddr >> vm->page_shift);
12331234
}
12341235

12351236

tools/testing/selftests/kvm/lib/kvm_util.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,8 +1458,6 @@ static vm_vaddr_t ____vm_vaddr_alloc(struct kvm_vm *vm, size_t sz,
14581458
pages--, vaddr += vm->page_size, paddr += vm->page_size) {
14591459

14601460
virt_pg_map(vm, vaddr, paddr);
1461-
1462-
sparsebit_set(vm->vpages_mapped, vaddr >> vm->page_shift);
14631461
}
14641462

14651463
return vaddr_start;
@@ -1573,7 +1571,6 @@ void virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
15731571

15741572
while (npages--) {
15751573
virt_pg_map(vm, vaddr, paddr);
1576-
sparsebit_set(vm->vpages_mapped, vaddr >> vm->page_shift);
15771574

15781575
vaddr += page_size;
15791576
paddr += page_size;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,8 @@ void virt_map_level(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
286286

287287
for (i = 0; i < nr_pages; i++) {
288288
__virt_pg_map(vm, vaddr, paddr, level);
289+
sparsebit_set_num(vm->vpages_mapped, vaddr >> vm->page_shift,
290+
nr_bytes / PAGE_SIZE);
289291

290292
vaddr += pg_size;
291293
paddr += pg_size;

0 commit comments

Comments
 (0)