diff options
| author |   Alex Williamson <alex.williamson@redhat.com> | 2013-06-21 14:33:19 -0600 |
|---|---|---|
| committer |   Joerg Roedel <joro@8bytes.org> | 2013-06-23 13:57:17 +0200 |
| commit | 60d0ca3cfd199b6612bbbbf4999a3470dad38bb1 (patch) | |
| tree | 9ea6d021890eb26b83c4c0b98609420bf08598c2 /drivers/iommu | |
| parent | iommu/amd: Fix memory leak in free_pagetable (diff) | |
| download | linux-dev-60d0ca3cfd199b6612bbbbf4999a3470dad38bb1.tar.xz linux-dev-60d0ca3cfd199b6612bbbbf4999a3470dad38bb1.zip | |
iommu/amd: Only unmap large pages from the first pte
If we use a large mapping, the expectation is that only unmaps from
the first pte in the superpage are supported. Unmaps from offsets
into the superpage should fail (ie. return zero sized unmap). In the
current code, unmapping from an offset clears the size of the full
mapping starting from an offset. For instance, if we map a 16k
physically contiguous range at IOVA 0x0 with a large page, then
attempt to unmap 4k at offset 12k, 4 ptes are cleared (12k - 28k) and
the unmap returns 16k unmapped. This potentially incorrectly clears
valid mappings and confuses drivers like VFIO that use the unmap size
to release pinned pages.
Fix by refusing to unmap from offsets into the page.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Joerg Roedel <joro@8bytes.org>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 5cde682377a0..4b029c17f8d0 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -1484,6 +1484,10 @@ static unsigned long iommu_unmap_page(struct protection_domain *dom, /* Large PTE found which maps this address */ unmap_size = PTE_PAGE_SIZE(*pte); + + /* Only unmap from the first pte in the page */ + if ((unmap_size - 1) & bus_addr) + break; count = PAGE_SIZE_PTE_COUNT(unmap_size); for (i = 0; i < count; i++) pte[i] = 0ULL; @@ -1493,7 +1497,7 @@ static unsigned long iommu_unmap_page(struct protection_domain *dom, unmapped += unmap_size; } - BUG_ON(!is_power_of_2(unmapped)); + BUG_ON(unmapped && !is_power_of_2(unmapped)); return unmapped; } |