From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Eduardo Habkost <ehabkost@redhat.com>,
Peter Xu <peterx@redhat.com>, Eric Auger <eric.auger@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: [Qemu-devel] [PULL 07/10] pc/q35: Disallow vfio-pci hotplug without VT-d caching mode
Date: Tue, 17 Sep 2019 11:11:03 -0400 [thread overview]
Message-ID: <20190916080718.3299-4-peterx@redhat.com> (raw)
Message-ID: <20190917151103.QszxrNcT3PfOMqTPpliImpg1BjLQeKjNS1dXVFyVjwk@z> (raw)
In-Reply-To: <20190917151011.24588-1-mst@redhat.com>
From: Peter Xu <peterx@redhat.com>
Instead of bailing out when trying to hotplug a vfio-pci device with
below configuration:
-device intel-iommu,caching-mode=off
With this we can return a warning message to the user via QMP/HMP and
the VM will continue to work after failing the hotplug:
(qemu) device_add vfio-pci,bus=root.3,host=05:00.0,id=vfio1
Error: Device assignment is not allowed without enabling caching-mode=on for Intel IOMMU.
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20190916080718.3299-4-peterx@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/i386/pc.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index bad866fe44..0a6fa6e549 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -2944,6 +2944,26 @@ static void x86_nmi(NMIState *n, int cpu_index, Error **errp)
}
}
+
+static bool pc_hotplug_allowed(MachineState *ms, DeviceState *dev, Error **errp)
+{
+ X86IOMMUState *iommu = x86_iommu_get_default();
+ IntelIOMMUState *intel_iommu;
+
+ if (iommu &&
+ object_dynamic_cast((Object *)iommu, TYPE_INTEL_IOMMU_DEVICE) &&
+ object_dynamic_cast((Object *)dev, "vfio-pci")) {
+ intel_iommu = INTEL_IOMMU_DEVICE(iommu);
+ if (!intel_iommu->caching_mode) {
+ error_setg(errp, "Device assignment is not allowed without "
+ "enabling caching-mode=on for Intel IOMMU.");
+ return false;
+ }
+ }
+
+ return true;
+}
+
static void pc_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -2968,6 +2988,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
pcmc->pvh_enabled = true;
assert(!mc->get_hotplug_handler);
mc->get_hotplug_handler = pc_get_hotplug_handler;
+ mc->hotplug_allowed = pc_hotplug_allowed;
mc->cpu_index_to_instance_props = pc_cpu_index_to_props;
mc->get_default_cpu_node_id = pc_get_default_cpu_node_id;
mc->possible_cpu_arch_ids = pc_possible_cpu_arch_ids;
--
MST
next prev parent reply other threads:[~2019-09-17 15:24 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-16 8:07 [Qemu-devel] [PATCH v3 0/4] intel_iommu: Do sanity check of vfio-pci earlier Peter Xu
2019-09-16 8:07 ` [Qemu-devel] [PATCH v3 1/4] intel_iommu: Sanity check vfio-pci config on machine init done Peter Xu
2019-09-17 15:10 ` [Qemu-devel] [PULL 05/10] " Michael S. Tsirkin
2019-09-16 8:07 ` [Qemu-devel] [PATCH v3 2/4] qdev/machine: Introduce hotplug_allowed hook Peter Xu
2019-09-17 15:10 ` [Qemu-devel] [PULL 06/10] " Michael S. Tsirkin
2019-09-16 8:07 ` Peter Xu [this message]
2019-09-17 15:11 ` [Qemu-devel] [PULL 07/10] pc/q35: Disallow vfio-pci hotplug without VT-d caching mode Michael S. Tsirkin
2019-09-16 8:07 ` [Qemu-devel] [PATCH v3 4/4] intel_iommu: Remove the caching-mode check during flag change Peter Xu
2019-09-17 15:11 ` [Qemu-devel] [PULL 08/10] " Michael S. Tsirkin
2019-09-17 15:10 [Qemu-devel] [PULL 00/10] virtio, vhost, pc: features, fixes, cleanups Michael S. Tsirkin
2019-08-01 0:40 ` [Qemu-devel] [PATCH v2] docs/nvdimm: add example on persistent backend setup Wei Yang
2019-08-01 8:05 ` Stefan Hajnoczi
2019-09-11 8:51 ` Wei Yang
2019-09-12 12:16 ` Stefan Hajnoczi
2019-09-12 21:44 ` Wei Yang
2019-09-17 15:10 ` [Qemu-devel] [PULL 02/10] " Michael S. Tsirkin
2019-08-21 12:16 ` [Qemu-devel] [PATCH v3] virtio pmem: user document Pankaj Gupta
2019-08-26 12:46 ` Cornelia Huck
2019-09-16 6:30 ` Pankaj Gupta
2019-09-17 15:11 ` [Qemu-devel] [PULL 09/10] " Michael S. Tsirkin
2019-08-22 18:34 ` [Qemu-devel] [PATCH 1/2] vhost-user-blk: prevent using uninitialized vqs Raphael Norwitz
2019-08-22 18:34 ` [Qemu-devel] [PATCH 2/2] backends/vhost-user.c: " Raphael Norwitz
2019-08-28 8:29 ` Stefan Hajnoczi
2019-09-17 15:10 ` [Qemu-devel] [PULL 04/10] " Michael S. Tsirkin
2019-08-23 3:43 ` [Qemu-devel] [Qemu-block] [PATCH 1/2] vhost-user-blk: " yuchenlin via Qemu-devel
2019-08-28 8:28 ` [Qemu-devel] " Stefan Hajnoczi
2019-09-17 15:10 ` [Qemu-devel] [PULL 03/10] " Michael S. Tsirkin
2019-09-10 14:03 ` [Qemu-devel] [PATCH v2] MAINTAINERS: update virtio-rng and virtio-serial maintainer Laurent Vivier
2019-09-17 15:10 ` [Qemu-devel] [PULL 01/10] " Michael S. Tsirkin
2019-09-13 12:06 ` [Qemu-devel] [PATCH v3] virtio-mmio: implement modern (v2) personality (virtio-1) Sergio Lopez
2019-09-16 14:40 ` Cornelia Huck
2019-09-17 15:11 ` [Qemu-devel] [PULL 10/10] " Michael S. Tsirkin
2019-09-21 7:06 ` [Qemu-devel] [PATCH v3] virtio-mmio: implement modern (v2), " Vasyl Vavrychuk
2019-09-23 13:58 ` Sergio Lopez
2019-09-19 10:13 ` [Qemu-devel] [PULL 00/10] virtio, vhost, pc: features, fixes, cleanups Peter Maydell
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=20190916080718.3299-4-peterx@redhat.com \
--to=mst@redhat.com \
--cc=ehabkost@redhat.com \
--cc=eric.auger@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/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).