kvm: selftests: Fix region overlap check in kvm_util
bgardon at google.com (Ben Gardon)
PATCH 1/1 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
--- tools/testing/selftests/kvm/lib/kvm_util.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
tools/testing/selftests/kvm/lib/kvm_util.c +1 -6
@@ -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,11 +587,6 @@ 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 "
Signature · 1 line
2.20.1.97.g81188d93c3-goog
drjones at redhat.com (Andrew Jones)
PATCH 1/1 kvm: selftests: Fix region overlap check in kvm_util
Quoted 21 lines · Ben Gardon
Fix a call to
userspace_mem_region_findto 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 invm_userspace_mem_region_add. Region overlap checking is already performed by the call touserspace_mem_region_find.Tested: Compiled
tools/testing/selftests/kvmwith -static
Ran all resulting test binaries on an Intel Haswell test machine All tests passedSigned-off-by Ben Gardon <bgardon at google.com>Reviewed-by Jim Mattson <jmattson at google.com>--- tools/testing/selftests/kvm/lib/kvm_util.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)tools/testing/selftests/kvm/lib/kvm_util.c +0
-0
tools/testing/selftests/kvm/lib/kvm_util.c void vm_userspace_mem_region_add(struct kvm_vm *vm, · line 574
Quoted 5 lines
tools/testing/selftests/kvm/lib/kvm_util.c +1
-1@@ -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 );
This should be '- 1', not '+ 1'.
Quoted 5 lines
tools/testing/selftests/kvm/lib/kvm_util.c +0
-0if (region !=NULL )TEST_ASSERT (false,"overlapping userspace_mem_region already " "exists\n"@@ -587,11 +587,6 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, region = region->next) {
tools/testing/selftests/kvm/lib/kvm_util.c void vm_userspace_mem_region_add(struct kvm_vm *vm, · line 592
Quoted 10 lines
tools/testing/selftests/kvm/lib/kvm_util.c +0
-5if (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 "
This assert's message also states "or overlapping physical memory range", which should now be removed.
Thanks,
drew