Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94a980c3 authored by Ben Gardon's avatar Ben Gardon Committed by Paolo Bonzini
Browse files

kvm: selftests: Fix region overlap check in kvm_util 



Fix a call to userspace_mem_region_find to conform to its spec of
taking an inclusive, inclusive range. It was previously being called
with an inclusive, exclusive range. Also remove a redundant region bounds
check in vm_userspace_mem_region_add. Region overlap checking is already
performed by the call to userspace_mem_region_find.

Tested: Compiled tools/testing/selftests/kvm with -static
	Ran all resulting test binaries on an Intel Haswell test machine
	All tests passed

Signed-off-by: default avatarBen Gardon <bgardon@google.com>
Reviewed-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8997f657

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

+2 −7
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, 
	 * already exist.

	 */

	region = (struct userspace_mem_region *) userspace_mem_region_find(

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

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

	if (region != NULL)

		TEST_ASSERT(false, "overlapping userspace_mem_region already "

			"exists\n"
@@ -587,15 +587,10 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, 
		region = region->next) {

		if (region->region.slot == slot)

			break;

		if ((guest_paddr <= (region->region.guest_phys_addr

				+ region->region.memory_size))

			&& ((guest_paddr + npages * vm->page_size)

				>= region->region.guest_phys_addr))

			break;

	}

	if (region != NULL)

		TEST_ASSERT(false, "A mem region with the requested slot "

			"or overlapping physical memory range already exists.\n"

			"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,