Commit 45e528d9 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/amd: Check for busy devices earlier in attach_device()

Check early in attach_device whether the device is already attached to a
domain. This also simplifies the code path so that __attach_device() can
be removed.

Fixes: 92d420ec

 ("iommu/amd: Relax locking in dma_ops path")
Reviewed-by: default avatarFilippo Sironi <>
Reviewed-by: default avatarJerry Snitselaar <>
Signed-off-by: default avatarJoerg Roedel <>
parent f6c0bfce
......@@ -2072,23 +2072,6 @@ static void do_detach(struct iommu_dev_data *dev_data)
domain->dev_cnt -= 1;
* If a device is not yet associated with a domain, this function makes the
* device visible in the domain
static int __attach_device(struct iommu_dev_data *dev_data,
struct protection_domain *domain)
if (dev_data->domain != NULL)
return -EBUSY;
/* Attach alias group root */
do_attach(dev_data, domain);
return 0;
static void pdev_iommuv2_disable(struct pci_dev *pdev)
......@@ -2174,6 +2157,10 @@ static int attach_device(struct device *dev,
dev_data = get_dev_data(dev);
ret = -EBUSY;
if (dev_data->domain != NULL)
goto out;
if (!dev_is_pci(dev))
goto skip_ats_check;
......@@ -2198,7 +2185,9 @@ static int attach_device(struct device *dev,
ret = __attach_device(dev_data, domain);
ret = 0;
do_attach(dev_data, domain);
* We might boot into a crash-kernel here. The crashed kernel
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment