[PATCH v7 13/22] vfio-iommufd: Split bind/attach into two steps

Yi Liu
2023-03-16T12:56:07Z

to align with the coming vfio device cdev support.

Signed-off-by: Yi Liu <yi.l.liu@intel.com>
---
drivers/vfio/group.c | 18 ++++++++++++++----
drivers/vfio/iommufd.c | 33 ++++++++++++++-------------------
drivers/vfio/vfio.h | 9 +++++++++
3 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/drivers/vfio/group.c b/drivers/vfio/group.c
index 1ad8df9b295f..70bdecff4785 100644
--- a/drivers/vfio/group.c
+++ b/drivers/vfio/group.c
@@ -203,9 +203,14 @@ static int vfio_device_group_open(struct vfio_device_file *df)
}

ret = vfio_device_open(df);
- if (ret) {
- df->iommufd = NULL;
+ if (ret)
goto out_put_kvm;
+
+ if (df->iommufd) {
+ ret = vfio_iommufd_attach_compat_ioas(device,
+ df->iommufd);
+ if (ret)
+ goto out_close_device;
}

/*
@@ -214,12 +219,17 @@ static int vfio_device_group_open(struct vfio_device_file *df)
*/
smp_store_release(&df->access_granted, true);

+ mutex_unlock(&device->dev_set->lock);
+ mutex_unlock(&device->group->group_lock);
+ return 0;
+
+out_close_device:
+ vfio_device_close(df);
out_put_kvm:
+ df->iommufd = NULL;
if (device->open_count == 0)
vfio_device_put_kvm(device);
-
mutex_unlock(&device->dev_set->lock);
-
out_unlock:
mutex_unlock(&device->group->group_lock);
return ret;
diff --git a/drivers/vfio/iommufd.c b/drivers/vfio/iommufd.c
index 7334b67dbb8a..2daef60fe439 100644
--- a/drivers/vfio/iommufd.c
+++ b/drivers/vfio/iommufd.c
@@ -30,33 +30,28 @@ int vfio_iommufd_enable_noiommu_compat(struct vfio_device *device,

int vfio_iommufd_bind(struct vfio_device *vdev, struct iommufd_ctx *ictx)
{
- u32 ioas_id;
u32 device_id;
- int ret;

lockdep_assert_held(&vdev->dev_set->lock);

- ret = vdev->ops->bind_iommufd(vdev, ictx, &device_id);
- if (ret)
- return ret;
+ /* The legacy path has no way to return the device id */
+ return vdev->ops->bind_iommufd(vdev, ictx, &device_id);
+}
+
+int vfio_iommufd_attach_compat_ioas(struct vfio_device *vdev,
+ struct iommufd_ctx *ictx)
+{
+ u32 ioas_id;
+ int ret;
+
+ lockdep_assert_held(&vdev->dev_set->lock);

ret = iommufd_vfio_compat_ioas_get_id(ictx, &ioas_id);
if (ret)
- goto err_unbind;
- ret = vdev->ops->attach_ioas(vdev, &ioas_id);
- if (ret)
- goto err_unbind;
-
- /*
- * The legacy path has no way to return the device id or the selected
- * pt_id
- */
- return 0;
+ return ret;

-err_unbind:
- if (vdev->ops->unbind_iommufd)
- vdev->ops->unbind_iommufd(vdev);
- return ret;
+ /* The legacy path has no way to return the selected pt_id */
+ return vdev->ops->attach_ioas(vdev, &ioas_id);
}

void vfio_iommufd_unbind(struct vfio_device *vdev)
diff --git a/drivers/vfio/vfio.h b/drivers/vfio/vfio.h
index 136137b8618d..abfaf85cc266 100644
--- a/drivers/vfio/vfio.h
+++ b/drivers/vfio/vfio.h
@@ -238,6 +238,8 @@ static inline void vfio_container_cleanup(void)
#if IS_ENABLED(CONFIG_IOMMUFD)
int vfio_iommufd_enable_noiommu_compat(struct vfio_device *device,
struct iommufd_ctx *ictx);
+int vfio_iommufd_attach_compat_ioas(struct vfio_device *device,
+ struct iommufd_ctx *ictx);
int vfio_iommufd_bind(struct vfio_device *device, struct iommufd_ctx *ictx);
void vfio_iommufd_unbind(struct vfio_device *device);
#else
@@ -248,6 +250,13 @@ vfio_iommufd_enable_noiommu_compat(struct vfio_device *device,
return -EOPNOTSUPP;
}

+static inline int
+vfio_iommufd_attach_compat_ioas(struct vfio_device *device,
+ struct iommufd_ctx *ictx)
+{
+ return -EOPNOTSUPP;
+}
+
static inline int vfio_iommufd_bind(struct vfio_device *device,
struct iommufd_ctx *ictx)
{
--
2.34.1