From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: David Hildenbrand <david@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
Eduardo Habkost <eduardo@habkost.net>,
"Michael S. Tsirkin" <mst@redhat.com>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Igor Mammedov <imammedo@redhat.com>,
qemu-arm@nongnu.org, Gavin Shan <gshan@redhat.com>
Subject: [PATCH v1 1/5] pc: Properly handle unplug of virtio based memory devices
Date: Tue, 13 Jun 2023 17:02:06 +0200 [thread overview]
Message-ID: <20230613150210.449406-2-david@redhat.com> (raw)
In-Reply-To: <20230613150210.449406-1-david@redhat.com>
While we fence unplug requests from the outside, the VM can still
trigger unplug of virtio based memory devices, for example, in Linux
doing:
# echo 0 > /sys/bus/pci/slots/3/power
While doing that is not really expected to work without harming the
guest OS (e.g., removing a virtio-mem device while it still provides
memory), let's make sure that we properly handle it on the QEMU side.
We'll support unplugging of virtio-mem devices in some configurations
next.
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/i386/pc.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index fc52772fdd..fdd7062929 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1559,7 +1559,25 @@ static void pc_virtio_md_pci_unplug_request(HotplugHandler *hotplug_dev,
static void pc_virtio_md_pci_unplug(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
- /* We don't support hot unplug of virtio based memory devices */
+ HotplugHandler *hotplug_dev2 = qdev_get_bus_hotplug_handler(dev);
+ Error *local_err = NULL;
+
+ /* Unplug the memory device while it is still realized. */
+ memory_device_unplug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev));
+
+ if (hotplug_dev2) {
+ hotplug_handler_unplug(hotplug_dev2, dev, &local_err);
+ if (local_err) {
+ /* Not expected to fail ... but still try to recover. */
+ memory_device_plug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev));
+ error_propagate(errp, local_err);
+ return;
+ }
+ } else {
+ /* Very unexpected, but let's just try to do the right thing. */
+ warn_report("Unexpected unplug of virtio based memory device");
+ qdev_unrealize(dev);
+ }
}
static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
--
2.40.1
next prev parent reply other threads:[~2023-06-13 15:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-13 15:02 [PATCH v1 0/5] virtio-mem: Device unplug support David Hildenbrand
2023-06-13 15:02 ` David Hildenbrand [this message]
2023-06-13 15:02 ` [PATCH v1 2/5] arm/virt: Properly handle unplug of virtio based memory devices David Hildenbrand
2023-06-13 15:02 ` [PATCH v1 3/5] virtio-mem: Prepare for unplug support of virtio-mem-pci devices David Hildenbrand
2023-06-13 15:02 ` [PATCH v1 4/5] pc: Support unplug " David Hildenbrand
2023-06-13 15:02 ` [PATCH v1 5/5] arm/virt: " David Hildenbrand
2023-06-23 5:58 ` [PATCH v1 0/5] virtio-mem: Device unplug support Michael S. Tsirkin
2023-06-23 7:04 ` David Hildenbrand
2023-06-23 7:09 ` Michael S. Tsirkin
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=20230613150210.449406-2-david@redhat.com \
--to=david@redhat.com \
--cc=eduardo@habkost.net \
--cc=gshan@redhat.com \
--cc=imammedo@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/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).