From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Richard Henderson <richard.henderson@linaro.org>,
"Michael S . Tsirkin" <mst@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
David Hildenbrand <david@redhat.com>,
Mario Casquero <mcasquer@redhat.com>
Subject: [GIT PULL 18/21] virtio-md-pci: Handle unplug of virtio based memory devices
Date: Wed, 12 Jul 2023 10:17:47 +0200 [thread overview]
Message-ID: <20230712081750.80852-19-david@redhat.com> (raw)
In-Reply-To: <20230712081750.80852-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 on a virtio-mem-pci device:
# 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 add support for unplugging of virtio-mem devices in some
configurations next.
Message-ID: <20230711153445.514112-5-david@redhat.com>
Tested-by: Mario Casquero <mcasquer@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
hw/virtio/virtio-md-pci.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/virtio-md-pci.c b/hw/virtio/virtio-md-pci.c
index e849c3131d..a22a259e2d 100644
--- a/hw/virtio/virtio-md-pci.c
+++ b/hw/virtio/virtio-md-pci.c
@@ -14,6 +14,7 @@
#include "hw/virtio/virtio-md-pci.h"
#include "hw/mem/memory-device.h"
#include "qapi/error.h"
+#include "qemu/error-report.h"
void virtio_md_pci_pre_plug(VirtIOMDPCI *vmd, MachineState *ms, Error **errp)
{
@@ -74,7 +75,27 @@ void virtio_md_pci_unplug_request(VirtIOMDPCI *vmd, MachineState *ms,
void virtio_md_pci_unplug(VirtIOMDPCI *vmd, MachineState *ms, Error **errp)
{
- /* We don't support hot unplug of virtio based memory devices */
+ DeviceState *dev = DEVICE(vmd);
+ HotplugHandler *bus_handler = qdev_get_bus_hotplug_handler(dev);
+ MemoryDeviceState *md = MEMORY_DEVICE(vmd);
+ Error *local_err = NULL;
+
+ /* Unplug the memory device while it is still realized. */
+ memory_device_unplug(md, ms);
+
+ if (bus_handler) {
+ hotplug_handler_unplug(bus_handler, dev, &local_err);
+ if (local_err) {
+ /* Not expected to fail ... but still try to recover. */
+ memory_device_plug(md, ms);
+ 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 const TypeInfo virtio_md_pci_info = {
--
2.41.0
next prev parent reply other threads:[~2023-07-12 8:19 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-12 8:17 [GIT PULL 00/21] Host Memory Backends and Memory devices queue 2023-07-12 David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 01/21] memory-device: Unify enabled vs. supported error messages David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 02/21] memory-device: Introduce machine_memory_devices_init() David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 03/21] hw/arm/virt: Use machine_memory_devices_init() David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 04/21] hw/ppc/spapr: " David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 05/21] hw/loongarch/virt: " David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 06/21] hw/i386/pc: " David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 07/21] hw/i386/acpi-build: Rely on machine->device_memory when building SRAT David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 08/21] hw/i386/pc: Remove PC_MACHINE_DEVMEM_REGION_SIZE David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 09/21] memory-device: Refactor memory_device_pre_plug() David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 10/21] memory-device: Track used region size in DeviceMemoryState David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 11/21] softmmu/physmem: Warn with ram_block_discard_range() on MAP_PRIVATE file mapping David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 12/21] virtio-mem: Skip most of virtio_mem_unplug_all() without plugged memory David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 13/21] migration/ram: Expose ramblock_is_ignored() as migrate_ram_is_ignored() David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 14/21] virtio-mem: Support "x-ignore-shared" migration David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 15/21] virtio-md-pci: New parent type for virtio-mem-pci and virtio-pmem-pci David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 16/21] pc: Factor out (un)plug handling of virtio-md-pci devices David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 17/21] arm/virt: Use virtio-md-pci (un)plug functions David Hildenbrand
2023-07-12 8:17 ` David Hildenbrand [this message]
2023-07-12 8:17 ` [GIT PULL 19/21] virtio-md-pci: Support unplug requests for compatible devices David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 20/21] virtio-mem: Prepare for device unplug support David Hildenbrand
2023-07-12 8:17 ` [GIT PULL 21/21] virtio-mem-pci: Device " David Hildenbrand
2023-07-12 16:05 ` [GIT PULL 00/21] Host Memory Backends and Memory devices queue 2023-07-12 Richard Henderson
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=20230712081750.80852-19-david@redhat.com \
--to=david@redhat.com \
--cc=mcasquer@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.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).