From nobody Thu Apr 2 09:28:57 2026 Received: from mail-ot1-f73.google.com (mail-ot1-f73.google.com [209.85.210.73]) (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 DE683381AE7 for ; Tue, 3 Mar 2026 19:38:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772566717; cv=none; b=CWsW7OZ2DoFHHXOfldwvKHkiSv1S1ccRB2xiDm5jE9bDbbRdE+2LU9c/rq33ssk0QouzFqaR1ME5fcWsjSCa1OKZpE5vHiHUChLexMZWF3eHsZrzqJctAC4vPCMDiOGTvDcrpy61ZJ5fLWzvs7y9dzvJqRttfKdabh3TPRAbg3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772566717; c=relaxed/simple; bh=oxhmS7APbnCUHGUofsuGlwO+hnUqBHnMlenmB97s6rM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=iZVT0j3TBs6swJ0QLZWrI/o4shIJuptW/BnzVfsxK6sx6PPyxwcpeaJglsU2ZQUEP570cNN+iCQKKUvwnflbV/KmpayeNtu+vxpTzCrk4RyeYjV69a0orUaAIP2knGR7LEK1w+r4J2sIJKBDELwHAImm1o9yb06pbzkG3/YCs6Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--rananta.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=fM25oWYW; arc=none smtp.client-ip=209.85.210.73 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--rananta.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="fM25oWYW" Received: by mail-ot1-f73.google.com with SMTP id 46e09a7af769-7d4c7afa9e0so70478061a34.0 for ; Tue, 03 Mar 2026 11:38:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1772566713; x=1773171513; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=UbzD3tYuZ5OwHztPK3YrRtp3AOj3URoZ8XrfGPi4048=; b=fM25oWYWWwNF/p+Mh58CuzNtB4ykFGyYkQZuj63ioCnYuZUoq0QKGIwFCysm2nWDxR KN5RyCAI7JsV6pZ3K2x6B5iGEy9Falj/wuOhmRdmqnBP4bdDDAUUn/44mCdLSs2WaMlO QHVRzlN5xjYN9RmZZwJcy80yuRnuVmv7qD4EW9oyp5bJWC25txWB30AQ2JLOgHdAqet5 3qm1wW7xpTmVQkuvoIfs7sXda6cCOEneKT5G/1ALfi3+pkW3927IgKXN+aP633gK6NqC mdn835Dnlpz55+0AWun/pan/DFSu9++qsV3h8erJuovvZy0z8pZz9iPrZMfnPntp6ujG KoCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772566713; x=1773171513; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UbzD3tYuZ5OwHztPK3YrRtp3AOj3URoZ8XrfGPi4048=; b=qlE1cbIJfjZD/363fT+E3d9O/XOoAPkqVfLDyP6EviuMCamvnM3xctlZ9RalWPtVRi eY/ZkoZT+L5XwHWpNWUEvHsdXx/Z3pZUJ4hnugC2WtMEZKE0ZoPo5RX9O3yztjCX9zhn wsz/74E2zBuuXctRrk/0sOT7JV8Xza19nFfjh5GqKSW9SrFb2tANMzu5QVfNbEz+DMkR QGkh6QRyZ2u14NDiKBdV0MAFVAYPUNzlNaC1jJ4j20Pv7M2zA0EDmsj4axA+yp4V2764 wwaN9X2sTjJHO8RoWSDrp2RUOgPT+wJue1Z4tD4VM6S2arpBtH2rVfaaySkXdtlSViHI aMbQ== X-Forwarded-Encrypted: i=1; AJvYcCWZLeG5Pug46CMIvfHCsaNiS5qEK6NR42onQYf4ZorEPehUojwYOrwRUyEYURG49IsDTswQSAWOTMNXXiE=@vger.kernel.org X-Gm-Message-State: AOJu0YxeVITUQBhiiYxQHFsJwL1DXD3GPt8nKDacoQWj8pFz8R6fUt1Q lbfsvYQ5kt4fLawOWEUnfJV4MvcS4WNclRHKOPXjw96AGF9ruPkeF+/ZHz0mw3QJlh8jR6pjmXI YF8/kE1+Kaw== X-Received: from iols5.prod.google.com ([2002:a5d:9145:0:b0:95f:753b:ff52]) (user=rananta job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6820:1b10:b0:678:f8f3:d6cb with SMTP id 006d021491bc7-679fadc2b58mr11868852eaf.6.1772566712613; Tue, 03 Mar 2026 11:38:32 -0800 (PST) Date: Tue, 3 Mar 2026 19:38:19 +0000 In-Reply-To: <20260303193822.2526335-1-rananta@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260303193822.2526335-1-rananta@google.com> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog Message-ID: <20260303193822.2526335-6-rananta@google.com> Subject: [PATCH v6 5/8] vfio: selftests: Expose more vfio_pci_device functions From: Raghavendra Rao Ananta To: David Matlack , Alex Williamson Cc: Vipin Sharma , Josh Hilke , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Raghavendra Rao Ananta Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Refactor and make the functions called under device initialization public. A later patch adds a test that calls these functions to validate the UAPI of SR-IOV devices. Opportunistically, to test the success and failure cases of the UAPI, split the functions dealing with VFIO_GROUP_GET_DEVICE_FD and VFIO_DEVICE_BIND_IOMMUFD into a core function and another one that asserts the ioctl. The former will be used for testing the SR-IOV UAPI, hence only export these. Signed-off-by: Raghavendra Rao Ananta Reviewed-by: David Matlack --- .../lib/include/libvfio/vfio_pci_device.h | 7 +++ .../selftests/vfio/lib/vfio_pci_device.c | 47 ++++++++++++++----- 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_devi= ce.h b/tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_device.h index 2858885a89bbb..898de032fed5a 100644 --- a/tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_device.h +++ b/tools/testing/selftests/vfio/lib/include/libvfio/vfio_pci_device.h @@ -122,4 +122,11 @@ static inline bool vfio_pci_device_match(struct vfio_p= ci_device *device, =20 const char *vfio_pci_get_cdev_path(const char *bdf); =20 +void vfio_pci_group_setup(struct vfio_pci_device *device, const char *bdf); +void __vfio_pci_group_get_device_fd(struct vfio_pci_device *device, + const char *bdf, const char *vf_token); +void vfio_container_set_iommu(struct vfio_pci_device *device); +void vfio_pci_cdev_open(struct vfio_pci_device *device, const char *bdf); +int __vfio_device_bind_iommufd(int device_fd, int iommufd, const char *vf_= token); + #endif /* SELFTESTS_VFIO_LIB_INCLUDE_LIBVFIO_VFIO_PCI_DEVICE_H */ diff --git a/tools/testing/selftests/vfio/lib/vfio_pci_device.c b/tools/tes= ting/selftests/vfio/lib/vfio_pci_device.c index dc8b37df8d1f1..3123ba591f088 100644 --- a/tools/testing/selftests/vfio/lib/vfio_pci_device.c +++ b/tools/testing/selftests/vfio/lib/vfio_pci_device.c @@ -202,7 +202,7 @@ void vfio_pci_device_reset(struct vfio_pci_device *devi= ce) ioctl_assert(device->fd, VFIO_DEVICE_RESET, NULL); } =20 -static void vfio_pci_group_setup(struct vfio_pci_device *device, const cha= r *bdf) +void vfio_pci_group_setup(struct vfio_pci_device *device, const char *bdf) { struct vfio_group_status group_status =3D { .argsz =3D sizeof(group_status), @@ -222,8 +222,8 @@ static void vfio_pci_group_setup(struct vfio_pci_device= *device, const char *bdf ioctl_assert(device->group_fd, VFIO_GROUP_SET_CONTAINER, &device->iommu->= container_fd); } =20 -static void vfio_pci_group_get_device_fd(struct vfio_pci_device *device, - const char *bdf, const char *vf_token) +void __vfio_pci_group_get_device_fd(struct vfio_pci_device *device, + const char *bdf, const char *vf_token) { char arg[64]; =20 @@ -238,18 +238,21 @@ static void vfio_pci_group_get_device_fd(struct vfio_= pci_device *device, snprintf_assert(arg, ARRAY_SIZE(arg), "%s", bdf); =20 device->fd =3D ioctl(device->group_fd, VFIO_GROUP_GET_DEVICE_FD, arg); +} + +static void vfio_pci_group_get_device_fd(struct vfio_pci_device *device, + const char *bdf, const char *vf_token) +{ + __vfio_pci_group_get_device_fd(device, bdf, vf_token); VFIO_ASSERT_GE(device->fd, 0); } =20 -static void vfio_pci_container_setup(struct vfio_pci_device *device, - const char *bdf, const char *vf_token) +void vfio_container_set_iommu(struct vfio_pci_device *device) { struct iommu *iommu =3D device->iommu; unsigned long iommu_type =3D iommu->mode->iommu_type; int ret; =20 - vfio_pci_group_setup(device, bdf); - ret =3D ioctl(iommu->container_fd, VFIO_CHECK_EXTENSION, iommu_type); VFIO_ASSERT_GT(ret, 0, "VFIO IOMMU type %lu not supported\n", iommu_type); =20 @@ -259,7 +262,13 @@ static void vfio_pci_container_setup(struct vfio_pci_d= evice *device, * because the IOMMU type is already set. */ (void)ioctl(iommu->container_fd, VFIO_SET_IOMMU, (void *)iommu_type); +} =20 +static void vfio_pci_container_setup(struct vfio_pci_device *device, + const char *bdf, const char *vf_token) +{ + vfio_pci_group_setup(device, bdf); + vfio_container_set_iommu(device); vfio_pci_group_get_device_fd(device, bdf, vf_token); } =20 @@ -321,8 +330,7 @@ const char *vfio_pci_get_cdev_path(const char *bdf) return cdev_path; } =20 -static void vfio_device_bind_iommufd(int device_fd, int iommufd, - const char *vf_token) +int __vfio_device_bind_iommufd(int device_fd, int iommufd, const char *vf_= token) { struct vfio_device_bind_iommufd args =3D { .argsz =3D sizeof(args), @@ -336,7 +344,18 @@ static void vfio_device_bind_iommufd(int device_fd, in= t iommufd, args.token_uuid_ptr =3D (u64)token_uuid; } =20 - ioctl_assert(device_fd, VFIO_DEVICE_BIND_IOMMUFD, &args); + if (ioctl(device_fd, VFIO_DEVICE_BIND_IOMMUFD, &args)) + return -errno; + + return 0; +} + +static void vfio_device_bind_iommufd(int device_fd, int iommufd, + const char *vf_token) +{ + int ret =3D __vfio_device_bind_iommufd(device_fd, iommufd, vf_token); + + VFIO_ASSERT_EQ(ret, 0, "Failed VFIO_DEVICE_BIND_IOMMUFD ioctl\n"); } =20 static void vfio_device_attach_iommufd_pt(int device_fd, u32 pt_id) @@ -349,15 +368,19 @@ static void vfio_device_attach_iommufd_pt(int device_= fd, u32 pt_id) ioctl_assert(device_fd, VFIO_DEVICE_ATTACH_IOMMUFD_PT, &args); } =20 -static void vfio_pci_iommufd_setup(struct vfio_pci_device *device, - const char *bdf, const char *vf_token) +void vfio_pci_cdev_open(struct vfio_pci_device *device, const char *bdf) { const char *cdev_path =3D vfio_pci_get_cdev_path(bdf); =20 device->fd =3D open(cdev_path, O_RDWR); VFIO_ASSERT_GE(device->fd, 0); free((void *)cdev_path); +} =20 +static void vfio_pci_iommufd_setup(struct vfio_pci_device *device, + const char *bdf, const char *vf_token) +{ + vfio_pci_cdev_open(device, bdf); vfio_device_bind_iommufd(device->fd, device->iommu->iommufd, vf_token); vfio_device_attach_iommufd_pt(device->fd, device->iommu->ioas_id); } --=20 2.53.0.473.g4a7958ca14-goog