From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Apr 2026 04:21:55 +0000 (-0700)
Subject: Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg... 
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43cfbdda5af60ffc6272a7b8c5c37d1d0a181ca9;p=thirdparty%2Fkernel%2Flinux.git

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

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
---

43cfbdda5af60ffc6272a7b8c5c37d1d0a181ca9
diff --cc drivers/iommu/iommufd/pages.c
index 8124c554f2cc3,4691456616ea3..9bdb2945afe1e
--- a/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,
  };
  
  /*