90 lines
3.9 KiB
Diff
90 lines
3.9 KiB
Diff
|
|
From 005b8f4b6cef11982abcc2c071cbe40b69fb22e7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Nicolin Chen <nicolinc@nvidia.com>
|
||
|
|
Date: Sat, 13 Apr 2024 00:21:22 +0000
|
||
|
|
Subject: [PATCH] backends/iommufd: Introduce iommufd_vdev_alloc
|
||
|
|
|
||
|
|
Add a helper to allocate an iommufd device's virtual device (in the user
|
||
|
|
space) per a viommu instance.
|
||
|
|
|
||
|
|
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
|
||
|
|
---
|
||
|
|
backends/iommufd.c | 31 +++++++++++++++++++++++++++++++
|
||
|
|
backends/trace-events | 1 +
|
||
|
|
include/sysemu/iommufd.h | 11 +++++++++++
|
||
|
|
3 files changed, 43 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/backends/iommufd.c b/backends/iommufd.c
|
||
|
|
index 82368a3918..af3376d0bf 100644
|
||
|
|
--- a/backends/iommufd.c
|
||
|
|
+++ b/backends/iommufd.c
|
||
|
|
@@ -395,6 +395,37 @@ struct IOMMUFDViommu *iommufd_backend_alloc_viommu(IOMMUFDBackend *be,
|
||
|
|
return viommu;
|
||
|
|
}
|
||
|
|
|
||
|
|
+struct IOMMUFDVdev *iommufd_backend_alloc_vdev(HostIOMMUDeviceIOMMUFD *idev,
|
||
|
|
+ IOMMUFDViommu *viommu,
|
||
|
|
+ uint64_t virt_id)
|
||
|
|
+{
|
||
|
|
+ int ret, fd = viommu->iommufd->fd;
|
||
|
|
+ struct IOMMUFDVdev *vdev = g_malloc(sizeof(*vdev));
|
||
|
|
+ struct iommu_vdevice_alloc alloc_vdev = {
|
||
|
|
+ .size = sizeof(alloc_vdev),
|
||
|
|
+ .viommu_id = viommu->viommu_id,
|
||
|
|
+ .dev_id = idev->devid,
|
||
|
|
+ .virt_id = virt_id,
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
+ ret = ioctl(fd, IOMMU_VDEVICE_ALLOC, &alloc_vdev);
|
||
|
|
+
|
||
|
|
+ trace_iommufd_backend_alloc_vdev(fd, idev->devid, viommu->viommu_id, virt_id,
|
||
|
|
+ alloc_vdev.out_vdevice_id, ret);
|
||
|
|
+
|
||
|
|
+ if (ret) {
|
||
|
|
+ error_report("IOMMU_VDEVICE_ALLOC failed: %s", strerror(errno));
|
||
|
|
+ g_free(vdev);
|
||
|
|
+ return NULL;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ vdev->idev = idev;
|
||
|
|
+ vdev->viommu = viommu;
|
||
|
|
+ vdev->virt_id = virt_id;
|
||
|
|
+ vdev->vdev_id = alloc_vdev.out_vdevice_id;
|
||
|
|
+ return vdev;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
bool host_iommu_device_iommufd_attach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
|
||
|
|
uint32_t hwpt_id, Error **errp)
|
||
|
|
{
|
||
|
|
diff --git a/backends/trace-events b/backends/trace-events
|
||
|
|
index c24cd378df..e150a37e9a 100644
|
||
|
|
--- a/backends/trace-events
|
||
|
|
+++ b/backends/trace-events
|
||
|
|
@@ -20,3 +20,4 @@ iommufd_backend_set_dirty(int iommufd, uint32_t hwpt_id, bool start, int ret) "
|
||
|
|
iommufd_backend_get_dirty_bitmap(int iommufd, uint32_t hwpt_id, uint64_t iova, uint64_t size, uint64_t page_size, int ret) " iommufd=%d hwpt=%u iova=0x%"PRIx64" size=0x%"PRIx64" page_size=0x%"PRIx64" (%d)"
|
||
|
|
iommufd_backend_invalidate_cache(int iommufd, uint32_t hwpt_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 hwpt_id=%u data_type=%u entry_len=%u entry_num=%u done_num=%u data_ptr=0x%"PRIx64" (%d)"
|
||
|
|
iommufd_backend_alloc_viommu(int iommufd, uint32_t type, uint32_t dev_id, uint32_t hwpt_id, uint32_t viommu_id, int ret) " iommufd=%d type=%u dev_id=%u hwpt_id=%u viommu_id=%u (%d)"
|
||
|
|
+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)"
|
||
|
|
diff --git a/include/sysemu/iommufd.h b/include/sysemu/iommufd.h
|
||
|
|
index 05a08c49c2..0284e95460 100644
|
||
|
|
--- a/include/sysemu/iommufd.h
|
||
|
|
+++ b/include/sysemu/iommufd.h
|
||
|
|
@@ -128,4 +128,15 @@ bool host_iommu_device_iommufd_attach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
|
||
|
|
uint32_t hwpt_id, Error **errp);
|
||
|
|
bool host_iommu_device_iommufd_detach_hwpt(HostIOMMUDeviceIOMMUFD *idev,
|
||
|
|
Error **errp);
|
||
|
|
+
|
||
|
|
+typedef struct IOMMUFDVdev {
|
||
|
|
+ HostIOMMUDeviceIOMMUFD *idev;
|
||
|
|
+ IOMMUFDViommu *viommu;
|
||
|
|
+ uint32_t vdev_id;
|
||
|
|
+ uint64_t virt_id;
|
||
|
|
+} IOMMUFDVdev;
|
||
|
|
+
|
||
|
|
+struct IOMMUFDVdev *iommufd_backend_alloc_vdev(HostIOMMUDeviceIOMMUFD *idev,
|
||
|
|
+ IOMMUFDViommu *viommu,
|
||
|
|
+ uint64_t virt_id);
|
||
|
|
#endif
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|