]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
iommu/amd: Do not detach devices in domain free path
authorVasant Hegde <vasant.hegde@amd.com>
Wed, 30 Oct 2024 06:35:50 +0000 (06:35 +0000)
committerJoerg Roedel <jroedel@suse.de>
Wed, 30 Oct 2024 10:06:43 +0000 (11:06 +0100)
All devices attached to a protection domain must be freed before
calling domain free. Hence do not try to free devices in domain
free path. Continue to throw warning if pdom->dev_list is not empty
so that any potential issues can be fixed.

Signed-off-by: Vasant Hegde <vasant.hegde@amd.com>
Reviewed-by: Joerg Roedel <jroedel@suse.de>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20241030063556.6104-7-vasant.hegde@amd.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/amd/iommu.c

index 48472f45d6b7cfcb46c4f1ac692d5ca4423a9d2b..1219e1555fc27984cc0b3f7d2e718753e5262475 100644 (file)
@@ -2279,21 +2279,6 @@ static struct iommu_group *amd_iommu_device_group(struct device *dev)
  *
  *****************************************************************************/
 
-static void cleanup_domain(struct protection_domain *domain)
-{
-       struct iommu_dev_data *entry;
-
-       lockdep_assert_held(&domain->lock);
-
-       while (!list_empty(&domain->dev_list)) {
-               entry = list_first_entry(&domain->dev_list,
-                                        struct iommu_dev_data, list);
-               BUG_ON(!entry->domain);
-               do_detach(entry);
-       }
-       WARN_ON(!list_empty(&domain->dev_list));
-}
-
 void protection_domain_free(struct protection_domain *domain)
 {
        WARN_ON(!list_empty(&domain->dev_list));
@@ -2482,16 +2467,7 @@ amd_iommu_domain_alloc_user(struct device *dev, u32 flags,
 
 void amd_iommu_domain_free(struct iommu_domain *dom)
 {
-       struct protection_domain *domain;
-       unsigned long flags;
-
-       domain = to_pdomain(dom);
-
-       spin_lock_irqsave(&domain->lock, flags);
-
-       cleanup_domain(domain);
-
-       spin_unlock_irqrestore(&domain->lock, flags);
+       struct protection_domain *domain = to_pdomain(dom);
 
        protection_domain_free(domain);
 }