diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2014-06-09 14:09:53 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-06-20 17:33:50 +0200 |
| commit | 4801cb6ba3527f1cbb2078e23d3fdbe03ebcc7e7 (patch) | |
| tree | b122c932d8d47b7e2186217590cf639dd2806cb6 | |
| parent | 22259d1fa4111413d7969bae6ad425fbc7fcf3e1 (diff) | |
| download | lwn-4801cb6ba3527f1cbb2078e23d3fdbe03ebcc7e7.tar.gz lwn-4801cb6ba3527f1cbb2078e23d3fdbe03ebcc7e7.zip | |
iommu/vt-d: Fix missing IOTLB flush in intel_iommu_unmap()
This is a small excerpt of the upstream commit
ea8ea460c9ace60bbb5ac6e5521d637d5c15293d (iommu/vt-d: Clean up and fix
page table clear/free behaviour).
This missing IOTLB flush was added as a minor, inconsequential bug-fix
in commit ea8ea460c ("iommu/vt-d: Clean up and fix page table clear/free
behaviour") in 3.15. It wasn't originally intended for -stable but a
couple of users have reported issues which turn out to be fixed by
adding the missing flush.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index cae5a0866046..911ecb230b5a 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -4117,7 +4117,7 @@ static size_t intel_iommu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size) { struct dmar_domain *dmar_domain = domain->priv; - int order; + int order, iommu_id; order = dma_pte_clear_range(dmar_domain, iova >> VTD_PAGE_SHIFT, (iova + size - 1) >> VTD_PAGE_SHIFT); @@ -4125,6 +4125,22 @@ static size_t intel_iommu_unmap(struct iommu_domain *domain, if (dmar_domain->max_addr == iova + size) dmar_domain->max_addr = iova; + for_each_set_bit(iommu_id, dmar_domain->iommu_bmp, g_num_of_iommus) { + struct intel_iommu *iommu = g_iommus[iommu_id]; + int num, ndomains; + + /* + * find bit position of dmar_domain + */ + ndomains = cap_ndoms(iommu->cap); + for_each_set_bit(num, iommu->domain_ids, ndomains) { + if (iommu->domains[num] == dmar_domain) + iommu_flush_iotlb_psi(iommu, num, + iova >> VTD_PAGE_SHIFT, + 1 << order, 0); + } + } + return PAGE_SIZE << order; } |