This adds the support to determine the domain type of a group
of mediated devices according to the domain type attribute of
each device.

Cc: Ashok Raj <ashok....@intel.com>
Cc: Jacob Pan <jacob.jun....@linux.intel.com>
Cc: Kevin Tian <kevin.t...@intel.com>
Cc: Liu Yi L <yi.l....@intel.com>
Signed-off-by: Sanjay Kumar <sanjay.k.ku...@intel.com>
Signed-off-by: Lu Baolu <baolu...@linux.intel.com>
---
 drivers/vfio/vfio_iommu_type1.c | 47 ++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 89e2e6123223..64bf55b91de1 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -1390,6 +1390,27 @@ static void vfio_iommu_detach_group(struct vfio_domain 
*domain,
                iommu_detach_group(domain->domain, group->iommu_group);
 }
 
+static int vfio_mdev_domain_type(struct device *dev, void *data)
+{
+       enum mdev_domain_type new, *old = data;
+       enum mdev_domain_type (*fn)(struct device *dev);
+
+       fn = symbol_get(mdev_get_domain_type);
+       if (fn) {
+               new = fn(dev);
+               symbol_put(mdev_get_domain_type);
+
+               if (*old && *old != new)
+                       return -EINVAL;
+
+               *old = new;
+
+               return 0;
+       }
+
+       return -EINVAL;
+}
+
 static int vfio_iommu_type1_attach_group(void *iommu_data,
                                         struct iommu_group *iommu_group)
 {
@@ -1433,9 +1454,19 @@ static int vfio_iommu_type1_attach_group(void 
*iommu_data,
 
        mdev_bus = symbol_get(mdev_bus_type);
 
-       if (mdev_bus) {
-               if ((bus == mdev_bus) && !iommu_present(bus)) {
-                       symbol_put(mdev_bus_type);
+       if (mdev_bus && bus == mdev_bus) {
+               enum mdev_domain_type type = 0;
+
+               symbol_put(mdev_bus_type);
+
+               /* Determine the domain type: */
+               ret = iommu_group_for_each_dev(iommu_group, &type,
+                                              vfio_mdev_domain_type);
+               if (ret)
+                       goto out_free;
+
+               switch (type) {
+               case DOMAIN_TYPE_NO_IOMMU:
                        if (!iommu->external_domain) {
                                INIT_LIST_HEAD(&domain->group_list);
                                iommu->external_domain = domain;
@@ -1445,11 +1476,19 @@ static int vfio_iommu_type1_attach_group(void 
*iommu_data,
                        list_add(&group->next,
                                 &iommu->external_domain->group_list);
                        mutex_unlock(&iommu->lock);
+
                        return 0;
+               case DOMAIN_TYPE_ATTACH_PARENT:
+               /* FALLTHROUGH */
+               default:
+                       ret = -EINVAL;
+                       goto out_free;
                }
-               symbol_put(mdev_bus_type);
        }
 
+       if (mdev_bus)
+               symbol_put(mdev_bus_type);
+
        domain->domain = iommu_domain_alloc(bus);
        if (!domain->domain) {
                ret = -EIO;
-- 
2.17.1

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to