Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg...

Pull iommufd updates from Jason Gunthorpe:
 "Several fixes:

   - Add missing static const

   - Correct type 1 emulation for VFIO_CHECK_EXTENSION when no-iommu is
     turned on

   - Fix selftest memory leak and syzkaller splat

   - Fix missed -EFAULT in fault reporting write() fops

   - Fix a race where map/unmap with the internal IOVA allocator can
     unmap things it should not"

* tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd:
  iommufd: Fix a race with concurrent allocation and unmap
  iommufd/selftest: Remove MOCK_IOMMUPT_AMDV1 format
  iommufd: Fix return value of iommufd_fault_fops_write()
  iommufd: update outdated comment for renamed iommufd_hw_pagetable_alloc()
  iommufd/selftest: Fix page leaks in mock_viommu_{init,destroy}
  iommufd: vfio compatibility extension check for noiommu mode
  iommufd: Constify struct dma_buf_attach_ops

diff --cc drivers/iommu/iommufd/device.c
Simple merge

diff --cc drivers/iommu/iommufd/pages.c
index 8124c554f2cc3793382dc27105b34a4a98dc2730,4691456616ea39c34ca8b27df004c7cedcc9e5ab..9bdb2945afe1eb96fbc7323791453143ff146fe7
--- 1/drivers/iommu/iommufd/pages.c
--- 2/drivers/iommu/iommufd/pages.c
+++ b/drivers/iommu/iommufd/pages.c
@@@ -1450,9 -1450,9 +1450,9 @@@ static void iopt_revoke_notify(struct d
        pages->dmabuf.phys.len = 0;
  }
  
- static struct dma_buf_attach_ops iopt_dmabuf_attach_revoke_ops = {
+ static const struct dma_buf_attach_ops iopt_dmabuf_attach_revoke_ops = {
        .allow_peer2peer = true,
 -      .move_notify = iopt_revoke_notify,
 +      .invalidate_mappings = iopt_revoke_notify,
  };
  
  /*

diff --cc drivers/iommu/iommufd/selftest.c
Simple merge