[PATCH v11 43/46] KVM: selftests: Support guest_memfd attributes in private_mem_conversions_test

[Ackerley Tng]

Update private_mem_conversions_test to support environments where
guest_memfd tracks memory attributes.

At guest_memfd setup time, initialize the guest_memfd as shared to align
with how memory would default to shared when shared/private state was
tracked at the VM level.

When handling a hypercall to set attributes, use
vm_mem_set_memory_attributes() to send the ioctl to the guest_memfd instead
of the VM.

Suggested-by: Xiaoyao Li <xiaoyao...@intel.com>
Signed-off-by: Ackerley Tng <ackerley...@google.com>
---
 .../selftests/kvm/x86/private_mem_conversions_test.c   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 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 cf50e9a332c5b..0c94e36575a5e 100644
--- a/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c
+++ b/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c
@@ -306,9 +306,12 @@ static void handle_exit_hypercall(struct kvm_vcpu *vcpu)
        if (do_fallocate)
                vm_guest_mem_fallocate(vm, gpa, size, map_shared);
 
-       if (set_attributes)
-               vm_set_memory_attributes(vm, gpa, size,
-                                        map_shared ? 0 : 
KVM_MEMORY_ATTRIBUTE_PRIVATE);
+       if (set_attributes) {
+               u64 attrs = map_shared ? 0 : KVM_MEMORY_ATTRIBUTE_PRIVATE;
+
+               vm_mem_set_memory_attributes(vm, gpa, size, attrs);
+       }
+
        run->hypercall.ret = 0;
 }
 
@@ -383,6 +386,7 @@ static void test_mem_conversions(enum 
vm_mem_backing_src_type src_type, u32 nr_v
        struct kvm_vcpu *vcpus[KVM_MAX_VCPUS];
        pthread_t threads[KVM_MAX_VCPUS];
        struct kvm_vm *vm;
+       u64 gmem_flags;
        int memfd, i;
 
        const struct vm_shape shape = {
@@ -397,12 +401,16 @@ static void test_mem_conversions(enum 
vm_mem_backing_src_type src_type, u32 nr_v
 
        vm_enable_cap(vm, KVM_CAP_EXIT_HYPERCALL, (1 << KVM_HC_MAP_GPA_RANGE));
 
-       memfd = vm_create_guest_memfd(vm, memfd_size, 0);
+       gmem_flags = 0;
+       if (kvm_has_gmem_attributes)
+               gmem_flags |= GUEST_MEMFD_FLAG_INIT_SHARED;
+
+       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,
                           BASE_DATA_SLOT + i, slot_size / vm->page_size,
-                          KVM_MEM_GUEST_MEMFD, memfd, slot_size * i, 0);
+                          KVM_MEM_GUEST_MEMFD, memfd, slot_size * i, 
gmem_flags);
 
        for (i = 0; i < nr_vcpus; i++) {
                gpa_t gpa =  BASE_DATA_GPA + i * per_cpu_size;

-- 
2.55.0.887.g758fc8c411-goog