42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jason Wang <jasowang@redhat.com>
|
||
|
|
Date: Thu, 23 Feb 2023 14:59:20 +0800
|
||
|
|
Subject: [PATCH] intel-iommu: fail MAP notifier without caching mode
|
||
|
|
|
||
|
|
Without caching mode, MAP notifier won't work correctly since guest
|
||
|
|
won't send IOTLB update event when it establishes new mappings in the
|
||
|
|
I/O page tables. Let's fail the IOMMU notifiers early instead of
|
||
|
|
misbehaving silently.
|
||
|
|
|
||
|
|
Reviewed-by: Eric Auger <eric.auger@redhat.com>
|
||
|
|
Tested-by: Viktor Prutyanov <viktor@daynix.com>
|
||
|
|
Signed-off-by: Jason Wang <jasowang@redhat.com>
|
||
|
|
Message-Id: <20230223065924.42503-2-jasowang@redhat.com>
|
||
|
|
Reviewed-by: Peter Xu <peterx@redhat.com>
|
||
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
(cherry-picked from commit b8d78277c091f26fdd64f239bc8bb7e55d74cecf)
|
||
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||
|
|
---
|
||
|
|
hw/i386/intel_iommu.c | 7 +++++++
|
||
|
|
1 file changed, 7 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
|
||
|
|
index a08ee85edf..9143376677 100644
|
||
|
|
--- a/hw/i386/intel_iommu.c
|
||
|
|
+++ b/hw/i386/intel_iommu.c
|
||
|
|
@@ -3186,6 +3186,13 @@ static int vtd_iommu_notify_flag_changed(IOMMUMemoryRegion *iommu,
|
||
|
|
"Snoop Control with vhost or VFIO is not supported");
|
||
|
|
return -ENOTSUP;
|
||
|
|
}
|
||
|
|
+ if (!s->caching_mode && (new & IOMMU_NOTIFIER_MAP)) {
|
||
|
|
+ error_setg_errno(errp, ENOTSUP,
|
||
|
|
+ "device %02x.%02x.%x requires caching 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;
|