From: Zhenzhong Duan <zhenzhong.duan@intel.com>
To: qemu-devel@nongnu.org
Cc: alex.williamson@redhat.com, clg@redhat.com, jgg@nvidia.com,
nicolinc@nvidia.com, joao.m.martins@oracle.com,
eric.auger@redhat.com, peterx@redhat.com, jasowang@redhat.com,
kevin.tian@intel.com, yi.l.liu@intel.com, yi.y.sun@intel.com,
chao.p.peng@intel.com
Subject: [PATCH v7 10/27] vfio/pci: Allow the selection of a given iommu backend
Date: Tue, 21 Nov 2023 16:44:09 +0800 [thread overview]
Message-ID: <20231121084426.1286987-11-zhenzhong.duan@intel.com> (raw)
In-Reply-To: <20231121084426.1286987-1-zhenzhong.duan@intel.com>
From: Eric Auger <eric.auger@redhat.com>
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-pci device:
If the user wants to use the legacy backend, it shall not
link the vfio-pci device with any iommufd object:
-device vfio-pci,host=0000:02:00.0
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-pci device options:
-object iommufd,id=iommufd0
-device vfio-pci,host=0000:02:00.0,iommufd=iommufd0
Suggested-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
---
hw/vfio/pci.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index d00c3472c7..c5984b0598 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -19,6 +19,7 @@
*/
#include "qemu/osdep.h"
+#include CONFIG_DEVICES /* CONFIG_IOMMUFD */
#include <linux/vfio.h>
#include <sys/ioctl.h>
@@ -42,6 +43,7 @@
#include "qapi/error.h"
#include "migration/blocker.h"
#include "migration/qemu-file.h"
+#include "sysemu/iommufd.h"
#define TYPE_VFIO_PCI_NOHOTPLUG "vfio-pci-nohotplug"
@@ -3386,6 +3388,10 @@ static Property vfio_pci_dev_properties[] = {
* DEFINE_PROP_STRING("vfiofd", VFIOPCIDevice, vfiofd_name),
* DEFINE_PROP_STRING("vfiogroupfd, VFIOPCIDevice, vfiogroupfd_name),
*/
+#ifdef CONFIG_IOMMUFD
+ DEFINE_PROP_LINK("iommufd", VFIOPCIDevice, vbasedev.iommufd,
+ TYPE_IOMMUFD_BACKEND, IOMMUFDBackend *),
+#endif
DEFINE_PROP_END_OF_LIST(),
};
--
2.34.1
next prev parent reply other threads:[~2023-11-21 8:48 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-21 8:43 [PATCH v7 00/27] vfio: Adopt iommufd Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 01/27] backends/iommufd: Introduce the iommufd object Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 02/27] util/char_dev: Add open_cdev() Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 03/27] vfio/common: return early if space isn't empty Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 04/27] vfio/iommufd: Implement the iommufd backend Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 05/27] vfio/iommufd: Relax assert check for " Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 06/27] vfio/iommufd: Add support for iova_ranges and pgsizes Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 07/27] vfio/pci: Extract out a helper vfio_pci_get_pci_hot_reset_info Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 08/27] vfio/pci: Introduce a vfio pci hot reset interface Zhenzhong Duan
2023-11-21 18:38 ` Philippe Mathieu-Daudé
2023-11-22 3:32 ` Duan, Zhenzhong
2023-11-21 8:44 ` [PATCH v7 09/27] vfio/iommufd: Enable pci hot reset through iommufd cdev interface Zhenzhong Duan
2023-11-21 8:44 ` Zhenzhong Duan [this message]
2023-11-21 8:44 ` [PATCH v7 11/27] vfio/pci: Make vfio cdev pre-openable by passing a file handle Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 12/27] vfio/platform: Allow the selection of a given iommu backend Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 13/27] vfio/platform: Make vfio cdev pre-openable by passing a file handle Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 14/27] vfio/ap: Allow the selection of a given iommu backend Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 15/27] vfio/ap: Make vfio cdev pre-openable by passing a file handle Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 16/27] vfio/ccw: Allow the selection of a given iommu backend Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 17/27] vfio/ccw: Make vfio cdev pre-openable by passing a file handle Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 18/27] vfio: Make VFIOContainerBase poiner parameter const in VFIOIOMMUOps callbacks Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 19/27] hw/arm: Activate IOMMUFD for virt machines Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 20/27] kconfig: Activate IOMMUFD for s390x machines Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 21/27] hw/i386: Activate IOMMUFD for q35 machines Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 22/27] vfio/pci: Move VFIODevice initializations in vfio_instance_init Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 23/27] vfio/platform: Move VFIODevice initializations in vfio_platform_instance_init Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 24/27] vfio/ap: Move VFIODevice initializations in vfio_ap_instance_init Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 25/27] vfio/ccw: Move VFIODevice initializations in vfio_ccw_instance_init Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 26/27] vfio: Introduce a helper function to initialize VFIODevice Zhenzhong Duan
2023-11-21 8:44 ` [PATCH v7 27/27] docs/devel: Add VFIO iommufd backend documentation Zhenzhong Duan
2023-11-21 17:22 ` [PATCH v7 00/27] vfio: Adopt iommufd Cédric Le Goater
2023-11-22 3:21 ` Duan, Zhenzhong
2023-11-22 8:06 ` Cédric Le Goater
2023-11-22 11:49 ` Duan, Zhenzhong
2023-11-21 22:56 ` Nicolin Chen
2023-11-22 3:32 ` Duan, Zhenzhong
2023-11-22 13:48 ` Joao Martins
2023-11-28 17:10 ` Cédric Le Goater
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231121084426.1286987-11-zhenzhong.duan@intel.com \
--to=zhenzhong.duan@intel.com \
--cc=alex.williamson@redhat.com \
--cc=chao.p.peng@intel.com \
--cc=clg@redhat.com \
--cc=eric.auger@redhat.com \
--cc=jasowang@redhat.com \
--cc=jgg@nvidia.com \
--cc=joao.m.martins@oracle.com \
--cc=kevin.tian@intel.com \
--cc=nicolinc@nvidia.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=yi.l.liu@intel.com \
--cc=yi.y.sun@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).