Commit a11bfde9 authored by Joerg Roedel's avatar Joerg Roedel

iommu/vt-d: Do deferred attachment in iommu_need_mapping()

The attachment of deferred devices needs to happen before the check
whether the device is identity mapped or not. Otherwise the check will
return wrong results, cause warnings boot failures in kdump kernels, like

	WARNING: CPU: 0 PID: 318 at ../drivers/iommu/intel-iommu.c:592 domain_get_iommu+0x61/0x70

	[...]

	 Call Trace:
	  __intel_map_single+0x55/0x190
	  intel_alloc_coherent+0xac/0x110
	  dmam_alloc_attrs+0x50/0xa0
	  ahci_port_start+0xfb/0x1f0 [libahci]
	  ata_host_start.part.39+0x104/0x1e0 [libata]

With the earlier check the kdump boot succeeds and a crashdump is written.

Fixes: 1ee0186b ("iommu/vt-d: Refactor find_domain() helper")
Cc: stable@vger.kernel.org # v5.5
Reviewed-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Acked-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 034d98cc
...@@ -2541,9 +2541,6 @@ static void do_deferred_attach(struct device *dev) ...@@ -2541,9 +2541,6 @@ static void do_deferred_attach(struct device *dev)
static struct dmar_domain *deferred_attach_domain(struct device *dev) static struct dmar_domain *deferred_attach_domain(struct device *dev)
{ {
if (unlikely(attach_deferred(dev)))
do_deferred_attach(dev);
return find_domain(dev); return find_domain(dev);
} }
...@@ -3595,6 +3592,9 @@ static bool iommu_need_mapping(struct device *dev) ...@@ -3595,6 +3592,9 @@ static bool iommu_need_mapping(struct device *dev)
if (iommu_dummy(dev)) if (iommu_dummy(dev))
return false; return false;
if (unlikely(attach_deferred(dev)))
do_deferred_attach(dev);
ret = identity_mapping(dev); ret = identity_mapping(dev);
if (ret) { if (ret) {
u64 dma_mask = *dev->dma_mask; u64 dma_mask = *dev->dma_mask;
...@@ -3958,7 +3958,11 @@ bounce_map_single(struct device *dev, phys_addr_t paddr, size_t size, ...@@ -3958,7 +3958,11 @@ bounce_map_single(struct device *dev, phys_addr_t paddr, size_t size,
int prot = 0; int prot = 0;
int ret; int ret;
if (unlikely(attach_deferred(dev)))
do_deferred_attach(dev);
domain = deferred_attach_domain(dev); domain = deferred_attach_domain(dev);
if (WARN_ON(dir == DMA_NONE || !domain)) if (WARN_ON(dir == DMA_NONE || !domain))
return DMA_MAPPING_ERROR; return DMA_MAPPING_ERROR;
......
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