[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH v3 12/12] virtio-pci: add device_unplugged callback
From: |
Paolo Bonzini |
Subject: |
[Qemu-stable] [PATCH v3 12/12] virtio-pci: add device_unplugged callback |
Date: |
Tue, 15 Oct 2013 18:46:50 +0200 |
This fixes a crash in hot-unplug of virtio-pci devices behind a PCIe
switch. The crash happens because the ioeventfd is still set whent the
child is destroyed (destruction happens in postorder). Then the proxy
tries to unset to ioeventfd, but the virtqueue structure that holds the
EventNotifier has been trashed in the meanwhile. kvm_set_ioeventfd_pio
does not expect failure and aborts.
The fix is simply to move parts of uninitialization to a new
device_unplugged callback, which is called before the child is destroyed.
Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/virtio/virtio-pci.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 89af295..a191c24 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1002,6 +1002,15 @@ static void virtio_pci_device_plugged(DeviceState *d)
proxy->host_features);
}
+static void virtio_pci_device_unplugged(DeviceState *d)
+{
+ PCIDevice *pci_dev = PCI_DEVICE(d);
+ VirtIOPCIProxy *proxy = VIRTIO_PCI(d);
+
+ virtio_pci_stop_ioeventfd(proxy);
+ msix_uninit_exclusive_bar(pci_dev);
+}
+
static int virtio_pci_init(PCIDevice *pci_dev)
{
VirtIOPCIProxy *dev = VIRTIO_PCI(pci_dev);
@@ -1016,9 +1025,7 @@ static int virtio_pci_init(PCIDevice *pci_dev)
static void virtio_pci_exit(PCIDevice *pci_dev)
{
VirtIOPCIProxy *proxy = VIRTIO_PCI(pci_dev);
- virtio_pci_stop_ioeventfd(proxy);
memory_region_destroy(&proxy->bar);
- msix_uninit_exclusive_bar(pci_dev);
}
static void virtio_pci_reset(DeviceState *qdev)
@@ -1553,6 +1560,7 @@ static void virtio_pci_bus_class_init(ObjectClass *klass,
void *data)
k->set_guest_notifiers = virtio_pci_set_guest_notifiers;
k->vmstate_change = virtio_pci_vmstate_change;
k->device_plugged = virtio_pci_device_plugged;
+ k->device_unplugged = virtio_pci_device_unplugged;
}
static const TypeInfo virtio_pci_bus_info = {
--
1.8.3.1
- [Qemu-stable] [PATCH v3 01/12] virtio-ccw: move virtio_ccw_stop_ioeventfd to virtio_ccw_busdev_unplug, (continued)
- [Qemu-stable] [PATCH v3 01/12] virtio-ccw: move virtio_ccw_stop_ioeventfd to virtio_ccw_busdev_unplug, Paolo Bonzini, 2013/10/15
- [Qemu-stable] [PATCH v3 03/12] virtio-ccw: remove vdev field, Paolo Bonzini, 2013/10/15
- [Qemu-stable] [PATCH v3 04/12] virtio-pci: remove vdev field, Paolo Bonzini, 2013/10/15
- [Qemu-stable] [PATCH v3 05/12] virtio-bus: cleanup plug/unplug interface, Paolo Bonzini, 2013/10/15
- [Qemu-stable] [PATCH v3 06/12] virtio-blk: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/10/15
- [Qemu-stable] [PATCH v3 07/12] virtio-serial: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/10/15
- [Qemu-stable] [PATCH v3 08/12] virtio-net: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/10/15
- [Qemu-stable] [PATCH v3 09/12] virtio-scsi: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/10/15
- [Qemu-stable] [PATCH v3 10/12] virtio-balloon: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/10/15
- [Qemu-stable] [PATCH v3 11/12] virtio-rng: switch exit callback to VirtioDeviceClass, Paolo Bonzini, 2013/10/15
- [Qemu-stable] [PATCH v3 12/12] virtio-pci: add device_unplugged callback,
Paolo Bonzini <=