Commit 431275af authored by Joerg Roedel's avatar Joerg Roedel

iommu: Check for deferred attach in iommu_group_do_dma_attach()

The iommu_group_do_dma_attach() must not attach devices which have
deferred_attach set. Otherwise devices could cause IOMMU faults when
re-initialized in a kdump kernel.

Fixes: deac0b3b ("iommu: Split off default domain allocation from group assignment")
Reported-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Tested-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Reviewed-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Link: https://lore.kernel.org/r/20200604091944.26402-1-joro@8bytes.org
parent cc69fc48
...@@ -1680,8 +1680,12 @@ static void probe_alloc_default_domain(struct bus_type *bus, ...@@ -1680,8 +1680,12 @@ static void probe_alloc_default_domain(struct bus_type *bus,
static int iommu_group_do_dma_attach(struct device *dev, void *data) static int iommu_group_do_dma_attach(struct device *dev, void *data)
{ {
struct iommu_domain *domain = data; struct iommu_domain *domain = data;
int ret = 0;
return __iommu_attach_device(domain, dev); if (!iommu_is_attach_deferred(domain, dev))
ret = __iommu_attach_device(domain, dev);
return ret;
} }
static int __iommu_group_dma_attach(struct iommu_group *group) static int __iommu_group_dma_attach(struct iommu_group *group)
......
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