On Mon, Sep 18, 2017 at 04:21:53PM +0100, Robin Murphy wrote: > Now that the core API issues its own post-unmap TLB sync call, push that > operation out from the io-pgtable-arm internals into the users. For now, > we leave the invalidation implicit in the unmap operation, since none of > the current users would benefit much from any change to that. > > CC: Magnus Damm <[email protected]> > CC: Laurent Pinchart <[email protected]> > Signed-off-by: Robin Murphy <[email protected]> > --- > drivers/iommu/arm-smmu-v3.c | 6 ++++++ > drivers/iommu/arm-smmu.c | 18 +++++++++++++----- > drivers/iommu/io-pgtable-arm.c | 7 +------ > drivers/iommu/ipmmu-vmsa.c | 6 ++++++ > 4 files changed, 26 insertions(+), 11 deletions(-) > > diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c > index e67ba6c40faf..6a866e029173 100644 > --- a/drivers/iommu/arm-smmu-v3.c > +++ b/drivers/iommu/arm-smmu-v3.c > @@ -1743,6 +1743,11 @@ arm_smmu_unmap(struct iommu_domain *domain, unsigned > long iova, size_t size) > return ops->unmap(ops, iova, size); > } > > +static void arm_smmu_iotlb_sync(struct iommu_domain *domain) > +{ > + __arm_smmu_tlb_sync(to_smmu_domain(domain)->smmu); > +} > + > static phys_addr_t > arm_smmu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova) > { > @@ -1963,6 +1968,7 @@ static struct iommu_ops arm_smmu_ops = { > .map = arm_smmu_map, > .unmap = arm_smmu_unmap, > .map_sg = default_iommu_map_sg, > + .iotlb_sync = arm_smmu_iotlb_sync, > .iova_to_phys = arm_smmu_iova_to_phys, > .add_device = arm_smmu_add_device, > .remove_device = arm_smmu_remove_device, > diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c > index 3bdb799d3b4b..c4b7efe08ce4 100644 > --- a/drivers/iommu/arm-smmu.c > +++ b/drivers/iommu/arm-smmu.c > @@ -250,6 +250,7 @@ enum arm_smmu_domain_stage { > struct arm_smmu_domain { > struct arm_smmu_device *smmu; > struct io_pgtable_ops *pgtbl_ops; > + const struct iommu_gather_ops *tlb_ops;
Hmmm.... I *suppose* that means there's a way to the TLB invalidation functions from the iommu_device field of the io_pgtable_cfg via something like iommu_ops_from_fwnode, but it feels horribly ugly doing that so I'm happy to keep the extra gather_ops pointer in the io_pgtable_cfg for now. This patch and the subsequent one look fine to me, but I'd like to go a step further and hook-up the add_flush callback too so that it can be (mostly) removed from the io_pgtable code and make the *_fast operations even cheaper for VFIO when it starts using them. So, Acked-by: Will Deacon <[email protected]> Joerg, do you reckon it's worth merging this as-is, or should we also hook up add_flush before implementing this? Will _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
