iommu/amd: Do not detach devices in domain free path
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>
This commit is contained in:
committed by
Joerg Roedel
parent
b73c698fd5
commit
07bbd660db
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user