backends/iommufd: Update iommufd_backend_alloc_viommu to allow user ptr
The updated IOMMUFD VIOMMU_ALLOC uAPI allows userspace to provide a data buffer when creating a vIOMMU (e.g. for Tegra241 CMDQV). Extend iommufd_backend_alloc_viommu() to pass a user pointer and size to the kernel. Update the caller accordingly. Signed-off-by: Nicolin Chen <nicolinc@nvidia.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> Tested-by: Nicolin Chen <nicolinc@nvidia.com> Signed-off-by: Shameer Kolothum <skolothumtho@nvidia.com> Tested-by: Eric Auger <eric.auger@redhat.com> Message-id: 20260609112552.378999-3-skolothumtho@nvidia.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Nicolin Chen committed
Jun 9, 2026 at 12:25 UTC
d2f3b3156dbdcdf3b2136e3450014317bdd9f864
4 files changed
+8
-3
backends/iommufd.c
+4
@@ -463,6 +463,7 @@ bool iommufd_backend_invalidate_cache(IOMMUFDBackend *be, uint32_t id,
463
464
bool iommufd_backend_alloc_viommu(IOMMUFDBackend *be, uint32_t dev_id,
465
uint32_t viommu_type, uint32_t hwpt_id,
466
+ void *data_ptr, uint32_t data_len,
467
uint32_t *out_viommu_id, Error **errp)
468
{
469
int ret;
@@ -471,11 +472,14 @@ bool iommufd_backend_alloc_viommu(IOMMUFDBackend *be, uint32_t dev_id,
472
.type = viommu_type,
473
.dev_id = dev_id,
474
.hwpt_id = hwpt_id,
475
+ .data_len = data_len,
476
+ .data_uptr = (uintptr_t)data_ptr,
477
};
478
479
ret = ioctl(be->fd, IOMMU_VIOMMU_ALLOC, &alloc_viommu);
480
481
trace_iommufd_backend_alloc_viommu(be->fd, dev_id, viommu_type, hwpt_id,
482
+ (uintptr_t)data_ptr, data_len,
483
alloc_viommu.out_viommu_id, ret);
484
if (ret) {
485
error_setg_errno(errp, errno, "IOMMU_VIOMMU_ALLOC failed");
backends/trace-events
+1
-1
@@ -21,7 +21,7 @@ iommufd_backend_free_id(int iommufd, uint32_t id, int ret) " iommufd=%d id=%d (%
21
iommufd_backend_set_dirty(int iommufd, uint32_t hwpt_id, bool start, int ret) " iommufd=%d hwpt=%u enable=%d (%d)"
22
iommufd_backend_get_dirty_bitmap(int iommufd, uint32_t hwpt_id, uint64_t iova, uint64_t size, uint64_t flags, uint64_t page_size, int ret) " iommufd=%d hwpt=%u iova=0x%"PRIx64" size=0x%"PRIx64" flags=0x%"PRIx64" page_size=0x%"PRIx64" (%d)"
23
iommufd_backend_invalidate_cache(int iommufd, uint32_t id, uint32_t data_type, uint32_t entry_len, uint32_t entry_num, uint32_t done_num, uint64_t data_ptr, int ret) " iommufd=%d id=%u data_type=%u entry_len=%u entry_num=%u done_num=%u data_ptr=0x%"PRIx64" (%d)"
24
-iommufd_backend_alloc_viommu(int iommufd, uint32_t dev_id, uint32_t type, uint32_t hwpt_id, uint32_t viommu_id, int ret) " iommufd=%d type=%u dev_id=%u hwpt_id=%u viommu_id=%u (%d)"
24
+iommufd_backend_alloc_viommu(int iommufd, uint32_t dev_id, uint32_t type, uint32_t hwpt_id, uint64_t data_ptr, uint32_t data_len, uint32_t viommu_id, int ret) " iommufd=%d type=%u dev_id=%u hwpt_id=%u data_ptr=0x%"PRIx64" data_len=0x%x viommu_id=%u (%d)"
25
iommufd_backend_alloc_vdev(int iommufd, uint32_t dev_id, uint32_t viommu_id, uint64_t virt_id, uint32_t vdev_id, int ret) " iommufd=%d dev_id=%u viommu_id=%u virt_id=0x%"PRIx64" vdev_id=%u (%d)"
26
iommufd_viommu_alloc_eventq(int iommufd, uint32_t viommu_id, uint32_t type, uint32_t veventq_id, uint32_t veventq_fd, int ret) " iommufd=%d viommu_id=%u type=%u veventq_id=%u veventq_fd=%u (%d)"
27
hw/arm/smmuv3-accel.c
+2
-2
@@ -582,8 +582,8 @@ smmuv3_accel_alloc_viommu(SMMUv3State *s, HostIOMMUDeviceIOMMUFD *hiodi,
582
IOMMUFDViommu *viommu;
583
584
if (!iommufd_backend_alloc_viommu(hiodi->iommufd, hiodi->devid,
585
- IOMMU_VIOMMU_TYPE_ARM_SMMUV3,
586
- s2_hwpt_id, &viommu_id, errp)) {
585
+ IOMMU_VIOMMU_TYPE_ARM_SMMUV3, s2_hwpt_id,
586
+ NULL, 0, &viommu_id, errp)) {
587
return false;
588
}
589
include/system/iommufd.h
+1
@@ -89,6 +89,7 @@ bool iommufd_backend_alloc_hwpt(IOMMUFDBackend *be, uint32_t dev_id,
89
Error **errp);
90
bool iommufd_backend_alloc_viommu(IOMMUFDBackend *be, uint32_t dev_id,
91
uint32_t viommu_type, uint32_t hwpt_id,
92
+ void *data_ptr, uint32_t data_len,
93
uint32_t *out_hwpt, Error **errp);
94
95
bool iommufd_backend_alloc_vdev(IOMMUFDBackend *be, uint32_t dev_id,