|
 |
272dfe3 |
Support host/guest notifiers in virtio-pci.
|
|
|
272dfe3 |
The last one only with kvm, that's okay
|
|
|
272dfe3 |
because vhost relies on kvm anyway.
|
|
|
272dfe3 |
|
|
|
272dfe3 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
272dfe3 |
---
|
|
|
272dfe3 |
hw/virtio-pci.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
272dfe3 |
1 files changed, 62 insertions(+), 0 deletions(-)
|
|
|
272dfe3 |
|
|
|
272dfe3 |
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
|
|
|
272dfe3 |
index 05898c8..c454093 100644
|
|
|
272dfe3 |
--- a/hw/virtio-pci.c
|
|
|
272dfe3 |
+++ b/hw/virtio-pci.c
|
|
|
272dfe3 |
@@ -23,6 +23,7 @@
|
|
|
272dfe3 |
#include "msix.h"
|
|
|
272dfe3 |
#include "net.h"
|
|
|
272dfe3 |
#include "loader.h"
|
|
|
272dfe3 |
+#include "kvm.h"
|
|
|
272dfe3 |
|
|
|
272dfe3 |
/* from Linux's linux/virtio_pci.h */
|
|
|
272dfe3 |
|
|
|
272dfe3 |
@@ -394,6 +395,65 @@ static unsigned virtio_pci_get_features(void *opaque)
|
|
|
272dfe3 |
return proxy->host_features;
|
|
|
272dfe3 |
}
|
|
|
272dfe3 |
|
|
|
272dfe3 |
+static void virtio_pci_guest_notifier_read(void *opaque)
|
|
|
272dfe3 |
+{
|
|
|
272dfe3 |
+ VirtQueue *vq = opaque;
|
|
|
272dfe3 |
+ EventNotifier *n = virtio_queue_guest_notifier(vq);
|
|
|
272dfe3 |
+ if (event_notifier_test_and_clear(n)) {
|
|
|
272dfe3 |
+ virtio_irq(vq);
|
|
|
272dfe3 |
+ }
|
|
|
272dfe3 |
+}
|
|
|
272dfe3 |
+
|
|
|
272dfe3 |
+static int virtio_pci_guest_notifier(void *opaque, int n, bool assign)
|
|
|
272dfe3 |
+{
|
|
|
272dfe3 |
+ VirtIOPCIProxy *proxy = opaque;
|
|
|
272dfe3 |
+ VirtQueue *vq = virtio_queue(proxy->vdev, n);
|
|
|
272dfe3 |
+ EventNotifier *notifier = virtio_queue_guest_notifier(vq);
|
|
|
272dfe3 |
+
|
|
|
272dfe3 |
+ if (assign) {
|
|
|
272dfe3 |
+ int r = event_notifier_init(notifier, 0);
|
|
|
272dfe3 |
+ if (r < 0)
|
|
|
272dfe3 |
+ return r;
|
|
|
272dfe3 |
+ qemu_set_fd_handler(event_notifier_get_fd(notifier),
|
|
|
272dfe3 |
+ virtio_pci_guest_notifier_read, NULL, vq);
|
|
|
272dfe3 |
+ } else {
|
|
|
272dfe3 |
+ qemu_set_fd_handler(event_notifier_get_fd(notifier),
|
|
|
272dfe3 |
+ NULL, NULL, vq);
|
|
|
272dfe3 |
+ event_notifier_cleanup(notifier);
|
|
|
272dfe3 |
+ }
|
|
|
272dfe3 |
+
|
|
|
272dfe3 |
+ return 0;
|
|
|
272dfe3 |
+}
|
|
|
272dfe3 |
+
|
|
|
272dfe3 |
+static int virtio_pci_host_notifier(void *opaque, int n, bool assign)
|
|
|
272dfe3 |
+{
|
|
|
272dfe3 |
+ VirtIOPCIProxy *proxy = opaque;
|
|
|
272dfe3 |
+ VirtQueue *vq = virtio_queue(proxy->vdev, n);
|
|
|
272dfe3 |
+ EventNotifier *notifier = virtio_queue_host_notifier(vq);
|
|
|
272dfe3 |
+ int r;
|
|
|
272dfe3 |
+ if (assign) {
|
|
|
272dfe3 |
+ r = event_notifier_init(notifier, 1);
|
|
|
272dfe3 |
+ if (r < 0) {
|
|
|
272dfe3 |
+ return r;
|
|
|
272dfe3 |
+ }
|
|
|
272dfe3 |
+ r = kvm_set_ioeventfd(proxy->addr + VIRTIO_PCI_QUEUE_NOTIFY,
|
|
|
272dfe3 |
+ n, event_notifier_get_fd(notifier),
|
|
|
272dfe3 |
+ assign);
|
|
|
272dfe3 |
+ if (r < 0) {
|
|
|
272dfe3 |
+ event_notifier_cleanup(notifier);
|
|
|
272dfe3 |
+ }
|
|
|
272dfe3 |
+ } else {
|
|
|
272dfe3 |
+ r = kvm_set_ioeventfd(proxy->addr + VIRTIO_PCI_QUEUE_NOTIFY,
|
|
|
272dfe3 |
+ n, event_notifier_get_fd(notifier),
|
|
|
272dfe3 |
+ assign);
|
|
|
272dfe3 |
+ if (r < 0) {
|
|
|
272dfe3 |
+ return r;
|
|
|
272dfe3 |
+ }
|
|
|
272dfe3 |
+ event_notifier_cleanup(notifier);
|
|
|
272dfe3 |
+ }
|
|
|
272dfe3 |
+ return r;
|
|
|
272dfe3 |
+}
|
|
|
272dfe3 |
+
|
|
|
272dfe3 |
static const VirtIOBindings virtio_pci_bindings = {
|
|
|
272dfe3 |
.notify = virtio_pci_notify,
|
|
|
272dfe3 |
.save_config = virtio_pci_save_config,
|
|
|
272dfe3 |
@@ -401,6 +461,8 @@ static const VirtIOBindings virtio_pci_bindings = {
|
|
|
272dfe3 |
.save_queue = virtio_pci_save_queue,
|
|
|
272dfe3 |
.load_queue = virtio_pci_load_queue,
|
|
|
272dfe3 |
.get_features = virtio_pci_get_features,
|
|
|
272dfe3 |
+ .host_notifier = virtio_pci_host_notifier,
|
|
|
272dfe3 |
+ .guest_notifier = virtio_pci_guest_notifier,
|
|
|
272dfe3 |
};
|
|
|
272dfe3 |
|
|
|
272dfe3 |
static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev,
|
|
|
272dfe3 |
--
|
|
|
272dfe3 |
1.6.6.144.g5c3af
|