Commit 8d99e347 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: selftests: Convert lib's mem regions to KVM_SET_USER_MEMORY_REGION2 



Use KVM_SET_USER_MEMORY_REGION2 throughout KVM's selftests library so that
support for guest private memory can be added without needing an entirely
separate set of helpers.

Note, this obviously makes selftests backwards-incompatible with older KVM
versions from this point forward.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20231027182217.3615211-26-seanjc@google.com>
Reviewed-by: default avatarFuad Tabba <tabba@google.com>
Tested-by: default avatarFuad Tabba <tabba@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 335869c3

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

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ typedef uint64_t vm_paddr_t; /* Virtual Machine (Guest) physical address */ 
typedef uint64_t vm_vaddr_t; /* Virtual Machine (Guest) virtual address */



struct userspace_mem_region {

	struct kvm_userspace_memory_region region;

	struct kvm_userspace_memory_region2 region;

	struct sparsebit *unused_phy_pages;

	int fd;

	off_t offset;

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

+10 −9
Original line number Diff line number Diff line
@@ -453,8 +453,9 @@ void kvm_vm_restart(struct kvm_vm *vmp) 
		vm_create_irqchip(vmp);



	hash_for_each(vmp->regions.slot_hash, ctr, region, slot_node) {

		int ret = ioctl(vmp->fd, KVM_SET_USER_MEMORY_REGION, &region->region);

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

		int ret = ioctl(vmp->fd, 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%llx size: 0x%llx",
@@ -657,7 +658,7 @@ static void __vm_mem_region_delete(struct kvm_vm *vm, 
	}



	region->region.memory_size = 0;

	vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION, &region->region);

	vm_ioctl(vm, KVM_SET_USER_MEMORY_REGION2, &region->region);



	sparsebit_free(&region->unused_phy_pages);

	ret = munmap(region->mmap_start, region->mmap_size);
@@ -1014,8 +1015,8 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, 
	region->region.guest_phys_addr = guest_paddr;

	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_REGION, &region->region);

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

	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",
@@ -1097,9 +1098,9 @@ void vm_mem_region_set_flags(struct kvm_vm *vm, uint32_t slot, uint32_t flags) 


	region->region.flags = flags;



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

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



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

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

		"  rc: %i errno: %i slot: %u flags: 0x%x",

		ret, errno, slot, flags);

}
@@ -1127,9 +1128,9 @@ void vm_mem_region_move(struct kvm_vm *vm, uint32_t slot, uint64_t new_gpa) 


	region->region.guest_phys_addr = new_gpa;



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

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



	TEST_ASSERT(!ret, "KVM_SET_USER_MEMORY_REGION failed\n"

	TEST_ASSERT(!ret, "KVM_SET_USER_MEMORY_REGION2 failed\n"

		    "ret: %i errno: %i slot: %u new_gpa: 0x%lx",

		    ret, errno, slot, new_gpa);

}