qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Joao Martins <joao.m.martins@oracle.com>
To: qemu-devel@nongnu.org
Cc: Yi Liu <yi.l.liu@intel.com>, Eric Auger <eric.auger@redhat.com>,
	Zhenzhong Duan <zhenzhong.duan@intel.com>,
	Alex Williamson <alex.williamson@redhat.com>,
	Cedric Le Goater <clg@redhat.com>,
	Jason Gunthorpe <jgg@nvidia.com>,
	Avihai Horon <avihaih@nvidia.com>,
	Joao Martins <joao.m.martins@oracle.com>
Subject: [PATCH v4 02/12] vfio/iommufd: Don't initialize nor set a HOST_IOMMU_DEVICE with mdev
Date: Fri, 12 Jul 2024 12:46:54 +0100	[thread overview]
Message-ID: <20240712114704.8708-3-joao.m.martins@oracle.com> (raw)
In-Reply-To: <20240712114704.8708-1-joao.m.martins@oracle.com>

mdevs aren't "physical" devices and when asking for backing IOMMU info, it
fails the entire provisioning of the guest. Fix that by skipping
HostIOMMUDevice initialization in the presence of mdevs, and skip setting
an iommu device when it is known to be an mdev.

Cc: Zhenzhong Duan <zhenzhong.duan@intel.com>
Fixes: 930589520128 ("vfio/iommufd: Implement HostIOMMUDeviceClass::realize() handler")
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
---
 hw/vfio/common.c |  4 ++++
 hw/vfio/pci.c    | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 7cdb969fd396..b0beed44116e 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1556,6 +1556,10 @@ bool vfio_attach_device(char *name, VFIODevice *vbasedev,
         return false;
     }
 
+    if (vbasedev->mdev) {
+        return true;
+    }
+
     hiod = HOST_IOMMU_DEVICE(object_new(ops->hiod_typename));
     if (!HOST_IOMMU_DEVICE_GET_CLASS(hiod)->realize(hiod, vbasedev, errp)) {
         object_unref(hiod);
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 585f23a18406..3fc72e898a25 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -3116,7 +3116,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
 
     vfio_bars_register(vdev);
 
-    if (!pci_device_set_iommu_device(pdev, vbasedev->hiod, errp)) {
+    if (!is_mdev && !pci_device_set_iommu_device(pdev, vbasedev->hiod, errp)) {
         error_prepend(errp, "Failed to set iommu_device: ");
         goto out_teardown;
     }
@@ -3239,7 +3239,9 @@ out_deregister:
         timer_free(vdev->intx.mmap_timer);
     }
 out_unset_idev:
-    pci_device_unset_iommu_device(pdev);
+    if (!is_mdev) {
+        pci_device_unset_iommu_device(pdev);
+    }
 out_teardown:
     vfio_teardown_msi(vdev);
     vfio_bars_exit(vdev);
@@ -3284,7 +3286,9 @@ static void vfio_exitfn(PCIDevice *pdev)
     vfio_pci_disable_rp_atomics(vdev);
     vfio_bars_exit(vdev);
     vfio_migration_exit(vbasedev);
-    pci_device_unset_iommu_device(pdev);
+    if (!vbasedev->mdev) {
+        pci_device_unset_iommu_device(pdev);
+    }
 }
 
 static void vfio_pci_reset(DeviceState *dev)
-- 
2.17.2



  parent reply	other threads:[~2024-07-12 11:48 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-12 11:46 [PATCH v4 00/12] hw/iommufd: IOMMUFD Dirty Tracking Joao Martins
2024-07-12 11:46 ` [PATCH v4 01/12] vfio/pci: Extract mdev check into an helper Joao Martins
2024-07-16  9:21   ` Cédric Le Goater
2024-07-16  9:33     ` Joao Martins
2024-07-12 11:46 ` Joao Martins [this message]
2024-07-16  9:21   ` [PATCH v4 02/12] vfio/iommufd: Don't initialize nor set a HOST_IOMMU_DEVICE with mdev Cédric Le Goater
2024-07-16 13:26   ` Eric Auger
2024-07-17  1:34   ` Duan, Zhenzhong
2024-07-12 11:46 ` [PATCH v4 03/12] backends/iommufd: Extend iommufd_backend_get_device_info() to fetch HW capabilities Joao Martins
2024-07-16  9:22   ` Cédric Le Goater
2024-07-16 13:34   ` Eric Auger
2024-07-12 11:46 ` [PATCH v4 04/12] vfio/iommufd: Return errno in iommufd_cdev_attach_ioas_hwpt() Joao Martins
2024-07-16  9:27   ` Cédric Le Goater
2024-07-16 13:36   ` Eric Auger
2024-07-17  1:37   ` Duan, Zhenzhong
2024-07-12 11:46 ` [PATCH v4 05/12] vfio/iommufd: Introduce auto domain creation Joao Martins
2024-07-16  9:39   ` Cédric Le Goater
2024-07-16  9:47     ` Joao Martins
2024-07-16 12:54   ` Cédric Le Goater
2024-07-16 16:04   ` Eric Auger
2024-07-16 16:44     ` Joao Martins
2024-07-16 16:46       ` Joao Martins
2024-07-17  2:52         ` Duan, Zhenzhong
2024-07-17  9:09           ` Joao Martins
2024-07-17  9:28             ` Cédric Le Goater
2024-07-17  9:31               ` Joao Martins
2024-07-18 13:47                 ` Joao Martins
2024-07-19  6:06                   ` Cédric Le Goater
2024-07-17  9:48             ` Duan, Zhenzhong
2024-07-17  9:53               ` Joao Martins
2024-07-16 17:32       ` Eric Auger
2024-07-17  2:18   ` Duan, Zhenzhong
2024-07-17  9:04     ` Joao Martins
2024-07-17 10:05       ` Duan, Zhenzhong
2024-07-17 11:04         ` Joao Martins
2024-07-18  7:44           ` Duan, Zhenzhong
2024-07-18  9:16             ` Joao Martins
2024-07-19  2:36               ` Duan, Zhenzhong
2024-07-12 11:46 ` [PATCH v4 06/12] vfio/{iommufd,container}: Remove caps::aw_bits Joao Martins
2024-07-16 10:19   ` Cédric Le Goater
2024-07-16 17:40   ` Eric Auger
2024-07-16 18:22     ` Joao Martins
2024-07-17 11:48       ` Eric Auger
2024-07-12 11:46 ` [PATCH v4 07/12] vfio/{iommufd, container}: Initialize HostIOMMUDeviceCaps during attach_device() Joao Martins via
2024-07-16 10:20   ` [PATCH v4 07/12] vfio/{iommufd,container}: " Cédric Le Goater
2024-07-16 10:40     ` Joao Martins
2024-07-17  2:05   ` Duan, Zhenzhong
2024-07-17  8:55     ` Joao Martins
2024-07-17 12:19   ` Eric Auger
2024-07-17 12:33     ` Joao Martins
2024-07-17 13:41       ` Eric Auger
2024-07-17 15:34         ` Joao Martins
2024-07-12 11:47 ` [PATCH v4 08/12] vfio/iommufd: Probe and request hwpt dirty tracking capability Joao Martins
2024-07-16 12:21   ` Cédric Le Goater
2024-07-17 12:27   ` Eric Auger
2024-07-17 12:38     ` Joao Martins
2024-07-17 13:43       ` Eric Auger
2024-07-12 11:47 ` [PATCH v4 09/12] vfio/iommufd: Implement VFIOIOMMUClass::set_dirty_tracking support Joao Martins
2024-07-16 12:24   ` Cédric Le Goater
2024-07-17  2:24   ` Duan, Zhenzhong
2024-07-17  9:14     ` Joao Martins
2024-07-17 12:36   ` Eric Auger
2024-07-17 12:41     ` Joao Martins
2024-07-17 13:34       ` Eric Auger
2024-07-17 15:18         ` Joao Martins
2024-07-12 11:47 ` [PATCH v4 10/12] vfio/iommufd: Implement VFIOIOMMUClass::query_dirty_bitmap support Joao Martins
2024-07-16 12:31   ` Cédric Le Goater
2024-07-16 12:53   ` Cédric Le Goater
2024-07-17 12:50   ` Eric Auger
2024-07-12 11:47 ` [PATCH v4 11/12] vfio/migration: Don't block migration device dirty tracking is unsupported Joao Martins
2024-07-17  2:38   ` Duan, Zhenzhong
2024-07-17  9:20     ` Joao Martins
2024-07-17 15:35       ` Joao Martins
2024-07-17 16:02         ` Joao Martins
2024-07-17 16:54           ` Joao Martins
2024-07-18  7:20       ` Duan, Zhenzhong
2024-07-18  9:05         ` Joao Martins
2024-07-17 12:57   ` Eric Auger
2024-07-12 11:47 ` [PATCH v4 12/12] vfio/common: Allow disabling device dirty page tracking Joao Martins
2024-07-16  8:20 ` [PATCH v4 00/12] hw/iommufd: IOMMUFD Dirty Tracking Duan, Zhenzhong
2024-07-16  9:22   ` Joao Martins
2024-07-18  7:50     ` Duan, Zhenzhong

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=20240712114704.8708-3-joao.m.martins@oracle.com \
    --to=joao.m.martins@oracle.com \
    --cc=alex.williamson@redhat.com \
    --cc=avihaih@nvidia.com \
    --cc=clg@redhat.com \
    --cc=eric.auger@redhat.com \
    --cc=jgg@nvidia.com \
    --cc=qemu-devel@nongnu.org \
    --cc=yi.l.liu@intel.com \
    --cc=zhenzhong.duan@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).