Commit 9048c734 authored by Yi Liu's avatar Yi Liu Committed by Alex Williamson
Browse files

vfio-iommufd: Add detach_ioas support for physical VFIO devices 



This prepares for adding DETACH ioctl for physical 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-14-yi.l.liu@intel.com


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

Documentation/driver-api/vfio.rst

+5 −3
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ similar to a file operations structure:: 
					struct iommufd_ctx *ictx, u32 *out_device_id);

		void	(*unbind_iommufd)(struct vfio_device *vdev);

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

		void	(*detach_ioas)(struct vfio_device *vdev);

		int	(*open_device)(struct vfio_device *vdev);

		void	(*close_device)(struct vfio_device *vdev);

		ssize_t	(*read)(struct vfio_device *vdev, char __user *buf,
@@ -315,9 +316,10 @@ container_of(). 
	- The [un]bind_iommufd callbacks are issued when the device is bound to

	  and unbound from iommufd.



	- The attach_ioas callback is issued when the device is attached to an

	  IOAS managed by the bound iommufd. The attached IOAS is automatically

	  detached when the device is unbound from iommufd.

	- The [de]attach_ioas callback is issued when the device is attached to

	  and detached from an IOAS managed by the bound iommufd. However, the

	  attached IOAS can also be automatically detached when the device is

	  unbound from iommufd.



	- The read/write/mmap callbacks implement the device region access defined

	  by the device's own VFIO_DEVICE_GET_REGION_INFO ioctl.

drivers/vfio/fsl-mc/vfio_fsl_mc.c

+1 −0
Original line number Diff line number Diff line
@@ -593,6 +593,7 @@ static const struct vfio_device_ops vfio_fsl_mc_ops = { 
	.bind_iommufd	= vfio_iommufd_physical_bind,

	.unbind_iommufd	= vfio_iommufd_physical_unbind,

	.attach_ioas	= vfio_iommufd_physical_attach_ioas,

	.detach_ioas	= vfio_iommufd_physical_detach_ioas,

};



static struct fsl_mc_driver vfio_fsl_mc_driver = {

drivers/vfio/iommufd.c

+20 −0
Original line number Diff line number Diff line
@@ -140,6 +140,14 @@ int vfio_iommufd_physical_attach_ioas(struct vfio_device *vdev, u32 *pt_id) 
{

	int rc;



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



	if (WARN_ON(!vdev->iommufd_device))

		return -EINVAL;



	if (vdev->iommufd_attached)

		return -EBUSY;



	rc = iommufd_device_attach(vdev->iommufd_device, pt_id);

	if (rc)

		return rc;
@@ -148,6 +156,18 @@ int vfio_iommufd_physical_attach_ioas(struct vfio_device *vdev, u32 *pt_id) 
}

EXPORT_SYMBOL_GPL(vfio_iommufd_physical_attach_ioas);



void vfio_iommufd_physical_detach_ioas(struct vfio_device *vdev)

{

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



	if (WARN_ON(!vdev->iommufd_device) || !vdev->iommufd_attached)

		return;



	iommufd_device_detach(vdev->iommufd_device);

	vdev->iommufd_attached = false;

}

EXPORT_SYMBOL_GPL(vfio_iommufd_physical_detach_ioas);



/*

 * The emulated standard ops mean that vfio_device is going to use the

 * "mdev path" and will call vfio_pin_pages()/vfio_dma_rw(). Drivers using this

drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c

+2 −0
Original line number Diff line number Diff line
@@ -1373,6 +1373,7 @@ static const struct vfio_device_ops hisi_acc_vfio_pci_migrn_ops = { 
	.bind_iommufd = vfio_iommufd_physical_bind,

	.unbind_iommufd = vfio_iommufd_physical_unbind,

	.attach_ioas = vfio_iommufd_physical_attach_ioas,

	.detach_ioas = vfio_iommufd_physical_detach_ioas,

};



static const struct vfio_device_ops hisi_acc_vfio_pci_ops = {
@@ -1391,6 +1392,7 @@ static const struct vfio_device_ops hisi_acc_vfio_pci_ops = { 
	.bind_iommufd = vfio_iommufd_physical_bind,

	.unbind_iommufd = vfio_iommufd_physical_unbind,

	.attach_ioas = vfio_iommufd_physical_attach_ioas,

	.detach_ioas = vfio_iommufd_physical_detach_ioas,

};



static int hisi_acc_vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)

drivers/vfio/pci/mlx5/main.c

+1 −0
Original line number Diff line number Diff line
@@ -1320,6 +1320,7 @@ static const struct vfio_device_ops mlx5vf_pci_ops = { 
	.bind_iommufd = vfio_iommufd_physical_bind,

	.unbind_iommufd = vfio_iommufd_physical_unbind,

	.attach_ioas = vfio_iommufd_physical_attach_ioas,

	.detach_ioas = vfio_iommufd_physical_detach_ioas,

};



static int mlx5vf_pci_probe(struct pci_dev *pdev,