From: Yi Liu <yi.l.liu@intel.com>
To: alex.williamson@redhat.com, jgg@nvidia.com, kevin.tian@intel.com
Cc: mjrosato@linux.ibm.com, jasowang@redhat.com,
xudong.hao@intel.com, zhenzhong.duan@intel.com,
peterx@redhat.com, terrence.xu@intel.com,
chao.p.peng@linux.intel.com, linux-s390@vger.kernel.org,
yi.l.liu@intel.com, kvm@vger.kernel.org, lulu@redhat.com,
yanting.jiang@intel.com, joro@8bytes.org, nicolinc@nvidia.com,
yan.y.zhao@intel.com, intel-gfx@lists.freedesktop.org,
eric.auger@redhat.com, intel-gvt-dev@lists.freedesktop.org,
yi.y.sun@linux.intel.com, clegoate@redhat.com, cohuck@redhat.com,
shameerali.kolothum.thodi@huawei.com,
suravee.suthikulpanit@amd.com, robin.murphy@arm.com
Subject: [Intel-gfx] [PATCH v15 24/26] vfio: Move the IOMMU_CAP_CACHE_COHERENCY check in __vfio_register_dev()
Date: Tue, 18 Jul 2023 06:55:49 -0700 [thread overview]
Message-ID: <20230718135551.6592-25-yi.l.liu@intel.com> (raw)
In-Reply-To: <20230718135551.6592-1-yi.l.liu@intel.com>
The IOMMU_CAP_CACHE_COHERENCY check only applies to the physical devices
that are IOMMU-backed. But it is now in the group code. If want to compile
vfio_group infrastructure out, this check needs to be moved out of the group
code.
Another reason for this change is to fail the device registration for the
physical devices that do not have IOMMU if the group code is not compiled
as the cdev interface does not support such devices.
Suggested-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Tested-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
---
drivers/vfio/group.c | 10 ----------
drivers/vfio/vfio_main.c | 11 +++++++++++
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/vfio/group.c b/drivers/vfio/group.c
index 5c17ad812313..610a429c6191 100644
--- a/drivers/vfio/group.c
+++ b/drivers/vfio/group.c
@@ -682,16 +682,6 @@ static struct vfio_group *vfio_group_find_or_alloc(struct device *dev)
if (!iommu_group)
return ERR_PTR(-EINVAL);
- /*
- * VFIO always sets IOMMU_CACHE because we offer no way for userspace to
- * restore cache coherency. It has to be checked here because it is only
- * valid for cases where we are using iommu groups.
- */
- if (!device_iommu_capable(dev, IOMMU_CAP_CACHE_COHERENCY)) {
- iommu_group_put(iommu_group);
- return ERR_PTR(-EINVAL);
- }
-
mutex_lock(&vfio.group_lock);
group = vfio_group_find_from_iommu(iommu_group);
if (group) {
diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c
index ba1d84afe081..902f06e52c48 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -292,6 +292,17 @@ static int __vfio_register_dev(struct vfio_device *device,
if (ret)
return ret;
+ /*
+ * VFIO always sets IOMMU_CACHE because we offer no way for userspace to
+ * restore cache coherency. It has to be checked here because it is only
+ * valid for cases where we are using iommu groups.
+ */
+ if (type == VFIO_IOMMU && !vfio_device_is_noiommu(device) &&
+ !device_iommu_capable(device->dev, IOMMU_CAP_CACHE_COHERENCY)) {
+ ret = -EINVAL;
+ goto err_out;
+ }
+
ret = vfio_device_add(device);
if (ret)
goto err_out;
--
2.34.1
next prev parent reply other threads:[~2023-07-18 13:56 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-18 13:55 [Intel-gfx] [PATCH v15 00/26] Add vfio_device cdev for iommufd support Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 01/26] vfio: Allocate per device file structure Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 02/26] vfio: Refine vfio file kAPIs for KVM Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 03/26] vfio: Accept vfio device file in the KVM facing kAPI Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 04/26] kvm/vfio: Prepare for accepting vfio device fd Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 05/26] kvm/vfio: Accept vfio device file from userspace Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 06/26] vfio: Pass struct vfio_device_file * to vfio_device_open/close() Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 07/26] vfio: Block device access via device fd until device is opened Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 08/26] vfio: Add cdev_device_open_cnt to vfio_group Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 09/26] vfio: Make vfio_df_open() single open for device cdev path Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 10/26] vfio-iommufd: Move noiommu compat validation out of vfio_iommufd_bind() Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 11/26] vfio-iommufd: Split bind/attach into two steps Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 12/26] vfio: Record devid in vfio_device_file Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 13/26] vfio-iommufd: Add detach_ioas support for physical VFIO devices Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 14/26] iommufd/device: Add iommufd_access_detach() API Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 15/26] vfio-iommufd: Add detach_ioas support for emulated VFIO devices Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 16/26] vfio: Move vfio_device_group_unregister() to be the first operation in unregister Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 17/26] vfio: Move device_del() before waiting for the last vfio_device registration refcount Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 18/26] vfio: Add cdev for vfio_device Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 19/26] vfio: Test kvm pointer in _vfio_device_get_kvm_safe() Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 20/26] iommufd: Add iommufd_ctx_from_fd() Yi Liu
2023-07-18 16:55 ` Jason Gunthorpe
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 21/26] vfio: Avoid repeated user pointer cast in vfio_device_fops_unl_ioctl() Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 22/26] vfio: Add VFIO_DEVICE_BIND_IOMMUFD Yi Liu
2023-07-18 16:56 ` Jason Gunthorpe
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 23/26] vfio: Add VFIO_DEVICE_[AT|DE]TACH_IOMMUFD_PT Yi Liu
2023-07-18 13:55 ` Yi Liu [this message]
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 25/26] vfio: Compile vfio_group infrastructure optionally Yi Liu
2023-07-18 13:55 ` [Intel-gfx] [PATCH v15 26/26] docs: vfio: Add vfio device cdev description Yi Liu
2023-07-18 15:55 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for Add vfio_device cdev for iommufd support (rev19) Patchwork
2023-07-18 16:57 ` [Intel-gfx] [PATCH v15 00/26] Add vfio_device cdev for iommufd support Jason Gunthorpe
2023-07-24 19:09 ` Alex Williamson
2023-07-25 18:00 ` Alex Williamson
2023-07-26 13:39 ` Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230718135551.6592-25-yi.l.liu@intel.com \
--to=yi.l.liu@intel.com \
--cc=alex.williamson@redhat.com \
--cc=chao.p.peng@linux.intel.com \
--cc=clegoate@redhat.com \
--cc=cohuck@redhat.com \
--cc=eric.auger@redhat.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-gvt-dev@lists.freedesktop.org \
--cc=jasowang@redhat.com \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=lulu@redhat.com \
--cc=mjrosato@linux.ibm.com \
--cc=nicolinc@nvidia.com \
--cc=peterx@redhat.com \
--cc=robin.murphy@arm.com \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=suravee.suthikulpanit@amd.com \
--cc=terrence.xu@intel.com \
--cc=xudong.hao@intel.com \
--cc=yan.y.zhao@intel.com \
--cc=yanting.jiang@intel.com \
--cc=yi.y.sun@linux.intel.com \
--cc=zhenzhong.duan@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox