On Mon, 2023-01-02 at 12:56 +0100, Niklas Schnelle wrote: > On s390 .iotlb_sync_map is used to sync mappings to an underlying > hypervisor by letting the hypervisor inspect the synced IOVA range and > updating its shadow table. This however means that it can fail as the > hypervisor may run out of resources. This can be due to the hypervisor > being unable to pin guest pages, due to a limit on concurrently mapped > addresses such as vfio_iommu_type1.dma_entry_limit or other resources. > Either way such a failure to sync a mapping should result in > a DMA_MAPPING_EROR. > > Now especially when running with batched IOTLB flushes for unmap it may > be that some IOVAs have already been invalidated but not yet synced via > .iotlb_sync_map. Thus if the hypervisor indicates running out of > resources, first do a global flush allowing the hypervisor to free > resources associated with these mappings and only if that also fails > report this error to callers. > > Signed-off-by: Niklas Schnelle <schnelle@xxxxxxxxxxxxx> > --- > drivers/iommu/amd/iommu.c | 5 +++-- > drivers/iommu/apple-dart.c | 5 +++-- > drivers/iommu/intel/iommu.c | 5 +++-- > drivers/iommu/iommu.c | 20 ++++++++++++++++---- > drivers/iommu/msm_iommu.c | 5 +++-- > drivers/iommu/mtk_iommu.c | 5 +++-- > drivers/iommu/s390-iommu.c | 29 ++++++++++++++++++++++++----- > drivers/iommu/sprd-iommu.c | 5 +++-- > drivers/iommu/tegra-gart.c | 5 +++-- > include/linux/iommu.h | 4 ++-- > 10 files changed, 63 insertions(+), 25 deletions(-) Ok kernel test robot reported that I missed an implementation of .iotlb_sync_map in drivers/iommu/sun50i-iommu.c during rebase as that was only added in v6.2-rc1 by commit e563cc0c787c85 ("iommu/sun50i: Implement .iotlb_sync_map"). Will add and send a v4 including the proposed commit message rewording too. > > diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c > index cbeaab55c0db..3df7d20e0e52 100644 > --- a/drivers/iommu/amd/iommu.c > +++ b/drivers/iommu/amd/iommu.c > @@ -2180,14 +2180,15 @@ static int amd_iommu_attach_device(struct iommu_domain *dom, > return ret; > } > > -static void amd_iommu_iotlb_sync_map(struct iommu_domain *dom, > - unsigned long iova, size_t size) ---8<---