Commit 83e0e122 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: selftests: Rename "guest_paddr" variables to "gpa" 

Rename "guest_paddr" variables in vm_userspace_mem_region_add() and
vm_mem_add() to KVM's de facto standard "gpa", both for consistency and
to shorten line lengths.

Opportunistically fix the indentation of the
vm_userspace_mem_region_add() declaration.

Link: https://patch.msgid.link/20251007223625.369939-1-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 0bb4d9c3

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

+5 −5
Original line number Diff line number Diff line
@@ -674,11 +674,11 @@ int __vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flag 


void vm_userspace_mem_region_add(struct kvm_vm *vm,

				 enum vm_mem_backing_src_type src_type,

	uint64_t guest_paddr, uint32_t slot, uint64_t npages,

				 uint64_t gpa, uint32_t slot, uint64_t npages,

				 uint32_t flags);

void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,

		uint64_t guest_paddr, uint32_t slot, uint64_t npages,

		uint32_t flags, int guest_memfd_fd, uint64_t guest_memfd_offset);

		uint64_t gpa, uint32_t slot, uint64_t npages, uint32_t flags,

		int guest_memfd_fd, uint64_t guest_memfd_offset);



#ifndef vm_arch_has_protected_memory

static inline bool vm_arch_has_protected_memory(struct kvm_vm *vm)

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

+21 −25
Original line number Diff line number Diff line
@@ -943,8 +943,8 @@ void vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t flags 


/* FIXME: This thing needs to be ripped apart and rewritten. */

void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,

		uint64_t guest_paddr, uint32_t slot, uint64_t npages,

		uint32_t flags, int guest_memfd, uint64_t guest_memfd_offset)

		uint64_t gpa, uint32_t slot, uint64_t npages, uint32_t flags,

		int guest_memfd, uint64_t guest_memfd_offset)

{

	int ret;

	struct userspace_mem_region *region;
@@ -958,30 +958,29 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, 
		"Number of guest pages is not compatible with the host. "

		"Try npages=%d", vm_adjust_num_guest_pages(vm->mode, npages));



	TEST_ASSERT((guest_paddr % vm->page_size) == 0, "Guest physical "

	TEST_ASSERT((gpa % vm->page_size) == 0, "Guest physical "

		"address not on a page boundary.\n"

		"  guest_paddr: 0x%lx vm->page_size: 0x%x",

		guest_paddr, vm->page_size);

	TEST_ASSERT((((guest_paddr >> vm->page_shift) + npages) - 1)

		"  gpa: 0x%lx vm->page_size: 0x%x",

		gpa, vm->page_size);

	TEST_ASSERT((((gpa >> vm->page_shift) + npages) - 1)

		<= vm->max_gfn, "Physical range beyond maximum "

		"supported physical address,\n"

		"  guest_paddr: 0x%lx npages: 0x%lx\n"

		"  gpa: 0x%lx npages: 0x%lx\n"

		"  vm->max_gfn: 0x%lx vm->page_size: 0x%x",

		guest_paddr, npages, vm->max_gfn, vm->page_size);

		gpa, npages, vm->max_gfn, vm->page_size);



	/*

	 * Confirm a mem region with an overlapping address doesn't

	 * already exist.

	 */

	region = (struct userspace_mem_region *) userspace_mem_region_find(

		vm, guest_paddr, (guest_paddr + npages * vm->page_size) - 1);

		vm, gpa, (gpa + npages * vm->page_size) - 1);

	if (region != NULL)

		TEST_FAIL("overlapping userspace_mem_region already "

			"exists\n"

			"  requested guest_paddr: 0x%lx npages: 0x%lx "

			"page_size: 0x%x\n"

			"  existing guest_paddr: 0x%lx size: 0x%lx",

			guest_paddr, npages, vm->page_size,

			"  requested gpa: 0x%lx npages: 0x%lx page_size: 0x%x\n"

			"  existing gpa: 0x%lx size: 0x%lx",

			gpa, npages, vm->page_size,

			(uint64_t) region->region.guest_phys_addr,

			(uint64_t) region->region.memory_size);
@@ -995,8 +994,7 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, 
			"already exists.\n"

			"  requested slot: %u paddr: 0x%lx npages: 0x%lx\n"

			"  existing slot: %u paddr: 0x%lx size: 0x%lx",

			slot, guest_paddr, npages,

			region->region.slot,

			slot, gpa, npages, region->region.slot,

			(uint64_t) region->region.guest_phys_addr,

			(uint64_t) region->region.memory_size);

	}
@@ -1022,7 +1020,7 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, 
	if (src_type == VM_MEM_SRC_ANONYMOUS_THP)

		alignment = max(backing_src_pagesz, alignment);



	TEST_ASSERT_EQ(guest_paddr, align_up(guest_paddr, backing_src_pagesz));

	TEST_ASSERT_EQ(gpa, align_up(gpa, backing_src_pagesz));



	/* Add enough memory to align up if necessary */

	if (alignment > 1)
@@ -1082,20 +1080,18 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, 
	region->unused_phy_pages = sparsebit_alloc();

	if (vm_arch_has_protected_memory(vm))

		region->protected_phy_pages = sparsebit_alloc();

	sparsebit_set_num(region->unused_phy_pages,

		guest_paddr >> vm->page_shift, npages);

	sparsebit_set_num(region->unused_phy_pages, gpa >> vm->page_shift, npages);

	region->region.slot = slot;

	region->region.flags = flags;

	region->region.guest_phys_addr = guest_paddr;

	region->region.guest_phys_addr = gpa;

	region->region.memory_size = npages * vm->page_size;

	region->region.userspace_addr = (uintptr_t) region->host_mem;

	ret = __vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION2, &region->region);

	TEST_ASSERT(ret == 0, "KVM_SET_USER_MEMORY_REGION2 IOCTL failed,\n"

		"  rc: %i errno: %i\n"

		"  slot: %u flags: 0x%x\n"

		"  guest_phys_addr: 0x%lx size: 0x%lx guest_memfd: %d",

		ret, errno, slot, flags,

		guest_paddr, (uint64_t) region->region.memory_size,

		"  guest_phys_addr: 0x%lx size: 0x%llx guest_memfd: %d",

		ret, errno, slot, flags, gpa, region->region.memory_size,

		region->region.guest_memfd);



	/* Add to quick lookup data structures */
@@ -1117,10 +1113,10 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, 


void vm_userspace_mem_region_add(struct kvm_vm *vm,

				 enum vm_mem_backing_src_type src_type,

				 uint64_t guest_paddr, uint32_t slot,

				 uint64_t npages, uint32_t flags)

				 uint64_t gpa, uint32_t slot, uint64_t npages,

				 uint32_t flags)

{

	vm_mem_add(vm, src_type, guest_paddr, slot, npages, flags, -1, 0);

	vm_mem_add(vm, src_type, gpa, slot, npages, flags, -1, 0);

}



/*