Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
KVM: selftests: Rename vm_vaddr_unused_gap() => vm_unused_gva_gap()
Now that KVM selftests use gva_t instead of vm_vaddr_t, rename the API
for finding an unused range of virtual memory to drop the defunct
terminology and use "vm" for the scope.
Opportunistically clean up the function comment to drop superfluous
and redundant information.
No functional change intended.
Link: https://patch.msgid.link/20260420212004.3938325-13-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
+9
-23
+1
-1
tools/testing/selftests/kvm/include/kvm_util.h
+1
-1
tools/testing/selftests/kvm/include/kvm_util.h
···
715
715
void vm_mem_region_delete(struct kvm_vm *vm, u32 slot);
716
716
struct kvm_vcpu *__vm_vcpu_add(struct kvm_vm *vm, u32 vcpu_id);
717
717
void vm_populate_vaddr_bitmap(struct kvm_vm *vm);
718
-
gva_t vm_vaddr_unused_gap(struct kvm_vm *vm, size_t sz, gva_t vaddr_min);
718
+
gva_t vm_unused_gva_gap(struct kvm_vm *vm, size_t sz, gva_t vaddr_min);
719
719
gva_t vm_alloc(struct kvm_vm *vm, size_t sz, gva_t vaddr_min);
720
720
gva_t __vm_alloc(struct kvm_vm *vm, size_t sz, gva_t vaddr_min,
721
721
enum kvm_mem_region_type type);
+1
-1
tools/testing/selftests/kvm/lib/arm64/ucall.c
+1
-1
tools/testing/selftests/kvm/lib/arm64/ucall.c
+5
-19
tools/testing/selftests/kvm/lib/kvm_util.c
+5
-19
tools/testing/selftests/kvm/lib/kvm_util.c
···
1366
1366
}
1367
1367
1368
1368
/*
1369
-
* VM Virtual Address Unused Gap
1370
-
*
1371
-
* Input Args:
1372
-
* vm - Virtual Machine
1373
-
* sz - Size (bytes)
1374
-
* vaddr_min - Minimum Virtual Address
1375
-
*
1376
-
* Output Args: None
1377
-
*
1378
-
* Return:
1379
-
* Lowest virtual address at or above vaddr_min, with at least
1380
-
* sz unused bytes. TEST_ASSERT failure if no area of at least
1381
-
* size sz is available.
1382
-
*
1383
-
* Within the VM specified by vm, locates the lowest starting virtual
1384
-
* address >= vaddr_min, that has at least sz unallocated bytes. A
1369
+
* Within the VM specified by @vm, locates the lowest starting guest virtual
1370
+
* address >= @vaddr_min, that has at least @sz unallocated bytes. A
1385
1371
* TEST_ASSERT failure occurs for invalid input or no area of at least
1386
-
* sz unallocated bytes >= vaddr_min is available.
1372
+
* @sz unallocated bytes >= @min_gva is available.
1387
1373
*/
1388
-
gva_t vm_vaddr_unused_gap(struct kvm_vm *vm, size_t sz, gva_t vaddr_min)
1374
+
gva_t vm_unused_gva_gap(struct kvm_vm *vm, size_t sz, gva_t vaddr_min)
1389
1375
{
1390
1376
u64 pages = (sz + vm->page_size - 1) >> vm->page_shift;
1391
1377
···
1450
1464
* Find an unused range of virtual page addresses of at least
1451
1465
* pages in length.
1452
1466
*/
1453
-
gva_t vaddr_start = vm_vaddr_unused_gap(vm, sz, vaddr_min);
1467
+
gva_t vaddr_start = vm_unused_gva_gap(vm, sz, vaddr_min);
1454
1468
1455
1469
/* Map the virtual pages. */
1456
1470
for (gva_t vaddr = vaddr_start; pages > 0;
+1
-1
tools/testing/selftests/kvm/lib/loongarch/ucall.c
+1
-1
tools/testing/selftests/kvm/lib/loongarch/ucall.c
+1
-1
tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c
+1
-1
tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c
···
617
617
* Get PTE pointers for test pages and map them inside the guest.
618
618
* Use separate page for each PTE for simplicity.
619
619
*/
620
-
gva = vm_vaddr_unused_gap(vm, NTEST_PAGES * PAGE_SIZE, KVM_UTIL_MIN_VADDR);
620
+
gva = vm_unused_gva_gap(vm, NTEST_PAGES * PAGE_SIZE, KVM_UTIL_MIN_VADDR);
621
621
for (i = 0; i < NTEST_PAGES; i++) {
622
622
pte = vm_get_pte(vm, data->test_pages + i * PAGE_SIZE);
623
623
gpa = addr_hva2gpa(vm, pte);