On 2020-05-22 01:46, Robin Murphy wrote:
On 2020-05-21 12:30, Prakash Gupta wrote:We have seen couple of stability issues around this.
Limit the iova size while freeing based on unmapped size. In absence of
this even with unmap failure, invalid iova is pushed to iova rcache and
subsequently can cause panic while rcache magazine is freed.
Can you elaborate on that panic?
Below is one such example:
kernel BUG at kernel/msm-4.19/drivers/iommu/iova.c:904!
iova_magazine_free_pfns
iova_rcache_insert
free_iova_fast
__iommu_unmap_page
iommu_dma_unmap_page
It turned out an iova pfn 0 got into iova_rcache. One possibility I see is
where client unmap with invalid dma_addr. The unmap call will fail and warn on
and still try to free iova. This will cause invalid pfn to be inserted into
rcache. As and when the magazine with invalid pfn will be freed
private_find_iova() will return NULL for invalid iova and meet bug condition.
I agree, we shouldn't be freeing the partial iova. Instead just makingSigned-off-by: Prakash Gupta <guptap@xxxxxxxxxxxxxx>
:100644 100644 4959f5df21bd 098f7d377e04 MÂÂÂ drivers/iommu/dma-iommu.c
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index 4959f5df21bd..098f7d377e04 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -472,7 +472,8 @@ static void __iommu_dma_unmap(struct device *dev, dma_addr_t dma_addr,
ÂÂÂÂÂÂÂ if (!cookie->fq_domain)
ÂÂÂÂÂÂÂÂÂ iommu_tlb_sync(domain, &iotlb_gather);
-ÂÂÂ iommu_dma_free_iova(cookie, dma_addr, size);
+ÂÂÂ if (unmapped)
+ÂÂÂÂÂÂÂ iommu_dma_free_iova(cookie, dma_addr, unmapped);
Frankly, if any part of the unmap fails then things have gone
catastrophically wrong already, but either way this isn't right. The
IOVA API doesn't support partial freeing - an IOVA *must* be freed
with its original size, or not freed at all, otherwise it will corrupt
the state of the rcaches and risk a cascade of further misbehaviour
for future callers.
sure if unmap was successful should be sufficient before freeing iova. So change
can instead be something like this:
-ÂÂÂ iommu_dma_free_iova(cookie, dma_addr, size);
+ÂÂÂ if (unmapped)
+ÂÂÂÂÂÂÂ iommu_dma_free_iova(cookie, dma_addr, size);
TBH my gut feeling here is that you're really just trying to treat aThis condition would arise only if driver calling dma_unmap/free_* with 0
symptom of another bug elsewhere, namely some driver calling
dma_unmap_* or dma_free_* with the wrong address or size in the first
place.
iova_pfn. This will be flagged with a warning during unmap but will trigger
panic later on while doing unrelated dma_map/unmap_*. If unmapped has already
failed for invalid iova, there is no reason we should consider this as valid
iova and free. This part should be fixed.
On 2020-05-22 00:19, Andrew Morton wrote:
I think we need a cc:stable here?Added now.
Thanks,
Prakash