qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: mst@redhat.com, peterx@redhat.com
Cc: qemu-devel@nongnu.org, eric.auger@redhat.com, viktor@daynix.com,
	lvivier@redhat.com, Jason Wang <jasowang@redhat.com>
Subject: [PATCH V2 2/5] intel-iommu: fail DEVIOTLB_UNMAP without dt mode
Date: Thu, 23 Feb 2023 14:59:21 +0800	[thread overview]
Message-ID: <20230223065924.42503-3-jasowang@redhat.com> (raw)
In-Reply-To: <20230223065924.42503-1-jasowang@redhat.com>

Without dt mode, device IOTLB notifier won't work since guest won't
send device IOTLB invalidation descriptor in this case. Let's fail
early instead of misbehaving silently.

Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Tested-by: Laurent Vivier <lvivier@redhat.com>
Tested-by: Viktor Prutyanov <viktor@daynix.com>
Buglink: https://bugzilla.redhat.com/2156876
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/i386/intel_iommu.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 0de3e31577..f006fa6031 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -3179,6 +3179,7 @@ static int vtd_iommu_notify_flag_changed(IOMMUMemoryRegion *iommu,
 {
     VTDAddressSpace *vtd_as = container_of(iommu, VTDAddressSpace, iommu);
     IntelIOMMUState *s = vtd_as->iommu_state;
+    X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(s);
 
     /* TODO: add support for VFIO and vhost users */
     if (s->snoop_control) {
@@ -3193,6 +3194,13 @@ static int vtd_iommu_notify_flag_changed(IOMMUMemoryRegion *iommu,
                          PCI_FUNC(vtd_as->devfn));
         return -ENOTSUP;
     }
+    if (!x86_iommu->dt_supported && (new & IOMMU_NOTIFIER_DEVIOTLB_UNMAP)) {
+        error_setg_errno(errp, ENOTSUP,
+                         "device %02x.%02x.%x requires device IOTLB mode",
+                         pci_bus_num(vtd_as->bus), PCI_SLOT(vtd_as->devfn),
+                         PCI_FUNC(vtd_as->devfn));
+        return -ENOTSUP;
+    }
 
     /* Update per-address-space notifier flags */
     vtd_as->notifier_flags = new;
-- 
2.25.1



  parent reply	other threads:[~2023-02-23  7:00 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-23  6:59 [PATCH V2 0/5] Fix UNMAP notifier for intel-iommu Jason Wang
2023-02-23  6:59 ` [PATCH V2 1/5] intel-iommu: fail MAP notifier without caching mode Jason Wang
2023-02-23  6:59 ` Jason Wang [this message]
2023-02-23  6:59 ` [PATCH V2 3/5] memory: introduce memory_region_unmap_iommu_notifier_range() Jason Wang
2023-03-07 13:19   ` Thomas Huth
2023-03-08  1:02   ` Michael S. Tsirkin
2023-03-08  5:19     ` Jason Wang
2023-02-23  6:59 ` [PATCH V2 4/5] smmu: switch to use memory_region_unmap_iommu_notifier_range() Jason Wang
2023-02-23  6:59 ` [PATCH V2 5/5] intel-iommu: send UNMAP notifications for domain or global inv desc Jason Wang
2023-02-23 15:47 ` [PATCH V2 0/5] Fix UNMAP notifier for intel-iommu Peter Xu
2023-02-24  2:54   ` Jason Wang

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=20230223065924.42503-3-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=eric.auger@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=mst@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=viktor@daynix.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).