Received: from mail-oo1-f74.google.com (mail-oo1-f74.google.com [209.85.161.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 764E23F2117 for ; Thu, 2 Apr 2026 17:31:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775151070; cv=none; b=Opwbo4qsfw4eVmcN9Qlrgz9iXmkIahDarxm973p1aype60HK+ntfVhn6Nh3ervKnp9XZC3KL9jpW+FSXqybMvxINSHxaIGrP2tflF/kZ4u78a4NfSW2Uu1NO0gRPGuxdDZJTfbQrIkGo81LbqdGxipGbVlWgySDSVsbYsJQbA50= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775151070; c=relaxed/simple; bh=5kAapb6H3jt5z27uMf4lcYsqLp7SZXEPQi7pHGIiIrA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=pW+oKQzvBkk09u0naVvvCOdChwh7pLlQz8PBFU0RDSgxvjnV6EW2s/tADQFHJXPRs5kkCFtfHH6aQzyCUrmX5F1n6tBkJGQbQfPQ88dxoi2i8g5HfoN9YMyuXo02h9Jk/VDuov0nHN2Xad+lZLbUNPboZEXgEpYuZ2BP3eDBw04= 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=rrZOkrFO; arc=none smtp.client-ip=209.85.161.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--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="rrZOkrFO" Received: by mail-oo1-f74.google.com with SMTP id 006d021491bc7-67df8dd0e26so1454212eaf.1 for ; Thu, 02 Apr 2026 10:31:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1775151068; x=1775755868; 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=HXv7N1eCd4/DFCswAatT4Z+rDzWVRHHu2CK7LpYrXaw=; b=rrZOkrFOIj6lUdEasflt3dMvsE4Sq4Xaai+pFZvoIXJS2xcsCOByimIFElDs0B/9tG uIRygW5ZmkwiQ4QgVHpVa4yxQ9RsjQTiDrz+CRUkO17E4ZCggBmCF1ShoPcQHtrf29GM MdEYmrHhbn0DPlkREMbi2kSIG1h9dksujDLc8W62MHkR7uewLi+qZ0Zn1BA5kPNUe7UD mfzz3ZWx39ELG2B6YLHr5YeAw8ZF8ylZfO79ht87BB/DEaXr+h9vw4oxTB2OnHu5vv2Q he5HgALURYNvUeo+sVyFVmzRk4nFUNrw5LRe/D03/DCoaN21EFOgOoZks4wWVHsOIVzN 5e4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775151068; x=1775755868; 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=HXv7N1eCd4/DFCswAatT4Z+rDzWVRHHu2CK7LpYrXaw=; b=WIpmOGj1fhAeqz3Bh927Y7Dpe08MVBQC5cilSaElAT+SULY48WNd/1H0CWsDWxdKpR 8Giyk/a1oxrlVWNhEeZpmECtZM8ge/x74z2dWpHn0uF17TB3w1aCwVoq0kAc7A177fMZ REh+qvX5RqOW4g2GzDJpPG3hJQ+qC7MlGP6DJkyOHV7IwM91L5eaDYAJIWrdQXzVKU3B 1CrkdxXu/1sxM2eLffiirQNxCzlk312b0K7pHBsUAa7j+LNhkwlf6XmInkGWXIYTwwJO gkRJWfOsEqnhsDOjhPJ2JYeynR2Fpv0teiAzbVRexMxMaIBCSyJwsmadG4VLJI82tB3e nJKA== X-Forwarded-Encrypted: i=1; AJvYcCUmQ/F+85dK/EtilKG+VIfxtQ+IzlN8sOlpcDiqFn9cBSl4u4nndeTqaWedTvSmJk/BBLQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwaQMAkVHevvd5vrE+FUYY2f6ZALN8WnhGF4RrrGG+jo0uWWYkX qqVRvBnj7EEvM9hkjYeTVBV7EGBx4n9EGqPnncBFfdaObw202jN2oZyNVHLay1GCZn98nMJ9yEb KSbzjmsnIVg== X-Received: from jabko12.prod.google.com ([2002:a05:6638:8f0c:b0:5d3:9f1b:b8a0]) (user=rananta job=prod-delivery.src-stubby-dispatcher) by 2002:a4a:e911:0:b0:681:a608:5e99 with SMTP id 006d021491bc7-6821d23824emr36944eaf.11.1775151068318; Thu, 02 Apr 2026 10:31:08 -0700 (PDT) Date: Thu, 2 Apr 2026 17:30:56 +0000 In-Reply-To: <20260402173059.1018805-1-rananta@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260402173059.1018805-1-rananta@google.com> X-Mailer: git-send-email 2.53.0.1213.gd9a14994de-goog Message-ID: <20260402173059.1018805-6-rananta@google.com> Subject: [PATCH v7 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-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_device.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_pci_device *device, const char *vfio_pci_get_cdev_path(const char *bdf); +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/testing/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 *device) ioctl_assert(device->fd, VFIO_DEVICE_RESET, NULL); } -static void vfio_pci_group_setup(struct vfio_pci_device *device, const char *bdf) +void vfio_pci_group_setup(struct vfio_pci_device *device, const char *bdf) { struct vfio_group_status group_status = { .argsz = 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); } -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]; @@ -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); device->fd = 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); } -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 = device->iommu; unsigned long iommu_type = iommu->mode->iommu_type; int ret; - vfio_pci_group_setup(device, bdf); - ret = ioctl(iommu->container_fd, VFIO_CHECK_EXTENSION, iommu_type); VFIO_ASSERT_GT(ret, 0, "VFIO IOMMU type %lu not supported\n", iommu_type); @@ -259,7 +262,13 @@ static void vfio_pci_container_setup(struct vfio_pci_device *device, * because the IOMMU type is already set. */ (void)ioctl(iommu->container_fd, VFIO_SET_IOMMU, (void *)iommu_type); +} +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); } @@ -321,8 +330,7 @@ const char *vfio_pci_get_cdev_path(const char *bdf) return cdev_path; } -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 = { .argsz = sizeof(args), @@ -336,7 +344,18 @@ static void vfio_device_bind_iommufd(int device_fd, int iommufd, args.token_uuid_ptr = (u64)token_uuid; } - 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 = __vfio_device_bind_iommufd(device_fd, iommufd, vf_token); + + VFIO_ASSERT_EQ(ret, 0, "Failed VFIO_DEVICE_BIND_IOMMUFD ioctl\n"); } 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); } -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 = vfio_pci_get_cdev_path(bdf); device->fd = open(cdev_path, O_RDWR); VFIO_ASSERT_GE(device->fd, 0); free((void *)cdev_path); +} +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); } -- 2.53.0.1213.gd9a14994de-goog