Commit 56f8af5e authored by Will Deacon's avatar Will Deacon
Browse files

iommu: Pass struct iommu_iotlb_gather to ->unmap() and ->iotlb_sync() 



To allow IOMMU drivers to batch up TLB flushing operations and postpone
them until ->iotlb_sync() is called, extend the prototypes for the
->unmap() and ->iotlb_sync() IOMMU ops callbacks to take a pointer to
the current iommu_iotlb_gather structure.

All affected IOMMU drivers are updated, but there should be no
functional change since the extra parameter is ignored for now.

Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 4fcf8544

drivers/iommu/amd_iommu.c

+9 −2
Original line number Diff line number Diff line
@@ -3055,7 +3055,8 @@ static int amd_iommu_map(struct iommu_domain *dom, unsigned long iova, 
}



static size_t amd_iommu_unmap(struct iommu_domain *dom, unsigned long iova,

			   size_t page_size)

			      size_t page_size,

			      struct iommu_iotlb_gather *gather)

{

	struct protection_domain *domain = to_pdomain(dom);

	size_t unmap_size;
@@ -3196,6 +3197,12 @@ static void amd_iommu_flush_iotlb_all(struct iommu_domain *domain) 
	domain_flush_complete(dom);

}



static void amd_iommu_iotlb_sync(struct iommu_domain *domain,

				 struct iommu_iotlb_gather *gather)

{

	amd_iommu_flush_iotlb_all(domain);

}



const struct iommu_ops amd_iommu_ops = {

	.capable = amd_iommu_capable,

	.domain_alloc = amd_iommu_domain_alloc,
@@ -3214,7 +3221,7 @@ const struct iommu_ops amd_iommu_ops = { 
	.is_attach_deferred = amd_iommu_is_attach_deferred,

	.pgsize_bitmap	= AMD_IOMMU_PGSIZES,

	.flush_iotlb_all = amd_iommu_flush_iotlb_all,

	.iotlb_sync = amd_iommu_flush_iotlb_all,

	.iotlb_sync = amd_iommu_iotlb_sync,

};



/*****************************************************************************

drivers/iommu/arm-smmu-v3.c

+4 −3
Original line number Diff line number Diff line
@@ -1985,8 +1985,8 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova, 
	return ops->map(ops, iova, paddr, size, prot);

}



static size_t

arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova, size_t size)

static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,

			     size_t size, struct iommu_iotlb_gather *gather)

{

	int ret;

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);
@@ -2010,7 +2010,8 @@ static void arm_smmu_flush_iotlb_all(struct iommu_domain *domain) 
		arm_smmu_tlb_inv_context(smmu_domain);

}



static void arm_smmu_iotlb_sync(struct iommu_domain *domain)

static void arm_smmu_iotlb_sync(struct iommu_domain *domain,

				struct iommu_iotlb_gather *gather)

{

	struct arm_smmu_device *smmu = to_smmu_domain(domain)->smmu;

drivers/iommu/arm-smmu.c

+3 −2
Original line number Diff line number Diff line
@@ -1301,7 +1301,7 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova, 
}



static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,

			     size_t size)

			     size_t size, struct iommu_iotlb_gather *gather)

{

	struct io_pgtable_ops *ops = to_smmu_domain(domain)->pgtbl_ops;

	struct arm_smmu_device *smmu = to_smmu_domain(domain)->smmu;
@@ -1329,7 +1329,8 @@ static void arm_smmu_flush_iotlb_all(struct iommu_domain *domain) 
	}

}



static void arm_smmu_iotlb_sync(struct iommu_domain *domain)

static void arm_smmu_iotlb_sync(struct iommu_domain *domain,

				struct iommu_iotlb_gather *gather)

{

	struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain);

	struct arm_smmu_device *smmu = smmu_domain->smmu;

drivers/iommu/exynos-iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -1130,7 +1130,8 @@ static void exynos_iommu_tlb_invalidate_entry(struct exynos_iommu_domain *domain 
}



static size_t exynos_iommu_unmap(struct iommu_domain *iommu_domain,

				 unsigned long l_iova, size_t size)

				 unsigned long l_iova, size_t size,

				 struct iommu_iotlb_gather *gather)

{

	struct exynos_iommu_domain *domain = to_exynos_domain(iommu_domain);

	sysmmu_iova_t iova = (sysmmu_iova_t)l_iova;

drivers/iommu/intel-iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -5147,7 +5147,8 @@ static int intel_iommu_map(struct iommu_domain *domain, 
}



static size_t intel_iommu_unmap(struct iommu_domain *domain,

				unsigned long iova, size_t size)

				unsigned long iova, size_t size,

				struct iommu_iotlb_gather *gather)

{

	struct dmar_domain *dmar_domain = to_dmar_domain(domain);

	struct page *freelist = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE