Commit 8cfa7186 authored by Yi Liu's avatar Yi Liu Committed by Alex Williamson
Browse files

vfio-iommufd: Add detach_ioas support for emulated VFIO devices 



This prepares for adding DETACH ioctl for emulated VFIO devices.

Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Tested-by: default avatarTerrence Xu <terrence.xu@intel.com>
Tested-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Tested-by: default avatarMatthew Rosato <mjrosato@linux.ibm.com>
Tested-by: default avatarYanting Jiang <yanting.jiang@intel.com>
Tested-by: default avatarShameer Kolothum <shameerali.kolothum.thodi@huawei.com>
Tested-by: default avatarZhenzhong Duan <zhenzhong.duan@intel.com>
Signed-off-by: default avatarYi Liu <yi.l.liu@intel.com>
Link: https://lore.kernel.org/r/20230718135551.6592-16-yi.l.liu@intel.com


Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent e23a6217

drivers/gpu/drm/i915/gvt/kvmgt.c

+1 −0
Original line number Diff line number Diff line
@@ -1474,6 +1474,7 @@ static const struct vfio_device_ops intel_vgpu_dev_ops = { 
	.bind_iommufd	= vfio_iommufd_emulated_bind,

	.unbind_iommufd = vfio_iommufd_emulated_unbind,

	.attach_ioas	= vfio_iommufd_emulated_attach_ioas,

	.detach_ioas	= vfio_iommufd_emulated_detach_ioas,

};



static int intel_vgpu_probe(struct mdev_device *mdev)

drivers/s390/cio/vfio_ccw_ops.c

+1 −0
Original line number Diff line number Diff line
@@ -632,6 +632,7 @@ static const struct vfio_device_ops vfio_ccw_dev_ops = { 
	.bind_iommufd = vfio_iommufd_emulated_bind,

	.unbind_iommufd = vfio_iommufd_emulated_unbind,

	.attach_ioas = vfio_iommufd_emulated_attach_ioas,

	.detach_ioas = vfio_iommufd_emulated_detach_ioas,

};



struct mdev_driver vfio_ccw_mdev_driver = {

drivers/s390/crypto/vfio_ap_ops.c

+1 −0
Original line number Diff line number Diff line
@@ -1975,6 +1975,7 @@ static const struct vfio_device_ops vfio_ap_matrix_dev_ops = { 
	.bind_iommufd = vfio_iommufd_emulated_bind,

	.unbind_iommufd = vfio_iommufd_emulated_unbind,

	.attach_ioas = vfio_iommufd_emulated_attach_ioas,

	.detach_ioas = vfio_iommufd_emulated_detach_ioas,

	.request = vfio_ap_mdev_request

};

drivers/vfio/iommufd.c

+13 −0
Original line number Diff line number Diff line
@@ -231,3 +231,16 @@ int vfio_iommufd_emulated_attach_ioas(struct vfio_device *vdev, u32 *pt_id) 
	return 0;

}

EXPORT_SYMBOL_GPL(vfio_iommufd_emulated_attach_ioas);



void vfio_iommufd_emulated_detach_ioas(struct vfio_device *vdev)

{

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



	if (WARN_ON(!vdev->iommufd_access) ||

	    !vdev->iommufd_attached)

		return;



	iommufd_access_detach(vdev->iommufd_access);

	vdev->iommufd_attached = false;

}

EXPORT_SYMBOL_GPL(vfio_iommufd_emulated_detach_ioas);

include/linux/vfio.h

+3 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ int vfio_iommufd_emulated_bind(struct vfio_device *vdev, 
			       struct iommufd_ctx *ictx, u32 *out_device_id);

void vfio_iommufd_emulated_unbind(struct vfio_device *vdev);

int vfio_iommufd_emulated_attach_ioas(struct vfio_device *vdev, u32 *pt_id);

void vfio_iommufd_emulated_detach_ioas(struct vfio_device *vdev);

#else

static inline struct iommufd_ctx *

vfio_iommufd_device_ictx(struct vfio_device *vdev)
@@ -157,6 +158,8 @@ vfio_iommufd_get_dev_id(struct vfio_device *vdev, struct iommufd_ctx *ictx) 
	((void (*)(struct vfio_device *vdev)) NULL)

#define vfio_iommufd_emulated_attach_ioas \

	((int (*)(struct vfio_device *vdev, u32 *pt_id)) NULL)

#define vfio_iommufd_emulated_detach_ioas \

	((void (*)(struct vfio_device *vdev)) NULL)

#endif



static inline bool vfio_device_cdev_opened(struct vfio_device *device)