From nobody Wed Oct 1 23:32:10 2025 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 56D392F6164 for ; Fri, 26 Sep 2025 16:31:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758904287; cv=none; b=mRmn6Ng3SKN7KzjFOshEfxJeS3JbwtqLyiD/9JCX8SlDxQvncw6joDxCNPWpiLIlP5u956js0zXXuHO2h6IkkJ2aFNPnOh2lWzqrjMmEVyHMwl1hpsYwM2L+oDqUL9bhlZ1hCubBSKpQz2TiPh7gIoWs1WauedA5+ipZOlW6iLA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758904287; c=relaxed/simple; bh=MAGU8L12jB8wVEW47uqOWIWiTe/Qj22xQ0Pomduj5Gs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=HH8sIFuDa3f9yN5Vw8jTc3MirHUc06C4w50aT2GLleVAOrqAzcMKPaDPPXunuY8+PZXHwr64EoEouBi0uEZpC1+337McgguZJ3/VvYKHFe15vAAqRC46rbxtRaCu+v1CAOXaz7EvRHnM0vwT4baaXmkJkf3Ef0Gh9yKrbHP8Uyo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=I+ZGRbUr; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="I+ZGRbUr" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3307af9b55eso2220268a91.2 for ; Fri, 26 Sep 2025 09:31:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1758904286; x=1759509086; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=mLOzX8BBzpvK79s3HUFrSzFihc7sYmH8hFEiPkJQUNg=; b=I+ZGRbUrVx/A1jacn3tdkiyIIkBFtLnTTfREBnJPyCx3tIRSPQZv+EYqXRFNE3EndM 7fwzXuzSSb7Q+C8crIMper7EvDGgJdY+LW1sW+bEwymc0KAhTYrCAvH5ITqrKP0lwPA/ OfOQ48E6nxiu+sM/xQPyMvfbKwxh4UXElPVUPflhOtiOFfVr/Y0R5gACtoBPDBMZvjcA bIXOWFSsdfZOzLkI90ALTHojzPMnrDsLRFzojsm3h5W6PD6mGb4wpHCJVLvacBc+++S6 zlRzPPzRGkWJhpgo+p0eXkbn5wBTR6h8Y8vp1X69hVp+ZHo0lYGs0+rV9TtorD+33g5J Ij8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758904286; x=1759509086; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=mLOzX8BBzpvK79s3HUFrSzFihc7sYmH8hFEiPkJQUNg=; b=kNjxsWNValA7BDtUr8BA3NXKX9NHNWmwjf/x6lH8R7/jJQwTlJsyQc5fNNjTwyFdKB GQMvLwsKW///+mhMzo0jwVicB+cicMdOVeaNWXxTP789fjjHIma6rgpWEs5HohR3GgXo Smkk/3KgUKhVjkIoNIMizBGcyFKORinqwAEbatj1XuE1PWmVCiaeL7OJ4HPrVx5Jai15 kR5YAHZk8fVOeicVeMAeDZ0DZGVVZ1oAJxm4TM9bHmG/TIJ0/XN02utIZ+zDch98fvti iw7VN+ovcQAzzioy0yvhTduJ9XLXwfOSoTekJGMPW0MIApG5Mknmy1Q0BkoXvaZ+ihjb jJ/w== X-Forwarded-Encrypted: i=1; AJvYcCWHaT+t4Pe+gbRT8AhfeZfddx2qxLWUD2wQVPEb9y1aId4mJenPX0nB+rf+tXU9Zw8yfVL9ipm9XiJOQS4=@vger.kernel.org X-Gm-Message-State: AOJu0Yy04wtyJ4oPjopgcKyCYwJusWKKeUJQ5oExcHV8QwO+1IEHJNx5 T6NdzEiKPv4lLxtgYW/IWzqJ9+tRXHcqfAvbDFkqYuyA6prbypswb+fwGTy4KOghhftnJfJ1dJT VFWPBbg== X-Google-Smtp-Source: AGHT+IHkMCOD5/dHxBWIFTEBy3wYtTT/yvxoDVojAwCUGYoSg7l/3kr2egBxNpTIWTnHjRUN0RtqQ3g60JM= X-Received: from pjyt11.prod.google.com ([2002:a17:90a:e50b:b0:32f:3fab:c9e7]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4a4c:b0:32e:8c14:5d09 with SMTP id 98e67ed59e1d1-3342a23718dmr7605186a91.7.1758904285619; Fri, 26 Sep 2025 09:31:25 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 26 Sep 2025 09:31:04 -0700 In-Reply-To: <20250926163114.2626257-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250926163114.2626257-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.536.g15c5d4f767-goog Message-ID: <20250926163114.2626257-4-seanjc@google.com> Subject: [PATCH 3/6] KVM: selftests: Create a new guest_memfd for each testcase From: Sean Christopherson To: Paolo Bonzini , Christian Borntraeger , Janosch Frank , Claudio Imbrenda Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, David Hildenbrand , Fuad Tabba , Sean Christopherson , Ackerley Tng Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Sean Christopherson Reviewed-by: Ackerley Tng Reviewed-by: David Hildenbrand Reviewed-by: Fuad Tabba Tested-by: Fuad Tabba --- .../testing/selftests/kvm/guest_memfd_test.c | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing= /selftests/kvm/guest_memfd_test.c index 8251d019206a..60c6dec63490 100644 --- a/tools/testing/selftests/kvm/guest_memfd_test.c +++ b/tools/testing/selftests/kvm/guest_memfd_test.c @@ -26,7 +26,7 @@ =20 static size_t page_size; =20 -static void test_file_read_write(int fd) +static void test_file_read_write(int fd, size_t total_size) { char buf[64]; =20 @@ -259,14 +259,18 @@ static void test_guest_memfd_flags(struct kvm_vm *vm,= uint64_t valid_flags) } } =20 +#define gmem_test(__test, __vm, __flags) \ +do { \ + int fd =3D vm_create_guest_memfd(__vm, page_size * 4, __flags); \ + \ + test_##__test(fd, page_size * 4); \ + close(fd); \ +} while (0) + static void test_guest_memfd(unsigned long vm_type) { uint64_t flags =3D 0; struct kvm_vm *vm; - size_t total_size; - int fd; - - total_size =3D page_size * 4; =20 vm =3D vm_create_barebones_type(vm_type); =20 @@ -276,24 +280,21 @@ static void test_guest_memfd(unsigned long vm_type) test_create_guest_memfd_multiple(vm); test_create_guest_memfd_invalid_sizes(vm, flags); =20 - fd =3D vm_create_guest_memfd(vm, total_size, flags); - - test_file_read_write(fd); + gmem_test(file_read_write, vm, flags); =20 if (flags & GUEST_MEMFD_FLAG_MMAP) { - test_mmap_supported(fd, total_size); - test_fault_overflow(fd, total_size); + gmem_test(mmap_supported, vm, flags); + gmem_test(fault_overflow, vm, flags); } else { - test_mmap_not_supported(fd, total_size); + gmem_test(mmap_not_supported, vm, flags); } =20 - test_file_size(fd, total_size); - test_fallocate(fd, total_size); - test_invalid_punch_hole(fd, total_size); + gmem_test(file_size, vm, flags); + gmem_test(fallocate, vm, flags); + gmem_test(invalid_punch_hole, vm, flags); =20 test_guest_memfd_flags(vm, flags); =20 - close(fd); kvm_vm_free(vm); } =20 --=20 2.51.0.536.g15c5d4f767-goog