On 2021-04-04 23:00, Lu Baolu wrote:
Hi,

On 4/2/21 9:34 AM, Isaac J. Manjarres wrote:
  static size_t __iommu_unmap(struct iommu_domain *domain,
                            unsigned long iova, size_t size,
                            struct iommu_iotlb_gather *iotlb_gather)
@@ -2476,7 +2519,7 @@ static size_t __iommu_unmap(struct iommu_domain *domain,
        unsigned long orig_iova = iova;
        unsigned int min_pagesz;
  -     if (unlikely(ops->unmap == NULL ||
+       if (unlikely((ops->unmap == NULL && ops->unmap_pages == NULL) ||
                     domain->pgsize_bitmap == 0UL))

This change should also be applied to __iommu_map() path. And perhaps
could be:

if (unlikely(!(ops->unmap || ops->unmap_pages) || !domain->pgsize_bitmap))

Yep, that's correct. Thank you for spotting that; I've updated it in the latest series: https://lore.kernel.org/linux-iommu/20210405191112.28192-1-isa...@codeaurora.org/T/#t.

Thanks,
Isaac
Best regards,
baolu

_______________________________________________
linux-arm-kernel mailing list
linux-arm-ker...@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to