5.10-stable patches

added patches:
	iommu-iova-improve-32-bit-free-space-estimate.patch

diff --git a/queue-5.10/iommu-iova-improve-32-bit-free-space-estimate.patch b/queue-5.10/iommu-iova-improve-32-bit-free-space-estimate.patch
new file mode 100644 (file)
index 0000000..1f04fc1
--- /dev/null
+++ b/queue-5.10/iommu-iova-improve-32-bit-free-space-estimate.patch
@@ -0,0 +1,52 @@
+From 5b61343b50590fb04a3f6be2cdc4868091757262 Mon Sep 17 00:00:00 2001
+From: Robin Murphy <robin.murphy@arm.com>
+Date: Thu, 3 Mar 2022 14:40:08 +0000
+Subject: iommu/iova: Improve 32-bit free space estimate
+
+From: Robin Murphy <robin.murphy@arm.com>
+
+commit 5b61343b50590fb04a3f6be2cdc4868091757262 upstream.
+
+For various reasons based on the allocator behaviour and typical
+use-cases at the time, when the max32_alloc_size optimisation was
+introduced it seemed reasonable to couple the reset of the tracked
+size to the update of cached32_node upon freeing a relevant IOVA.
+However, since subsequent optimisations focused on helping genuine
+32-bit devices make best use of even more limited address spaces, it
+is now a lot more likely for cached32_node to be anywhere in a "full"
+32-bit address space, and as such more likely for space to become
+available from IOVAs below that node being freed.
+
+At this point, the short-cut in __cached_rbnode_delete_update() really
+doesn't hold up any more, and we need to fix the logic to reliably
+provide the expected behaviour. We still want cached32_node to only move
+upwards, but we should reset the allocation size if *any* 32-bit space
+has become available.
+
+Reported-by: Yunfei Wang <yf.wang@mediatek.com>
+Signed-off-by: Robin Murphy <robin.murphy@arm.com>
+Reviewed-by: Miles Chen <miles.chen@mediatek.com>
+Link: https://lore.kernel.org/r/033815732d83ca73b13c11485ac39336f15c3b40.1646318408.git.robin.murphy@arm.com
+Signed-off-by: Joerg Roedel <jroedel@suse.de>
+Cc: Miles Chen <miles.chen@mediatek.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/iommu/iova.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/iommu/iova.c
++++ b/drivers/iommu/iova.c
+@@ -138,10 +138,11 @@ __cached_rbnode_delete_update(struct iov
+       cached_iova = rb_entry(iovad->cached32_node, struct iova, node);
+       if (free == cached_iova ||
+           (free->pfn_hi < iovad->dma_32bit_pfn &&
+-           free->pfn_lo >= cached_iova->pfn_lo)) {
++           free->pfn_lo >= cached_iova->pfn_lo))
+               iovad->cached32_node = rb_next(&free->node);
++
++      if (free->pfn_lo < iovad->dma_32bit_pfn)
+               iovad->max32_alloc_size = iovad->dma_32bit_pfn;
+-      }
+ 
+       cached_iova = rb_entry(iovad->cached_node, struct iova, node);
+       if (free->pfn_lo >= cached_iova->pfn_lo)

diff --git a/queue-5.10/series b/queue-5.10/series
index 1ee7c16b21287db4b633b42d6b4007fdd6885c27..18fcb5cf0f2649e9481fa6f18424d4a6adb684dd 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -20,3 +20,4 @@ input-zinitix-do-not-report-shadow-fingers.patch
 af_key-add-__gfp_zero-flag-for-compose_sadb_supporte.patch
 net-dsa-microchip-add-spi_device_id-tables.patch
 locking-lockdep-avoid-potential-access-of-invalid-memory-in-lock_class.patch
+iommu-iova-improve-32-bit-free-space-estimate.patch