Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

KVM: selftests: Create a new guest_memfd for each testcase

Refactor the guest_memfd selftest to improve test isolation by creating a
a new guest_memfd for each testcase. Currently, the test reuses a single
guest_memfd instance for all testcases, and thus creates dependencies
between tests, e.g. not truncating folios from the guest_memfd instance
at the end of a test could lead to unexpected results (see the PUNCH_HOLE
purging that needs to done by in-flight the NUMA testcases[1]).

Invoke each test via a macro wrapper to create and close a guest_memfd
to cut down on the boilerplate copy+paste needed to create a test.

Link: https://lore.kernel.org/all/20250827175247.83322-10-shivankg@amd.com
Reported-by: Ackerley Tng <ackerleytng@google.com>
Reviewed-by: Fuad Tabba <tabba@google.com>
Tested-by: Fuad Tabba <tabba@google.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Ackerley Tng <ackerleytng@google.com>
Tested-by: Ackerley Tng <ackerleytng@google.com>
Link: https://lore.kernel.org/r/20251003232606.4070510-8-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>

+16 -15
+16 -15
tools/testing/selftests/kvm/guest_memfd_test.c
··· 26 26 27 27 static size_t page_size; 28 28 29 - static void test_file_read_write(int fd) 29 + static void test_file_read_write(int fd, size_t total_size) 30 30 { 31 31 char buf[64]; 32 32 ··· 260 260 } 261 261 } 262 262 263 + #define gmem_test(__test, __vm, __flags) \ 264 + do { \ 265 + int fd = vm_create_guest_memfd(__vm, page_size * 4, __flags); \ 266 + \ 267 + test_##__test(fd, page_size * 4); \ 268 + close(fd); \ 269 + } while (0) 270 + 263 271 static void test_guest_memfd(unsigned long vm_type) 264 272 { 265 273 struct kvm_vm *vm; 266 - size_t total_size; 267 274 uint64_t flags; 268 - int fd; 269 - 270 - total_size = page_size * 4; 271 275 272 276 vm = vm_create_barebones_type(vm_type); 273 277 flags = vm_check_cap(vm, KVM_CAP_GUEST_MEMFD_FLAGS); ··· 283 279 test_create_guest_memfd_multiple(vm); 284 280 test_create_guest_memfd_invalid_sizes(vm, flags); 285 281 286 - fd = vm_create_guest_memfd(vm, total_size, flags); 287 - 288 - test_file_read_write(fd); 282 + gmem_test(file_read_write, vm, flags); 289 283 290 284 if (flags & GUEST_MEMFD_FLAG_MMAP) { 291 - test_mmap_supported(fd, total_size); 292 - test_fault_overflow(fd, total_size); 285 + gmem_test(mmap_supported, vm, flags); 286 + gmem_test(fault_overflow, vm, flags); 293 287 } else { 294 - test_mmap_not_supported(fd, total_size); 288 + gmem_test(mmap_not_supported, vm, flags); 295 289 } 296 290 297 - test_file_size(fd, total_size); 298 - test_fallocate(fd, total_size); 299 - test_invalid_punch_hole(fd, total_size); 291 + gmem_test(file_size, vm, flags); 292 + gmem_test(fallocate, vm, flags); 293 + gmem_test(invalid_punch_hole, vm, flags); 300 294 301 295 test_guest_memfd_flags(vm); 302 296 303 - close(fd); 304 297 kvm_vm_free(vm); 305 298 } 306 299