]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iommu/arm-smmu-v3: Do not continue in __arm_smmu_domain_inv_range()
authorNicolin Chen <nicolinc@nvidia.com>
Sat, 21 Mar 2026 22:50:40 +0000 (15:50 -0700)
committerWill Deacon <will@kernel.org>
Tue, 24 Mar 2026 13:44:31 +0000 (13:44 +0000)
The loop in the __arm_smmu_domain_inv_range() is a while loop, not a for
loop. So, using "continue" is wrong that would fail to move the needle.

Meanwhile, though the current command is skipped, the batch still has to
go through arm_smmu_invs_end_batch() to be issued accordingly.

Thus, use "break" to fix the issue.

Fixes: 587bb3e56a2c ("iommu/arm-smmu-v3: Add arm_smmu_invs based arm_smmu_domain_inv_range()")
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Will Deacon <will@kernel.org>
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

index 01030ffd2fe23134ecf18d1deba65bd2abae72ee..c3c6987da9506f557cf3b152da1c9fd400e85890 100644 (file)
@@ -2688,7 +2688,7 @@ static void __arm_smmu_domain_inv_range(struct arm_smmu_invs *invs,
                case INV_TYPE_S2_VMID_S1_CLEAR:
                        /* CMDQ_OP_TLBI_S12_VMALL already flushed S1 entries */
                        if (arm_smmu_inv_size_too_big(cur->smmu, size, granule))
-                               continue;
+                               break;
                        cmd.tlbi.vmid = cur->id;
                        arm_smmu_cmdq_batch_add(smmu, &cmds, &cmd);
                        break;
@@ -2704,7 +2704,7 @@ static void __arm_smmu_domain_inv_range(struct arm_smmu_invs *invs,
                        break;
                default:
                        WARN_ON_ONCE(1);
-                       continue;
+                       break;
                }
 
                /* Skip any trash entry in-between */