[PATCH 6.5] iommu/arm-smmu-v3: Avoid constructing invalid range commands

[PATCH 6.5] iommu/arm-smmu-v3: Avoid constructing invalid range commands

[Easwar Hariharan]

From: Robin Murphy <robin.murphy@arm.com>

commit eb6c97647be227822c7ce23655482b05e348fba5 upstream

Although io-pgtable's non-leaf invalidations are always for full tables,
I missed that SVA also uses non-leaf invalidations, while being at the
mercy of whatever range the MMU notifier throws at it. This means it
definitely wants the previous TTL fix as well, since it also doesn't
know exactly which leaf level(s) may need invalidating, but it can also
give us less-aligned ranges wherein certain corners may lead to building
an invalid command where TTL, Num and Scale are all 0. It should be fine
to handle this by over-invalidating an extra page, since falling back to
a non-range command opens up a whole can of errata-flavoured worms.

Fixes: 6833b8f2e199 ("iommu/arm-smmu-v3: Set TTL invalidation hint better")
Reported-by: Rui Zhu <zhurui3@huawei.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/b99cfe71af2bd93a8a2930f20967fb2a4f7748dd.1694432734.git.robin.murphy@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com>
---
 drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index 9b0dc3505601..6ccbae9b93a1 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -1895,18 +1895,23 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd,
 		/* Get the leaf page size */
 		tg = __ffs(smmu_domain->domain.pgsize_bitmap);
 
+		num_pages = size >> tg;
+
 		/* Convert page size of 12,14,16 (log2) to 1,2,3 */
 		cmd->tlbi.tg = (tg - 10) / 2;
 
 		/*
-		 * Determine what level the granule is at. For non-leaf, io-pgtable
-		 * assumes .tlb_flush_walk can invalidate multiple levels at once,
-		 * so ignore the nominal last-level granule and leave TTL=0.
+		 * Determine what level the granule is at. For non-leaf, both
+		 * io-pgtable and SVA pass a nominal last-level granule because
+		 * they don't know what level(s) actually apply, so ignore that
+		 * and leave TTL=0. However for various errata reasons we still
+		 * want to use a range command, so avoid the SVA corner case
+		 * where both scale and num could be 0 as well.
 		 */
 		if (cmd->tlbi.leaf)
 			cmd->tlbi.ttl = 4 - ((ilog2(granule) - 3) / (tg - 3));
-
-		num_pages = size >> tg;
+		else if ((num_pages & CMDQ_TLBI_RANGE_NUM_MAX) == 1)
+			num_pages++;
 	}
 
 	cmds.num = 0;
-- 
2.34.1

Re: [PATCH 6.5] iommu/arm-smmu-v3: Avoid constructing invalid range commands

[Sasha Levin]

On Thu, Oct 05, 2023 at 07:34:25PM +0000, Easwar Hariharan wrote:
>From: Robin Murphy <robin.murphy@arm.com>
>
>commit eb6c97647be227822c7ce23655482b05e348fba5 upstream
>
>Although io-pgtable's non-leaf invalidations are always for full tables,
>I missed that SVA also uses non-leaf invalidations, while being at the
>mercy of whatever range the MMU notifier throws at it. This means it
>definitely wants the previous TTL fix as well, since it also doesn't
>know exactly which leaf level(s) may need invalidating, but it can also
>give us less-aligned ranges wherein certain corners may lead to building
>an invalid command where TTL, Num and Scale are all 0. It should be fine
>to handle this by over-invalidating an extra page, since falling back to
>a non-range command opens up a whole can of errata-flavoured worms.
>
>Fixes: 6833b8f2e199 ("iommu/arm-smmu-v3: Set TTL invalidation hint better")
>Reported-by: Rui Zhu <zhurui3@huawei.com>
>Signed-off-by: Robin Murphy <robin.murphy@arm.com>
>Link: https://lore.kernel.org/r/b99cfe71af2bd93a8a2930f20967fb2a4f7748dd.1694432734.git.robin.murphy@arm.com
>Signed-off-by: Will Deacon <will@kernel.org>
>Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com>

Queued this and the ones for older kernels. In general, if it's just a
cherrypick, please just list commit ids as it makes our lives much
easier :)

-- 
Thanks,
Sasha

Re: [PATCH 6.5] iommu/arm-smmu-v3: Avoid constructing invalid range commands

[Easwar Hariharan]

On 10/6/23 06:52, Sasha Levin wrote:
<snip>
> Queued this and the ones for older kernels. In general, if it's just a
> cherrypick, please just list commit ids as it makes our lives much
> easier :)
> 

Will do for next time. :)

-- 
Thanks,
Easwar