From: Isaku Yamahata <isaku.yamahata@xxxxxxxxx>
The last test in test_add_overlapping_private_memory_regions() doesn't use
overlapping regions resulting in the failure. When the region is overlaps
with the existing ones, the error code is EEXIST instead of EINVAL. Pass
the overlapping region, and check if the errno is EEXIST.
Fixes: bdb645960cb5 ("KVM: selftests: Expand set_memory_region_test to validate guest_memfd()")
Signed-off-by: Isaku Yamahata <isaku.yamahata@xxxxxxxxx>
---
.../selftests/kvm/set_memory_region_test.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/kvm/set_memory_region_test.c b/tools/testing/selftests/kvm/set_memory_region_test.c
index f46841843300..ea7da324c4d6 100644
--- a/tools/testing/selftests/kvm/set_memory_region_test.c
+++ b/tools/testing/selftests/kvm/set_memory_region_test.c
@@ -432,6 +432,7 @@ static void test_add_overlapping_private_memory_regions(void)
{
struct kvm_vm *vm;
int memfd;
+ int r;
pr_info("Testing ADD of overlapping KVM_MEM_PRIVATE memory regions\n");
@@ -453,8 +454,19 @@ static void test_add_overlapping_private_memory_regions(void)
vm_set_user_memory_region2(vm, MEM_REGION_SLOT, KVM_MEM_PRIVATE,
MEM_REGION_GPA, 0, NULL, -1, 0);
- test_invalid_guest_memfd(vm, memfd, MEM_REGION_SIZE,
- "Overlapping guest_memfd() bindings should fail");
+ r = __vm_set_user_memory_region2(vm, MEM_REGION_SLOT, KVM_MEM_PRIVATE,
+ MEM_REGION_GPA * 2 - MEM_REGION_SIZE,
+ MEM_REGION_SIZE * 2,
+ 0, memfd, 0);
+ TEST_ASSERT(r == -1 && errno == EEXIST, "%s",
+ "Overlapping guest_memfd() bindings should fail");
+
+ r = __vm_set_user_memory_region2(vm, MEM_REGION_SLOT, KVM_MEM_PRIVATE,
+ MEM_REGION_GPA * 2 + MEM_REGION_SIZE,
+ MEM_REGION_SIZE * 2,
+ 0, memfd, 0);
+ TEST_ASSERT(r == -1 && errno == EEXIST, "%s",
+ "Overlapping guest_memfd() bindings should fail");
close(memfd);
kvm_vm_free(vm);
--
2.25.1
