Commit 75df1386 authored by Robin Murphy's avatar Robin Murphy Committed by Will Deacon
Browse files

iommu/arm-smmu: Invalidate TLBs properly 



When invalidating an IOVA range potentially spanning multiple pages,
such as when removing an entire intermediate-level table, we currently
only issue an invalidation for the first IOVA of that range. Since the
architecture specifies that address-based TLB maintenance operations
target a single entry, an SMMU could feasibly retain live entries for
subsequent pages within that unmapped range, which is not good.

Make sure we hit every possible entry by iterating over the whole range
at the granularity provided by the pagetable implementation.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
[will: added missing semicolons...]
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 06c610e8

drivers/iommu/arm-smmu-v3.c

+4 −1
Original line number Diff line number Diff line
@@ -1360,7 +1360,10 @@ static void arm_smmu_tlb_inv_range_nosync(unsigned long iova, size_t size, 
		cmd.tlbi.vmid	= smmu_domain->s2_cfg.vmid;

	}



	do {

		arm_smmu_cmdq_issue_cmd(smmu, &cmd);

		cmd.tlbi.addr += granule;

	} while (size -= granule);

}



static struct iommu_gather_ops arm_smmu_gather_ops = {

drivers/iommu/arm-smmu.c

+13 −3
Original line number Diff line number Diff line
@@ -597,12 +597,18 @@ static void arm_smmu_tlb_inv_range_nosync(unsigned long iova, size_t size, 
		if (!IS_ENABLED(CONFIG_64BIT) || smmu->version == ARM_SMMU_V1) {

			iova &= ~12UL;

			iova |= ARM_SMMU_CB_ASID(cfg);

			do {

				writel_relaxed(iova, reg);

				iova += granule;

			} while (size -= granule);

#ifdef CONFIG_64BIT

		} else {

			iova >>= 12;

			iova |= (u64)ARM_SMMU_CB_ASID(cfg) << 48;

			do {

				writeq_relaxed(iova, reg);

				iova += granule >> 12;

			} while (size -= granule);

#endif

		}

#ifdef CONFIG_64BIT
@@ -610,7 +616,11 @@ static void arm_smmu_tlb_inv_range_nosync(unsigned long iova, size_t size, 
		reg = ARM_SMMU_CB_BASE(smmu) + ARM_SMMU_CB(smmu, cfg->cbndx);

		reg += leaf ? ARM_SMMU_CB_S2_TLBIIPAS2L :

			      ARM_SMMU_CB_S2_TLBIIPAS2;

		writeq_relaxed(iova >> 12, reg);

		iova >>= 12;

		do {

			writeq_relaxed(iova, reg);

			iova += granule >> 12;

		} while (size -= granule);

#endif

	} else {

		reg = ARM_SMMU_GR0(smmu) + ARM_SMMU_GR0_TLBIVMID;

CRA Git | Maintained and supported by SUSTech CRA and CCSE