Commit 80ef4464 authored Mar 20, 2019 by Robert Richter Committed by Joerg Roedel Mar 22, 2019

iommu/iova: Fix tracking of recently failed iova address



If a 32 bit allocation request is too big to possibly succeed, it
early exits with a failure and then should never update max32_alloc_
size. This patch fixes current code, now the size is only updated if
the slow path failed while walking the tree. Without the fix the
allocation may enter the slow path again even if there was a failure
before of a request with the same or a smaller size.

Cc: <stable@vger.kernel.org> # 4.20+
Fixes: bee60e94 ("iommu/iova: Optimise attempts to allocate iova from 32bit address range")
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Robert Richter <rrichter@marvell.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

parent 4e50ce03

drivers/iommu/iova.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -207,8 +207,10 @@ static int __alloc_and_insert_iova_range(struct iova_domain *iovad,
		curr_iova = rb_entry(curr, struct iova, node);
		} while (curr && new_pfn <= curr_iova->pfn_hi);

		if (limit_pfn < size \|\| new_pfn < iovad->start_pfn)
		if (limit_pfn < size \|\| new_pfn < iovad->start_pfn) {
		iovad->max32_alloc_size = size;
		goto iova32_full;
		}

		/* pfn_lo will point to size aligned address if size_aligned is set */
		new->pfn_lo = new_pfn;
		@@ -222,7 +224,6 @@ static int __alloc_and_insert_iova_range(struct iova_domain *iovad,
		return 0;

		iova32_full:
		iovad->max32_alloc_size = size;
		spin_unlock_irqrestore(&iovad->iova_rbtree_lock, flags);
		return -ENOMEM;
		}

Admin message