From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.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 81C4B2F49F6 for ; Thu, 28 May 2026 02:11:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779934284; cv=none; b=g/XlsJPqww8ynw6zvS/CR7akNFZ0JHl8+IWylNKKjvQ5OUKPCzHRgAU5wiz/Suszr4IYNdq927pZG72BMgkLjPaZZIpVVIVeIH6TQjPaaSzvRpsQgoToI3EySejmJvgLKqa56HTOLtMXW52qmu+ngRxzzZPMRArmkFCOyIWmUm0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779934284; c=relaxed/simple; bh=OOoGlX9f6OSAiQ3GyqX+LpIZQEspF/7CtixMWwK8oVA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ZzBLVW2hv04DRHgs3EDarh3LQScUs/J+suFSEAb44Mk7ia3d9Y669JzOuLRndqnpw/rcE2IcV3qfmGr9yLjT/lJg/Ew0ZG0S5/Nj4NoMnHtu/PBwtIg1nw1pJHW1kzW3vJDyXfebz1gG+fD5/l8HsWvhQeV0iqjt1v6/YrFXnOg= 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=tXzG6kJC; arc=none smtp.client-ip=209.85.210.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="tXzG6kJC" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-82f74bcfb86so14256788b3a.0 for ; Wed, 27 May 2026 19:11:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779934282; x=1780539082; 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=EY3B0s+cLLSBGjN5PAA77gPX+Mj+wDNCxr2wXa+aBFE=; b=tXzG6kJCnqz0OL1shbPreiipKyflvDboCmnwRjPfNHTfMgghxeQLl5+5Xvm+WH9o4A mlMFcbyoy3vzyGM2GZ/r+a8c3jvppu/diIg2Q42GZ5gX0ZzDPiBRFRsnoJV7D1XPoAgn GCZKlXBOApvVi1H9znvMXhHOdB/SAOtJ9oPysOvcqJbXlIZ/7uIRnvAsQWbkLvSyWpK+ 6tnUwwlDv37RDbgV+xjBFyDCXA1NT5K9f2U4PnbP26NQx+YONgLn0sRaOCK539dz3Gtk znzUXaC+ofRbUhVZS2bUCD4easZrwVCA2cji3Tdy1xvYnI4z55BVSeQoMXDULbhGvLOq j7RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779934282; x=1780539082; 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=EY3B0s+cLLSBGjN5PAA77gPX+Mj+wDNCxr2wXa+aBFE=; b=PElA18GQXucRDyOzXs5i1v0EMc6OjVx9oQaRu140TtyDNcmY2jqJrEfjFnzu/y8w7m zH7oca5BAbGMrro0rLoNAOINfY/a2GU3YWi31x4avJ6jNmRTK4csw4d1KAc+ZTUkOXdE EjJ1smJGv2yPu+6XLOtO4WxJSXFJvtJDuAAo0Swvpx/tAcXNLGXuLc8UDtW3ie1xl3yf Sx/5bHEke3Ckt19e5IP2N3dlwbizrc8JUOeGii9TRPkc7DM9HI3j4Ztm4JeXw7hxRuuV OVaGTfuTZ+1tmZjcUXOAWgSokLjN/CxL+D/zU31GHcrOdAuUwKyjdlpcgfkta+tlKvNb /IIg== X-Forwarded-Encrypted: i=1; AFNElJ8hvAjGjlwicQfdrP769fnsD8lijctYEBELchkHUwxE5S4L703qtvkhdBhzIrwTKIS9hsZdEUOKDPVWlDQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxIH6FWxRy+i4D4vyXx61/cb3fNiXoZroGCAe+NgPyW/sBi1vkl bFNu3FbfGxHCgvkDy3oew+10jEQuefUH/xV5lVeyseYVJEnY4GOrV9rf/EqZptGeqq0ASgbOc9Q cCn5iEQ== X-Received: from pfau12.prod.google.com ([2002:a05:6a00:aa8c:b0:83f:24f:2ea7]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:ad02:b0:835:45bf:9659 with SMTP id d2e1a72fcca58-8415f37e604mr26029378b3a.41.1779934281643; Wed, 27 May 2026 19:11:21 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 27 May 2026 19:11:16 -0700 In-Reply-To: <20260528021117.107984-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: <20260528021117.107984-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.794.g4f17f83d09-goog Message-ID: <20260528021117.107984-3-seanjc@google.com> Subject: [PATCH v3 2/3] KVM: selftests: Expand the guest_memfd test macros to allow passing the VM From: Sean Christopherson To: Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Ackerley Tng , Sean Christopherson Content-Type: text/plain; charset="UTF-8" Expand the gmem test macros to allow passing the VM to testcases, without needing to plumb the VM into _every_ testcase, as the vast majority of testcases only need the fd and size. No functional change intended. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/guest_memfd_test.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing/selftests/kvm/guest_memfd_test.c index 832ef4dfb99f..246bb408ecc0 100644 --- a/tools/testing/selftests/kvm/guest_memfd_test.c +++ b/tools/testing/selftests/kvm/guest_memfd_test.c @@ -408,17 +408,26 @@ static void test_guest_memfd_flags(struct kvm_vm *vm) } } -#define __gmem_test(__test, __vm, __flags, __gmem_size) \ +#define ____gmem_test(__test, __vm, __flags, __gmem_size, args...) \ do { \ int fd = vm_create_guest_memfd(__vm, __gmem_size, __flags); \ \ - test_##__test(fd, __gmem_size); \ + test_##__test(args); \ close(fd); \ } while (0) +#define __gmem_test(__test, __vm, __flags, __gmem_size) \ + ____gmem_test(__test, __vm, __flags, __gmem_size, fd, __gmem_size) + #define gmem_test(__test, __vm, __flags) \ __gmem_test(__test, __vm, __flags, page_size * 4) +#define __gmem_test_vm(__test, __vm, __flags, __gmem_size) \ + ____gmem_test(__test, __vm, __flags, __gmem_size, __vm, fd, __gmem_size) + +#define gmem_test_vm(__test, __vm, __flags) \ + __gmem_test_vm(__test, __vm, __flags, page_size * 4) + static void __test_guest_memfd(struct kvm_vm *vm, u64 flags) { test_create_guest_memfd_multiple(vm); -- 2.54.0.794.g4f17f83d09-goog