Commit 7d12578c authored by Yi Liu's avatar Yi Liu Committed by Jason Gunthorpe
Browse files

vfio: Check the presence for iommufd callbacks in __vfio_register_dev() 

After making the no-DMA drivers (samples/vfio-mdev) providing iommufd
callbacks, __vfio_register_dev() should check the presence of the iommufd
callbacks if CONFIG_IOMMUFD is enabled.

Link: https://lore.kernel.org/r/20230327093351.44505-7-yi.l.liu@intel.com


Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Tested-by: default avatarTerrence Xu <terrence.xu@intel.com>
Tested-by: default avatarNicolin Chen <nicolinc@nvidia.com>
Signed-off-by: default avatarYi Liu <yi.l.liu@intel.com>
Acked-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 0a782d15

drivers/vfio/iommufd.c

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ int vfio_iommufd_bind(struct vfio_device *vdev, struct iommufd_ctx *ictx) 
		return 0;

	}



	if (WARN_ON(!vdev->ops->bind_iommufd))

		return -ENODEV;



	ret = vdev->ops->bind_iommufd(vdev, ictx, &device_id);

	if (ret)

		return ret;

drivers/vfio/vfio_main.c

+3 −2
Original line number Diff line number Diff line
@@ -255,8 +255,9 @@ static int __vfio_register_dev(struct vfio_device *device, 
{

	int ret;



	if (WARN_ON(device->ops->bind_iommufd &&

		    (!device->ops->unbind_iommufd ||

	if (WARN_ON(IS_ENABLED(CONFIG_IOMMUFD) &&

		    (!device->ops->bind_iommufd ||

		     !device->ops->unbind_iommufd ||

		     !device->ops->attach_ioas)))

		return -EINVAL;