iommu: Always destroy the iommu_group during iommu_release_device()

Have release fully clean up the iommu related parts of the struct device,
no matter what state they are in.

Split the logic so that the three things owned by the iommu core are
always cleaned up:
 - Any attached iommu_group
 - Any allocated dev->iommu and its contents including a fwsepc
 - Any attached driver via a struct group_device

This fixes a minor bug where a fwspec created without an iommu_group being
probed would not be freed.

Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/8-v3-328044aa278c+45e49-iommu_probe_jgg@nvidia.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 4688f61b7a4f2fd7b3ff457198a1e602c48ae756..55b916e8da3bb7d87ae6cfcf9de5f202e9a88c9a 100644 (file)
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -574,10 +574,8 @@ static void __iommu_group_remove_device(struct device *dev)
                        iommu_deinit_device(dev);
                else
                        dev->iommu_group = NULL;
-               goto out;
+               break;
        }
-       WARN(true, "Corrupted iommu_group device_list");
-out:
        mutex_unlock(&group->mutex);
 
        /* Pairs with the get in iommu_group_add_device() */
@@ -588,10 +586,12 @@ static void iommu_release_device(struct device *dev)
 {
        struct iommu_group *group = dev->iommu_group;
 
-       if (!dev->iommu || !group)
-               return;
+       if (group)
+               __iommu_group_remove_device(dev);
 
-       __iommu_group_remove_device(dev);
+       /* Free any fwspec if no iommu_driver was ever attached */
+       if (dev->iommu)
+               dev_iommu_free(dev);
 }
 
 static int __init iommu_set_def_domain_type(char *str)