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

iommu/io-pgtable: Remove tlb_flush_leaf 



The only user of tlb_flush_leaf is a particularly hairy corner of the
Arm short-descriptor code, which wants a synchronous invalidation to
minimise the races inherent in trying to split a large page mapping.
This is already far enough into "here be dragons" territory that no
sensible caller should ever hit it, and thus it really doesn't need
optimising. Although using tlb_flush_walk there may technically be
more heavyweight than needed, it does the job and saves everyone else
having to carry around useless baggage.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarSteven Price <steven.price@arm.com>
Link: https://lore.kernel.org/r/9844ab0c5cb3da8b2f89c6c2da16941910702b41.1606324115.git.robin.murphy@arm.com


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

drivers/gpu/drm/msm/msm_iommu.c

+0 −1
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ static void msm_iommu_tlb_add_page(struct iommu_iotlb_gather *gather, 
static const struct iommu_flush_ops null_tlb_ops = {

	.tlb_flush_all = msm_iommu_tlb_flush_all,

	.tlb_flush_walk = msm_iommu_tlb_flush_walk,

	.tlb_flush_leaf = msm_iommu_tlb_flush_walk,

	.tlb_add_page = msm_iommu_tlb_add_page,

};

drivers/gpu/drm/panfrost/panfrost_mmu.c

+0 −7
Original line number Diff line number Diff line
@@ -347,16 +347,9 @@ static void mmu_tlb_flush_walk(unsigned long iova, size_t size, size_t granule, 
	mmu_tlb_sync_context(cookie);

}



static void mmu_tlb_flush_leaf(unsigned long iova, size_t size, size_t granule,

			       void *cookie)

{

	mmu_tlb_sync_context(cookie);

}



static const struct iommu_flush_ops mmu_tlb_ops = {

	.tlb_flush_all	= mmu_tlb_inv_context_s1,

	.tlb_flush_walk = mmu_tlb_flush_walk,

	.tlb_flush_leaf = mmu_tlb_flush_leaf,

};



int panfrost_mmu_pgtable_alloc(struct panfrost_file_priv *priv)

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+0 −7
Original line number Diff line number Diff line
@@ -1760,16 +1760,9 @@ static void arm_smmu_tlb_inv_walk(unsigned long iova, size_t size, 
	arm_smmu_tlb_inv_range(iova, size, granule, false, cookie);

}



static void arm_smmu_tlb_inv_leaf(unsigned long iova, size_t size,

				  size_t granule, void *cookie)

{

	arm_smmu_tlb_inv_range(iova, size, granule, true, cookie);

}



static const struct iommu_flush_ops arm_smmu_flush_ops = {

	.tlb_flush_all	= arm_smmu_tlb_inv_context,

	.tlb_flush_walk = arm_smmu_tlb_inv_walk,

	.tlb_flush_leaf = arm_smmu_tlb_inv_leaf,

	.tlb_add_page	= arm_smmu_tlb_inv_page_nosync,

};

drivers/iommu/arm/arm-smmu/arm-smmu.c

+3 −22
Original line number Diff line number Diff line
@@ -333,14 +333,6 @@ static void arm_smmu_tlb_inv_walk_s1(unsigned long iova, size_t size, 
	arm_smmu_tlb_sync_context(cookie);

}



static void arm_smmu_tlb_inv_leaf_s1(unsigned long iova, size_t size,

				     size_t granule, void *cookie)

{

	arm_smmu_tlb_inv_range_s1(iova, size, granule, cookie,

				  ARM_SMMU_CB_S1_TLBIVAL);

	arm_smmu_tlb_sync_context(cookie);

}



static void arm_smmu_tlb_add_page_s1(struct iommu_iotlb_gather *gather,

				     unsigned long iova, size_t granule,

				     void *cookie)
@@ -357,14 +349,6 @@ static void arm_smmu_tlb_inv_walk_s2(unsigned long iova, size_t size, 
	arm_smmu_tlb_sync_context(cookie);

}



static void arm_smmu_tlb_inv_leaf_s2(unsigned long iova, size_t size,

				     size_t granule, void *cookie)

{

	arm_smmu_tlb_inv_range_s2(iova, size, granule, cookie,

				  ARM_SMMU_CB_S2_TLBIIPAS2L);

	arm_smmu_tlb_sync_context(cookie);

}



static void arm_smmu_tlb_add_page_s2(struct iommu_iotlb_gather *gather,

				     unsigned long iova, size_t granule,

				     void *cookie)
@@ -373,7 +357,7 @@ static void arm_smmu_tlb_add_page_s2(struct iommu_iotlb_gather *gather, 
				  ARM_SMMU_CB_S2_TLBIIPAS2L);

}



static void arm_smmu_tlb_inv_any_s2_v1(unsigned long iova, size_t size,

static void arm_smmu_tlb_inv_walk_s2_v1(unsigned long iova, size_t size,

					size_t granule, void *cookie)

{

	arm_smmu_tlb_inv_context_s2(cookie);
@@ -401,21 +385,18 @@ static void arm_smmu_tlb_add_page_s2_v1(struct iommu_iotlb_gather *gather, 
static const struct iommu_flush_ops arm_smmu_s1_tlb_ops = {

	.tlb_flush_all	= arm_smmu_tlb_inv_context_s1,

	.tlb_flush_walk	= arm_smmu_tlb_inv_walk_s1,

	.tlb_flush_leaf	= arm_smmu_tlb_inv_leaf_s1,

	.tlb_add_page	= arm_smmu_tlb_add_page_s1,

};



static const struct iommu_flush_ops arm_smmu_s2_tlb_ops_v2 = {

	.tlb_flush_all	= arm_smmu_tlb_inv_context_s2,

	.tlb_flush_walk	= arm_smmu_tlb_inv_walk_s2,

	.tlb_flush_leaf	= arm_smmu_tlb_inv_leaf_s2,

	.tlb_add_page	= arm_smmu_tlb_add_page_s2,

};



static const struct iommu_flush_ops arm_smmu_s2_tlb_ops_v1 = {

	.tlb_flush_all	= arm_smmu_tlb_inv_context_s2,

	.tlb_flush_walk	= arm_smmu_tlb_inv_any_s2_v1,

	.tlb_flush_leaf	= arm_smmu_tlb_inv_any_s2_v1,

	.tlb_flush_walk	= arm_smmu_tlb_inv_walk_s2_v1,

	.tlb_add_page	= arm_smmu_tlb_add_page_s2_v1,

};

drivers/iommu/arm/arm-smmu/qcom_iommu.c

+0 −8
Original line number Diff line number Diff line
@@ -185,13 +185,6 @@ static void qcom_iommu_tlb_flush_walk(unsigned long iova, size_t size, 
	qcom_iommu_tlb_sync(cookie);

}



static void qcom_iommu_tlb_flush_leaf(unsigned long iova, size_t size,

				      size_t granule, void *cookie)

{

	qcom_iommu_tlb_inv_range_nosync(iova, size, granule, true, cookie);

	qcom_iommu_tlb_sync(cookie);

}



static void qcom_iommu_tlb_add_page(struct iommu_iotlb_gather *gather,

				    unsigned long iova, size_t granule,

				    void *cookie)
@@ -202,7 +195,6 @@ static void qcom_iommu_tlb_add_page(struct iommu_iotlb_gather *gather, 
static const struct iommu_flush_ops qcom_flush_ops = {

	.tlb_flush_all	= qcom_iommu_tlb_inv_context,

	.tlb_flush_walk = qcom_iommu_tlb_flush_walk,

	.tlb_flush_leaf = qcom_iommu_tlb_flush_leaf,

	.tlb_add_page	= qcom_iommu_tlb_add_page,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE