[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/33] virtio: postpone the execution of event_notifi
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 07/33] virtio: postpone the execution of event_notifier_cleanup function |
Date: |
Tue, 16 Jan 2018 06:46:58 +0200 |
From: Gal Hammer <address@hidden>
Use the EventNotifier's cleanup callback function to execute the
event_notifier_cleanup function after kvm unregistered the eventfd.
This change supports running the virtio_bus_set_host_notifier
function inside a memory region transaction. Otherwise, a closed
fd is sent to kvm, which results in a failure.
Signed-off-by: Gal Hammer <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
accel/kvm/kvm-all.c | 4 ++++
hw/virtio/virtio-bus.c | 19 +++++++++++--------
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index f290f48..071f4f5 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -812,6 +812,10 @@ static void kvm_mem_ioeventfd_del(MemoryListener *listener,
if (r < 0) {
abort();
}
+
+ if (e->cleanup) {
+ e->cleanup(e);
+ }
}
static void kvm_io_ioeventfd_add(MemoryListener *listener,
diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
index 3042232..8106346 100644
--- a/hw/virtio/virtio-bus.c
+++ b/hw/virtio/virtio-bus.c
@@ -256,6 +256,15 @@ bool virtio_bus_ioeventfd_enabled(VirtioBusState *bus)
return k->ioeventfd_assign && k->ioeventfd_enabled(proxy);
}
+static void virtio_bus_cleanup_event_notifier(EventNotifier *notifier)
+{
+ /* Test and clear notifier after disabling event,
+ * in case poll callback didn't have time to run.
+ */
+ virtio_queue_host_notifier_read(notifier);
+ event_notifier_cleanup(notifier);
+}
+
/*
* This function switches ioeventfd on/off in the device.
* The caller must set or clear the handlers for the EventNotifier.
@@ -283,19 +292,13 @@ int virtio_bus_set_host_notifier(VirtioBusState *bus, int
n, bool assign)
r = k->ioeventfd_assign(proxy, notifier, n, true);
if (r < 0) {
error_report("%s: unable to assign ioeventfd: %d", __func__, r);
- goto cleanup_event_notifier;
+ virtio_bus_cleanup_event_notifier(notifier);
}
- return 0;
} else {
+ notifier->cleanup = virtio_bus_cleanup_event_notifier;
k->ioeventfd_assign(proxy, notifier, n, false);
}
-cleanup_event_notifier:
- /* Test and clear notifier after disabling event,
- * in case poll callback didn't have time to run.
- */
- virtio_queue_host_notifier_read(notifier);
- event_notifier_cleanup(notifier);
return r;
}
--
MST
- [Qemu-devel] [PULL 00/33] pc, pci, virtio: features, fixes, cleanups, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 01/33] MAINTAINERS: Add myself as maintainer to X86 machines, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 02/33] vhost-user: add new vhost user messages to support virtio config space, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 03/33] vhost-user-blk: introduce a new vhost-user-blk host device, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 04/33] contrib/libvhost-user: enable virtio config space messages, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 07/33] virtio: postpone the execution of event_notifier_cleanup function,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 08/33] virtio: improve virtio devices initialization time, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 06/33] qemu: add a cleanup callback function to EventNotifier, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 05/33] contrib/vhost-user-blk: introduce a vhost-user-blk sample application, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 09/33] pci/shpc: Move function to generic header file, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 10/33] vhost-user: fix multiple queue specification, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 11/33] intel-iommu: Redefine macros to enable supporting 48 bit address width, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 14/33] ACPI/unit-test: Add a testcase for RAM allocation in numa node, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 12/33] intel-iommu: Extend address width to 48 bits, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 13/33] hw/pci-bridge: fix QEMU crash because of pcie-root-port, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 15/33] hw/acpi-build: Make next_base easy to follow, Michael S. Tsirkin, 2018/01/15