Hi Linus,
Nothing big this time, I was hoping viommu would make it, but not yet.
There is a small merge conflict "take mine" to resolve, the mm tree
added a debugfs.h include to a file that mine already has.
The tag for-linus-iommufd-merged with my merge resolution to your tree
is also available to pull.
Thanks,
Jason
The following changes since commit 5be63fc19fcaa4c236b307420483578a56986a37:
Linux 6.11-rc5 (2024-08-25 19:07:11 +1200)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git tags/for-linus-iommufd
for you to fetch changes up to 79805c1bbbf9846fe91c16933d64614cbbff1dee:
iommu: Set iommu_attach_handle->domain in core (2024-09-11 20:14:07 -0300)
----------------------------------------------------------------
iommufd 6.12 merge window pull
Collection of small cleanup and one fix:
- Sort headers and struct forward declarations
- Fix random selftest failures in some cases due to dirty tracking tests
- Have the reserved IOVA regions mechanism work when a HWPT is used as a
nesting parent. This updates the nesting parent's IOAS with the reserved
regions of the device and will also install the ITS doorbell page on
ARM.
- Add missed validation of parent domain ops against the current iommu
- Fix a syzkaller bug related to integer overflow during ALIGN()
- Tidy two iommu_domain attach paths
----------------------------------------------------------------
Jason Gunthorpe (4):
iommufd/selftest: Fix buffer read overrrun in the dirty test
Merge branch 'nesting_reserved_regions' into iommufd.git for-next
iommufd: Check the domain owner of the parent before creating a nesting domain
iommufd: Protect against overflow of ALIGN() during iova allocation
Nicolin Chen (3):
iommufd: Reorder include files
iommufd/device: Enforce reserved IOVA also when attached to hwpt_nested
iommufd: Reorder struct forward declarations
Yi Liu (2):
iommufd: Avoid duplicated __iommu_group_set_core_domain() call
iommu: Set iommu_attach_handle->domain in core
drivers/iommu/iommu.c | 1 +
drivers/iommu/iommufd/device.c | 56 ++++++++++++++++-----------------
drivers/iommu/iommufd/fault.c | 5 ++-
drivers/iommu/iommufd/hw_pagetable.c | 3 +-
drivers/iommu/iommufd/io_pagetable.c | 16 +++++++---
drivers/iommu/iommufd/io_pagetable.h | 2 +-
drivers/iommu/iommufd/ioas.c | 2 +-
drivers/iommu/iommufd/iommufd_private.h | 32 ++++++++++++++++---
drivers/iommu/iommufd/iommufd_test.h | 2 +-
drivers/iommu/iommufd/iova_bitmap.c | 2 +-
drivers/iommu/iommufd/main.c | 8 ++---
drivers/iommu/iommufd/pages.c | 10 +++---
drivers/iommu/iommufd/selftest.c | 19 ++++++-----
include/linux/iommufd.h | 12 +++----
include/uapi/linux/iommufd.h | 2 +-
15 files changed, 101 insertions(+), 71 deletions(-)
(diffstat from tag for-linus-iommufd-merged)
Attachment:
signature.asc
Description: PGP signature
