Commit be068fa2 authored by Lu Baolu's avatar Lu Baolu Committed by Joerg Roedel
Browse files

vfio/type1: Handle different mdev isolation type 



This adds the support to determine the isolation type
of a mediated device group by checking whether it has
an iommu device. If an iommu device exists, an iommu
domain will be allocated and then attached to the iommu
device. Otherwise, keep the same behavior as it is.

Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarSanjay Kumar <sanjay.k.kumar@intel.com>
Signed-off-by: default avatarLiu Yi L <yi.l.liu@intel.com>
Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarJean-Philippe Brucker <jean-philippe.brucker@arm.com>
Reviewed-by: default avatarKirti Wankhede <kwankhede@nvidia.com>
Acked-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 7bd50f0c

drivers/vfio/vfio_iommu_type1.c

+42 −13
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ static int vfio_iommu_type1_pin_pages(void *iommu_data, 
	mutex_lock(&iommu->lock);



	/* Fail if notifier list is empty */

	if ((!iommu->external_domain) || (!iommu->notifier.head)) {

	if (!iommu->notifier.head) {

		ret = -EINVAL;

		goto pin_done;

	}
@@ -647,11 +647,6 @@ static int vfio_iommu_type1_unpin_pages(void *iommu_data, 


	mutex_lock(&iommu->lock);



	if (!iommu->external_domain) {

		mutex_unlock(&iommu->lock);

		return -EINVAL;

	}



	do_accounting = !IS_IOMMU_CAP_DOMAIN_IN_CONTAINER(iommu);

	for (i = 0; i < npage; i++) {

		struct vfio_dma *dma;
@@ -1381,13 +1376,40 @@ static void vfio_iommu_detach_group(struct vfio_domain *domain, 
		iommu_detach_group(domain->domain, group->iommu_group);

}



static bool vfio_bus_is_mdev(struct bus_type *bus)

{

	struct bus_type *mdev_bus;

	bool ret = false;



	mdev_bus = symbol_get(mdev_bus_type);

	if (mdev_bus) {

		ret = (bus == mdev_bus);

		symbol_put(mdev_bus_type);

	}



	return ret;

}



static int vfio_mdev_iommu_device(struct device *dev, void *data)

{

	struct device **old = data, *new;



	new = vfio_mdev_get_iommu_device(dev);

	if (!new || (*old && *old != new))

		return -EINVAL;



	*old = new;



	return 0;

}



static int vfio_iommu_type1_attach_group(void *iommu_data,

					 struct iommu_group *iommu_group)

{

	struct vfio_iommu *iommu = iommu_data;

	struct vfio_group *group;

	struct vfio_domain *domain, *d;

	struct bus_type *bus = NULL, *mdev_bus;

	struct bus_type *bus = NULL;

	int ret;

	bool resv_msi, msi_remap;

	phys_addr_t resv_msi_base;
@@ -1422,23 +1444,30 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, 
	if (ret)

		goto out_free;



	mdev_bus = symbol_get(mdev_bus_type);

	if (vfio_bus_is_mdev(bus)) {

		struct device *iommu_device = NULL;



	if (mdev_bus) {

		if ((bus == mdev_bus) && !iommu_present(bus)) {

			symbol_put(mdev_bus_type);

		group->mdev_group = true;



		/* Determine the isolation type */

		ret = iommu_group_for_each_dev(iommu_group, &iommu_device,

					       vfio_mdev_iommu_device);

		if (ret || !iommu_device) {

			if (!iommu->external_domain) {

				INIT_LIST_HEAD(&domain->group_list);

				iommu->external_domain = domain;

			} else

			} else {

				kfree(domain);

			}



			list_add(&group->next,

				 &iommu->external_domain->group_list);

			mutex_unlock(&iommu->lock);



			return 0;

		}

		symbol_put(mdev_bus_type);



		bus = iommu_device->bus;

	}



	domain->domain = iommu_domain_alloc(bus);