mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio: remove ioeventfd_disabled altogether

Browse Source 
Now that there is not anymore a switch from the generic ioeventfd handler
to the dataplane handler, virtio_bus_set_host_notifier(assign=true) is
always called with !bus->ioeventfd_started, hence virtio_bus_stop_ioeventfd
does nothing in this case.  Move the invocation to vhost.c, which is the
only place that needs it.

Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Paolo Bonzini 2016-10-21 22:48:13 +02:00 committed by Michael S. Tsirkin
parent 6019f3b966
commit e616c2f390
3 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/virtio/vhost.c
View File

@ -1196,6 +1196,7 @@ int vhost_dev_enable_notifiers(struct vhost_dev *hdev, VirtIODevice *vdev)
goto fail; goto fail;
} }
virtio_device_stop_ioeventfd(vdev);
for (i = 0; i < hdev->nvqs; ++i) { for (i = 0; i < hdev->nvqs; ++i) {
r = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_index + i, r = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_index + i,
true); true);
@ -1215,6 +1216,7 @@ fail_vq:
} }
assert (e >= 0); assert (e >= 0);
} }
virtio_device_start_ioeventfd(vdev);
fail: fail:
return r; return r;
} }
@ -1237,6 +1239,7 @@ void vhost_dev_disable_notifiers(struct vhost_dev *hdev, VirtIODevice *vdev)
} }
assert (r >= 0); assert (r >= 0);
} }
virtio_device_start_ioeventfd(vdev);
} }
/* Test and clear event pending status. /* Test and clear event pending status.

23
hw/virtio/virtio-bus.c
View File

@ -190,7 +190,7 @@ int virtio_bus_start_ioeventfd(VirtioBusState *bus)
if (!k->ioeventfd_assign || !k->ioeventfd_enabled(proxy)) { if (!k->ioeventfd_assign || !k->ioeventfd_enabled(proxy)) {
return -ENOSYS; return -ENOSYS;
} }
if (bus->ioeventfd_started || bus->ioeventfd_disabled) { if (bus->ioeventfd_started) {
return 0; return 0;
} }
r = vdc->start_ioeventfd(vdev); r = vdc->start_ioeventfd(vdev);
@ -226,8 +226,8 @@ bool virtio_bus_ioeventfd_enabled(VirtioBusState *bus)
} }
/* /*
* This function switches from/to the generic ioeventfd handler. * This function switches ioeventfd on/off in the device.
* assign==false means 'use generic ioeventfd handler'. * The caller must set or clear the handlers for the EventNotifier.
*/ */
int virtio_bus_set_host_notifier(VirtioBusState *bus, int n, bool assign) int virtio_bus_set_host_notifier(VirtioBusState *bus, int n, bool assign)
{ {
@ -237,19 +237,12 @@ int virtio_bus_set_host_notifier(VirtioBusState *bus, int n, bool assign)
if (!k->ioeventfd_assign) { if (!k->ioeventfd_assign) {
return -ENOSYS; return -ENOSYS;
} }
bus->ioeventfd_disabled = assign;
if (assign) { if (assign) {
/* assert(!bus->ioeventfd_started);
* Stop using the generic ioeventfd, we are doing eventfd handling } else {
* ourselves below if (!bus->ioeventfd_started) {
* return 0;
* FIXME: We should just switch the handler and not deassign the }
* ioeventfd.
* Otherwise, there's a window where we don't have an
* ioeventfd and we may end up with a notification where
* we don't expect one.
*/
virtio_bus_stop_ioeventfd(bus);
} }
return set_host_notifier_internal(proxy, bus, n, assign); return set_host_notifier_internal(proxy, bus, n, assign);
} }

6
include/hw/virtio/virtio-bus.h
View File

@ -93,12 +93,6 @@ typedef struct VirtioBusClass {
struct VirtioBusState { struct VirtioBusState {
BusState parent_obj; BusState parent_obj;
/*
* Set if the default ioeventfd handlers are disabled by vhost
* or dataplane.
*/
bool ioeventfd_disabled;
/* /*
* Set if ioeventfd has been started. * Set if ioeventfd has been started.
*/ */