78 lines
2.6 KiB
Diff
78 lines
2.6 KiB
Diff
From ede579d6d5fe5be9235d6a218efdb237192aee0e Mon Sep 17 00:00:00 2001
|
|
From: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
|
Date: Tue, 21 Nov 2023 16:44:11 +0800
|
|
Subject: [PATCH 032/101] vfio/platform: Allow the selection of a given iommu
|
|
backend
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Eric Auger <eric.auger@redhat.com>
|
|
RH-MergeRequest: 211: IOMMUFD backend backport
|
|
RH-Jira: RHEL-19302 RHEL-21057
|
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
|
RH-Acked-by: Sebastian Ott <sebott@redhat.com>
|
|
RH-Commit: [31/67] aba1dc16cada602edd7be1a28b0f57991131e6f7 (eauger1/centos-qemu-kvm)
|
|
|
|
Now we support two types of iommu backends, let's add the capability
|
|
to select one of them. This depends on whether an iommufd object has
|
|
been linked with the vfio-platform device:
|
|
|
|
If the user wants to use the legacy backend, it shall not
|
|
link the vfio-platform device with any iommufd object:
|
|
|
|
-device vfio-platform,host=XXX
|
|
|
|
This is called the legacy mode/backend.
|
|
|
|
If the user wants to use the iommufd backend (/dev/iommu) it
|
|
shall pass an iommufd object id in the vfio-platform device options:
|
|
|
|
-object iommufd,id=iommufd0
|
|
-device vfio-platform,host=XXX,iommufd=iommufd0
|
|
|
|
Suggested-by: Alex Williamson <alex.williamson@redhat.com>
|
|
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
|
Reviewed-by: Cédric Le Goater <clg@redhat.com>
|
|
Reviewed-by: Eric Auger <eric.auger@redhat.com>
|
|
Tested-by: Nicolin Chen <nicolinc@nvidia.com>
|
|
Signed-off-by: Cédric Le Goater <clg@redhat.com>
|
|
(cherry picked from commit a6c50e1c3f8d0eb77edaea392e61508bb3c516f8)
|
|
Signed-off-by: Eric Auger <eric.auger@redhat.com>
|
|
---
|
|
hw/vfio/platform.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
|
|
index 8e3d4ac458..98ae4bc655 100644
|
|
--- a/hw/vfio/platform.c
|
|
+++ b/hw/vfio/platform.c
|
|
@@ -15,11 +15,13 @@
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
+#include CONFIG_DEVICES /* CONFIG_IOMMUFD */
|
|
#include "qapi/error.h"
|
|
#include <sys/ioctl.h>
|
|
#include <linux/vfio.h>
|
|
|
|
#include "hw/vfio/vfio-platform.h"
|
|
+#include "sysemu/iommufd.h"
|
|
#include "migration/vmstate.h"
|
|
#include "qemu/error-report.h"
|
|
#include "qemu/lockable.h"
|
|
@@ -649,6 +651,10 @@ static Property vfio_platform_dev_properties[] = {
|
|
DEFINE_PROP_UINT32("mmap-timeout-ms", VFIOPlatformDevice,
|
|
mmap_timeout, 1100),
|
|
DEFINE_PROP_BOOL("x-irqfd", VFIOPlatformDevice, irqfd_allowed, true),
|
|
+#ifdef CONFIG_IOMMUFD
|
|
+ DEFINE_PROP_LINK("iommufd", VFIOPlatformDevice, vbasedev.iommufd,
|
|
+ TYPE_IOMMUFD_BACKEND, IOMMUFDBackend *),
|
|
+#endif
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
--
|
|
2.39.3
|
|
|