commit 2d1bf2589736b3714f3940d360404732ac13019c
author Joao Martins <joao.m.martins@oracle.com> Fri Jul 19 13:04:51 2024 +0100
committer Cédric Le Goater <clg@redhat.com> Tue Jul 23 17:14:52 2024 +0200
tree d415bb2dc8377c5c42208a8c6b1ca3359c8f597c
parent 9f17604195c03580b16c3cc5631c86f3894dd442

backends/iommufd: Extend iommufd_backend_get_device_info() to fetch HW capabilities

The helper will be able to fetch vendor agnostic IOMMU capabilities
supported both by hardware and software. Right now it is only iommu dirty
tracking.

Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>

backends/iommufd.c

diff --git a/backends/iommufd.c b/backends/iommufd.c
index cabd1b5..48dfd39 100644
--- a/backends/iommufd.c
+++ b/backends/iommufd.c
@@ -209,7 +209,7 @@
 
 bool iommufd_backend_get_device_info(IOMMUFDBackend *be, uint32_t devid,
                                      uint32_t *type, void *data, uint32_t len,
-                                     Error **errp)
+                                     uint64_t *caps, Error **errp)
 {
     struct iommu_hw_info info = {
         .size = sizeof(info),
@@ -225,6 +225,8 @@
 
     g_assert(type);
     *type = info.out_data_type;
+    g_assert(caps);
+    *caps = info.out_capabilities;
 
     return true;
 }

hw/vfio/iommufd.c

diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
index 7b5f87a..7c1b9e0 100644
--- a/hw/vfio/iommufd.c
+++ b/hw/vfio/iommufd.c
@@ -628,11 +628,13 @@
     union {
         struct iommu_hw_info_vtd vtd;
     } data;
+    uint64_t hw_caps;
 
     hiod->agent = opaque;
 
     if (!iommufd_backend_get_device_info(vdev->iommufd, vdev->devid,
-                                         &type, &data, sizeof(data), errp)) {
+                                         &type, &data, sizeof(data),
+                                         &hw_caps, errp)) {
         return false;
     }
 

include/sysemu/iommufd.h

diff --git a/include/sysemu/iommufd.h b/include/sysemu/iommufd.h
index 9edfec6..57d502a 100644
--- a/include/sysemu/iommufd.h
+++ b/include/sysemu/iommufd.h
@@ -49,7 +49,7 @@
                               hwaddr iova, ram_addr_t size);
 bool iommufd_backend_get_device_info(IOMMUFDBackend *be, uint32_t devid,
                                      uint32_t *type, void *data, uint32_t len,
-                                     Error **errp);
+                                     uint64_t *caps, Error **errp);
 
 #define TYPE_HOST_IOMMU_DEVICE_IOMMUFD TYPE_HOST_IOMMU_DEVICE "-iommufd"
 #endif