Cover the scenario that the guest can fault in and write gmem-backed
guest memory even if its direct map removed.

Signed-off-by: Patrick Roy <roy...@amazon.co.uk>
---
 .../selftests/kvm/x86/private_mem_conversions_test.c       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c 
b/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c
index 82a8d88b5338..dfc78781e93b 100644
--- a/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c
+++ b/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c
@@ -367,7 +367,7 @@ static void *__test_mem_conversions(void *__vcpu)
 }
 
 static void test_mem_conversions(enum vm_mem_backing_src_type src_type, 
uint32_t nr_vcpus,
-                                uint32_t nr_memslots)
+                                uint32_t nr_memslots, uint64_t gmem_flags)
 {
        /*
         * Allocate enough memory so that each vCPU's chunk of memory can be
@@ -394,7 +394,7 @@ static void test_mem_conversions(enum 
vm_mem_backing_src_type src_type, uint32_t
 
        vm_enable_cap(vm, KVM_CAP_EXIT_HYPERCALL, (1 << KVM_HC_MAP_GPA_RANGE));
 
-       memfd = vm_create_guest_memfd(vm, memfd_size, 0);
+       memfd = vm_create_guest_memfd(vm, memfd_size, gmem_flags);
 
        for (i = 0; i < nr_memslots; i++)
                vm_mem_add(vm, src_type, BASE_DATA_GPA + slot_size * i,
@@ -477,7 +477,8 @@ int main(int argc, char *argv[])
                }
        }
 
-       test_mem_conversions(src_type, nr_vcpus, nr_memslots);
+       test_mem_conversions(src_type, nr_vcpus, nr_memslots, 0);
+       test_mem_conversions(src_type, nr_vcpus, nr_memslots, 
KVM_GMEM_NO_DIRECT_MAP);
 
        return 0;
 }
-- 
2.48.1


Reply via email to