aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKarimAllah Ahmed <karahmed@amazon.de>2017-05-05 14:39:59 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-05-25 09:44:46 -0400
commit21f2950f91ff080b0d3f13f2983b9b39c95b8714 (patch)
tree761eeacadb3ecc7508c6d2730f8eef66f20c9f1c /drivers
parent58e36d6f7f11815d3be279f58fd44da1203b4aa1 (diff)
iommu/vt-d: Flush the IOTLB to get rid of the initial kdump mappings
commit f73a7eee900e95404b61408a23a1df5c5811704c upstream. Ever since commit 091d42e43d ("iommu/vt-d: Copy translation tables from old kernel") the kdump kernel copies the IOMMU context tables from the previous kernel. Each device mappings will be destroyed once the driver for the respective device takes over. This unfortunately breaks the workflow of mapping and unmapping a new context to the IOMMU. The mapping function assumes that either: 1) Unmapping did the proper IOMMU flushing and it only ever flush if the IOMMU unit supports caching invalid entries. 2) The system just booted and the initialization code took care of flushing all IOMMU caches. This assumption is not true for the kdump kernel since the context tables have been copied from the previous kernel and translations could have been cached ever since. So make sure to flush the IOTLB as well when we destroy these old copied mappings. Cc: Joerg Roedel <joro@8bytes.org> Cc: David Woodhouse <dwmw2@infradead.org> Cc: David Woodhouse <dwmw@amazon.co.uk> Cc: Anthony Liguori <aliguori@amazon.com> Signed-off-by: KarimAllah Ahmed <karahmed@amazon.de> Acked-by: David Woodhouse <dwmw@amazon.co.uk> Fixes: 091d42e43d ("iommu/vt-d: Copy translation tables from old kernel") Signed-off-by: Joerg Roedel <jroedel@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/iommu/intel-iommu.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index b9e50c10213b..87fcbf71b85a 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -2049,11 +2049,14 @@ static int domain_context_mapping_one(struct dmar_domain *domain,
2049 if (context_copied(context)) { 2049 if (context_copied(context)) {
2050 u16 did_old = context_domain_id(context); 2050 u16 did_old = context_domain_id(context);
2051 2051
2052 if (did_old >= 0 && did_old < cap_ndoms(iommu->cap)) 2052 if (did_old >= 0 && did_old < cap_ndoms(iommu->cap)) {
2053 iommu->flush.flush_context(iommu, did_old, 2053 iommu->flush.flush_context(iommu, did_old,
2054 (((u16)bus) << 8) | devfn, 2054 (((u16)bus) << 8) | devfn,
2055 DMA_CCMD_MASK_NOBIT, 2055 DMA_CCMD_MASK_NOBIT,
2056 DMA_CCMD_DEVICE_INVL); 2056 DMA_CCMD_DEVICE_INVL);
2057 iommu->flush.flush_iotlb(iommu, did_old, 0, 0,
2058 DMA_TLB_DSI_FLUSH);
2059 }
2057 } 2060 }
2058 2061
2059 pgd = domain->pgd; 2062 pgd = domain->pgd;