From nobody Wed Dec 17 21:14:19 2025 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 22F0F2DCBEB for ; Fri, 3 Oct 2025 23:26:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759533988; cv=none; b=U0UP9q+TjSDvY3xlBPbTH50InN8L+ml8CMDJuuFnWwiI3KE6PDNkwjOddCBeBw+BkVHw9dQhooByRvTqtBmMRv5VrnSh+wqjuTe8CqTd4JZH91uIfqPXos8ZZOYFlK7YPxJ2A02lGfsns1UEe8Y4s0CZa81UncsJr4mbRB2tQi8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759533988; c=relaxed/simple; bh=BhNjeYFnokF+ua1tIz2LPgXh7HZumKowhDkAoR9n5/Y=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hWKpEZpsZukUqn3H/MG3MrySmtTPmVR4g6+6rHUflGY+fALvNFA6MxfyvepSTjebf9modF/6rVdpkLeoyZLwKdjJlWf/fGvFuNU1O1j1rTOePmT12/vCxA1WBeZs46qntGlrnr41oEd6nYJ85bRGyDBG+Dv227jhmFeRh9LgWio= 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=cRQCnXHj; arc=none smtp.client-ip=209.85.214.202 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="cRQCnXHj" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2698b5fbe5bso30670135ad.0 for ; Fri, 03 Oct 2025 16:26:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759533986; x=1760138786; 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=xXKfxRFAWdW67r2vJNGKUvHwEwOyssnfYlc7e1a1sls=; b=cRQCnXHjIMiSJBqC7T4VhxM9qBrTFH1xG439IsB2THbwDY4JYU69VJMqGEUMwY9aJ6 xjA/vB5Zgjk6GacmAMQcy4Lj0AhV7NsXQIeEXayJI/t5vqaiO+1kmBffCt85zCwDVhcr B/Lqy0KbW4a3xIK37bZL2APzHmQTdSu6sLDzhaUVbGZqsrvel2tgzMQzfeKU6Mv59V24 kj2NY7EQ9KpJmO2MDmTziWcYj5JpxdXN1hoA1L0459wbHnPJe2UDA9eSXZjyUFGoUWEF TjykEUgHL07e2W1L9e4cvhCXPHpLzvA2u0gp710Qih7O4G7iO448FVwKKBlrRCWNi1uG km9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759533986; x=1760138786; 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=xXKfxRFAWdW67r2vJNGKUvHwEwOyssnfYlc7e1a1sls=; b=FhaL1GGPhACqsjUlpKlpDFHyDbY3Bp5qHLlFMYNtaOvfH2D00CVfry9YhiPvKe7xsm lRR4WzCCBHYYPJ0K+C6Q9xFyXuWj8abfz9fde+ZKVPVsxwhMoNAloT/As9UHit1F155g XWIMtj+vpHrJY2EqmDGglB9JsivM4j97PYBg3OaDNVOQoSyNVTIJ3exC5wPBlKxYEcQa Y2WMn8h721bRTmXueA3k1rXBRfcixw95vnnA56zQxtnPcvE8EvjzOjaKjKtJucUf9xVv m/3RYy7lBK0FzGAbrDAUnepL9ihEvNG2GAJOkfAUBrmcU+N90LaICCY0kGkNpURFS09W 6zFg== X-Forwarded-Encrypted: i=1; AJvYcCWT6JG0kfpnlJY5+1F0/9VBwMfixAPAxN9iXiM8evws8SZlqiiom0p70nTIPhvY6o9KcribALx9LVmeFD8=@vger.kernel.org X-Gm-Message-State: AOJu0YxnlzbpcpPvLqGsHd0+5MfCZ6xiQQPQCI/UE89s/UqN8sosnrGC 8i9ozWIObB0sVemGY3tGSVlgxyi6cNZi+n8lbuzluCkh+FEBM2URuL5md1NCQHivxBqP7UcYipu CUzVVLw== X-Google-Smtp-Source: AGHT+IHbwSDrgPwwBMoC86LZ0150nH47BB8TTUv2JzYBTbBocZiPvWuMmbMAGYRM+VW0iAgrepLc0aq8W/A= X-Received: from pjvh15.prod.google.com ([2002:a17:90a:db8f:b0:330:6eb8:6ae4]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:3845:b0:267:af07:6526 with SMTP id d9443c01a7336-28e9a693c63mr53558535ad.55.1759533986435; Fri, 03 Oct 2025 16:26:26 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 3 Oct 2025 16:26:01 -0700 In-Reply-To: <20251003232606.4070510-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: <20251003232606.4070510-1-seanjc@google.com> X-Mailer: git-send-email 2.51.0.618.g983fd99d29-goog Message-ID: <20251003232606.4070510-9-seanjc@google.com> Subject: [PATCH v2 08/13] KVM: selftests: Add test coverage for guest_memfd without GUEST_MEMFD_FLAG_MMAP From: Sean Christopherson To: Paolo Bonzini , Sean Christopherson , Christian Borntraeger , Janosch Frank , Claudio Imbrenda Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, David Hildenbrand , Fuad Tabba , Ackerley Tng Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ackerley Tng If a VM type supports KVM_CAP_GUEST_MEMFD_MMAP, the guest_memfd test will run all test cases with GUEST_MEMFD_FLAG_MMAP set. This leaves the code path for creating a non-mmap()-able guest_memfd on a VM that supports mappable guest memfds untested. Refactor the test to run the main test suite with a given set of flags. Then, for VM types that support the mappable capability, invoke the test suite twice: once with no flags, and once with GUEST_MEMFD_FLAG_MMAP set. This ensures both creation paths are properly exercised on capable VMs. Run test_guest_memfd_flags() only once per VM type since it depends only on the set of valid/supported flags, i.e. iterating over an arbitrary set of flags is both unnecessary and wrong. Signed-off-by: Ackerley Tng [sean: use double-underscores for the inner helper] Reviewed-by: Fuad Tabba Tested-by: Fuad Tabba Reviewed-by: David Hildenbrand Signed-off-by: Sean Christopherson --- .../testing/selftests/kvm/guest_memfd_test.c | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing= /selftests/kvm/guest_memfd_test.c index afdc4d3a956d..9f98a067ab51 100644 --- a/tools/testing/selftests/kvm/guest_memfd_test.c +++ b/tools/testing/selftests/kvm/guest_memfd_test.c @@ -268,18 +268,8 @@ do { \ close(fd); \ } while (0) =20 -static void test_guest_memfd(unsigned long vm_type) +static void __test_guest_memfd(struct kvm_vm *vm, uint64_t flags) { - struct kvm_vm *vm; - uint64_t flags; - - vm =3D vm_create_barebones_type(vm_type); - flags =3D vm_check_cap(vm, KVM_CAP_GUEST_MEMFD_FLAGS); - - /* This test doesn't yet support testing mmap() on private memory. */ - if (!(flags & GUEST_MEMFD_FLAG_INIT_SHARED)) - flags &=3D ~GUEST_MEMFD_FLAG_MMAP; - test_create_guest_memfd_multiple(vm); test_create_guest_memfd_invalid_sizes(vm, flags); =20 @@ -295,9 +285,24 @@ static void test_guest_memfd(unsigned long vm_type) gmem_test(file_size, vm, flags); gmem_test(fallocate, vm, flags); gmem_test(invalid_punch_hole, vm, flags); +} + +static void test_guest_memfd(unsigned long vm_type) +{ + struct kvm_vm *vm =3D vm_create_barebones_type(vm_type); + uint64_t flags; =20 test_guest_memfd_flags(vm); =20 + __test_guest_memfd(vm, 0); + + flags =3D vm_check_cap(vm, KVM_CAP_GUEST_MEMFD_FLAGS); + + /* MMAP should always be supported if INIT_SHARED is supported. */ + if (flags & GUEST_MEMFD_FLAG_INIT_SHARED) + __test_guest_memfd(vm, GUEST_MEMFD_FLAG_MMAP | + GUEST_MEMFD_FLAG_INIT_SHARED); + kvm_vm_free(vm); } =20 --=20 2.51.0.618.g983fd99d29-goog