With IOMMUFDDevice passed to vIOMMU, we can query hw IOMMU information and allocate hwpt for a device, but still need an extensible interface for vIOMMU usage.
This introduces an IOMMUFDDevice targeted interface for vIOMMU. Currently this interface includes two callbacks attach_hwpt/detach_hwpt for vIOMMU to attach to or detach from hwpt on host side. Signed-off-by: Yi Liu <[email protected]> Signed-off-by: Zhenzhong Duan <[email protected]> --- include/sysemu/iommufd_device.h | 11 ++++++++++- backends/iommufd_device.c | 16 +++++++++++++++- hw/vfio/iommufd.c | 3 ++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/include/sysemu/iommufd_device.h b/include/sysemu/iommufd_device.h index 795630324b..799c1345fd 100644 --- a/include/sysemu/iommufd_device.h +++ b/include/sysemu/iommufd_device.h @@ -17,15 +17,24 @@ typedef struct IOMMUFDDevice IOMMUFDDevice; +typedef struct IOMMUFDDeviceOps { + int (*attach_hwpt)(IOMMUFDDevice *idev, uint32_t hwpt_id); + int (*detach_hwpt)(IOMMUFDDevice *idev); +} IOMMUFDDeviceOps; + /* This is an abstraction of host IOMMUFD device */ struct IOMMUFDDevice { IOMMUFDBackend *iommufd; uint32_t dev_id; + IOMMUFDDeviceOps *ops; }; +int iommufd_device_attach_hwpt(IOMMUFDDevice *idev, uint32_t hwpt_id); +int iommufd_device_detach_hwpt(IOMMUFDDevice *idev); int iommufd_device_get_info(IOMMUFDDevice *idev, enum iommu_hw_info_type *type, uint32_t len, void *data); void iommufd_device_init(void *_idev, size_t instance_size, - IOMMUFDBackend *iommufd, uint32_t dev_id); + IOMMUFDBackend *iommufd, uint32_t dev_id, + IOMMUFDDeviceOps *ops); #endif diff --git a/backends/iommufd_device.c b/backends/iommufd_device.c index f6e7ca1dbf..26f69252d2 100644 --- a/backends/iommufd_device.c +++ b/backends/iommufd_device.c @@ -14,6 +14,18 @@ #include "qemu/error-report.h" #include "sysemu/iommufd_device.h" +int iommufd_device_attach_hwpt(IOMMUFDDevice *idev, uint32_t hwpt_id) +{ + g_assert(idev->ops->attach_hwpt); + return idev->ops->attach_hwpt(idev, hwpt_id); +} + +int iommufd_device_detach_hwpt(IOMMUFDDevice *idev) +{ + g_assert(idev->ops->detach_hwpt); + return idev->ops->detach_hwpt(idev); +} + int iommufd_device_get_info(IOMMUFDDevice *idev, enum iommu_hw_info_type *type, uint32_t len, void *data) @@ -39,7 +51,8 @@ int iommufd_device_get_info(IOMMUFDDevice *idev, } void iommufd_device_init(void *_idev, size_t instance_size, - IOMMUFDBackend *iommufd, uint32_t dev_id) + IOMMUFDBackend *iommufd, uint32_t dev_id, + IOMMUFDDeviceOps *ops) { IOMMUFDDevice *idev = (IOMMUFDDevice *)_idev; @@ -47,4 +60,5 @@ void iommufd_device_init(void *_idev, size_t instance_size, idev->iommufd = iommufd; idev->dev_id = dev_id; + idev->ops = ops; } diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c index cbd035f148..1b174b71ee 100644 --- a/hw/vfio/iommufd.c +++ b/hw/vfio/iommufd.c @@ -429,7 +429,8 @@ found_container: QLIST_INSERT_HEAD(&bcontainer->device_list, vbasedev, container_next); QLIST_INSERT_HEAD(&vfio_device_list, vbasedev, global_next); - iommufd_device_init(idev, sizeof(*idev), container->be, vbasedev->devid); + iommufd_device_init(idev, sizeof(*idev), container->be, vbasedev->devid, + NULL); trace_iommufd_cdev_device_info(vbasedev->name, devfd, vbasedev->num_irqs, vbasedev->num_regions, vbasedev->flags); return 0; -- 2.34.1
