[PATCH 07/11] vfio: Use DMA_OWNER_USER to declaim passthrough devices

[Lu Baolu]

Set DMA_OWNER_USER when an iommu group is set to a container, and
release DMA_OWNER_USER once the iommu group is unset from a container.

Signed-off-by: Lu Baolu <baolu...@linux.intel.com>
---
 drivers/vfio/fsl-mc/vfio_fsl_mc.c     |  1 +
 drivers/vfio/pci/vfio_pci.c           |  3 +++
 drivers/vfio/platform/vfio_amba.c     |  1 +
 drivers/vfio/platform/vfio_platform.c |  1 +
 drivers/vfio/vfio.c                   | 12 +++++++++++-
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/drivers/vfio/fsl-mc/vfio_fsl_mc.c 
b/drivers/vfio/fsl-mc/vfio_fsl_mc.c
index 6e2e62c6f47a..b749d092a185 100644
--- a/drivers/vfio/fsl-mc/vfio_fsl_mc.c
+++ b/drivers/vfio/fsl-mc/vfio_fsl_mc.c
@@ -587,6 +587,7 @@ static struct fsl_mc_driver vfio_fsl_mc_driver = {
        .driver = {
                .name   = "vfio-fsl-mc",
                .owner  = THIS_MODULE,
+               .suppress_auto_claim_dma_owner = true,
        },
 };
 
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index a5ce92beb655..8961bfaf0eb5 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -193,6 +193,9 @@ static struct pci_driver vfio_pci_driver = {
        .remove                 = vfio_pci_remove,
        .sriov_configure        = vfio_pci_sriov_configure,
        .err_handler            = &vfio_pci_core_err_handlers,
+       .driver = {
+               .suppress_auto_claim_dma_owner = true,
+       },
 };
 
 static void __init vfio_pci_fill_ids(void)
diff --git a/drivers/vfio/platform/vfio_amba.c 
b/drivers/vfio/platform/vfio_amba.c
index badfffea14fb..2146ee52901a 100644
--- a/drivers/vfio/platform/vfio_amba.c
+++ b/drivers/vfio/platform/vfio_amba.c
@@ -94,6 +94,7 @@ static struct amba_driver vfio_amba_driver = {
        .drv = {
                .name = "vfio-amba",
                .owner = THIS_MODULE,
+               .suppress_auto_claim_dma_owner = true,
        },
 };
 
diff --git a/drivers/vfio/platform/vfio_platform.c 
b/drivers/vfio/platform/vfio_platform.c
index 68a1c87066d7..5ef06e668192 100644
--- a/drivers/vfio/platform/vfio_platform.c
+++ b/drivers/vfio/platform/vfio_platform.c
@@ -75,6 +75,7 @@ static struct platform_driver vfio_platform_driver = {
        .remove         = vfio_platform_remove,
        .driver = {
                .name   = "vfio-platform",
+               .suppress_auto_claim_dma_owner = true,
        },
 };
 
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
index 82fb75464f92..4e21b37e0ea8 100644
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -1198,6 +1198,8 @@ static void __vfio_group_unset_container(struct 
vfio_group *group)
                driver->ops->detach_group(container->iommu_data,
                                          group->iommu_group);
 
+       iommu_group_release_dma_owner(group->iommu_group, DMA_OWNER_USER);
+
        group->container = NULL;
        wake_up(&group->container_q);
        list_del(&group->container_next);
@@ -1282,13 +1284,21 @@ static int vfio_group_set_container(struct vfio_group 
*group, int container_fd)
                goto unlock_out;
        }
 
+       ret = iommu_group_set_dma_owner(group->iommu_group,
+                                       DMA_OWNER_USER, f.file);
+       if (ret)
+               goto unlock_out;
+
        driver = container->iommu_driver;
        if (driver) {
                ret = driver->ops->attach_group(container->iommu_data,
                                                group->iommu_group,
                                                group->type);
-               if (ret)
+               if (ret) {
+                       iommu_group_release_dma_owner(group->iommu_group,
+                                                     DMA_OWNER_USER);
                        goto unlock_out;
+               }
        }
 
        group->container = container;
-- 
2.25.1

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