|
 |
272dfe3 |
Use irqfd when supported by kernel.
|
|
|
272dfe3 |
This uses msix mask notifiers: when vector is masked, we poll it from
|
|
|
272dfe3 |
userspace. When it is unmasked, we poll it from kernel.
|
|
|
272dfe3 |
|
|
|
272dfe3 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
272dfe3 |
---
|
|
|
272dfe3 |
hw/virtio-pci.c | 31 +++++++++++++++++++++++++++++--
|
|
|
272dfe3 |
1 files changed, 29 insertions(+), 2 deletions(-)
|
|
|
272dfe3 |
|
|
|
272dfe3 |
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
|
|
|
272dfe3 |
index c454093..e8e0d82 100644
|
|
|
272dfe3 |
--- a/hw/virtio-pci.c
|
|
|
272dfe3 |
+++ b/hw/virtio-pci.c
|
|
|
272dfe3 |
@@ -404,6 +404,27 @@ static void virtio_pci_guest_notifier_read(void *opaque)
|
|
|
272dfe3 |
}
|
|
|
272dfe3 |
}
|
|
|
272dfe3 |
|
|
|
272dfe3 |
+static int virtio_pci_mask_notifier(PCIDevice *dev, unsigned vector,
|
|
|
272dfe3 |
+ void *opaque, int masked)
|
|
|
272dfe3 |
+{
|
|
|
272dfe3 |
+ VirtQueue *vq = opaque;
|
|
|
272dfe3 |
+ EventNotifier *notifier = virtio_queue_guest_notifier(vq);
|
|
|
272dfe3 |
+ int r = kvm_set_irqfd(dev->msix_irq_entries[vector].gsi,
|
|
|
272dfe3 |
+ event_notifier_get_fd(notifier),
|
|
|
272dfe3 |
+ !masked);
|
|
|
272dfe3 |
+ if (r < 0) {
|
|
|
272dfe3 |
+ return (r == -ENOSYS) ? 0 : r;
|
|
|
272dfe3 |
+ }
|
|
|
272dfe3 |
+ if (masked) {
|
|
|
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 |
+ }
|
|
|
272dfe3 |
+ return 0;
|
|
|
272dfe3 |
+}
|
|
|
272dfe3 |
+
|
|
|
272dfe3 |
static int virtio_pci_guest_notifier(void *opaque, int n, bool assign)
|
|
|
272dfe3 |
{
|
|
|
272dfe3 |
VirtIOPCIProxy *proxy = opaque;
|
|
|
272dfe3 |
@@ -412,11 +433,15 @@ static int virtio_pci_guest_notifier(void *opaque, int n, bool assign)
|
|
|
272dfe3 |
|
|
|
272dfe3 |
if (assign) {
|
|
|
272dfe3 |
int r = event_notifier_init(notifier, 0);
|
|
|
272dfe3 |
- if (r < 0)
|
|
|
272dfe3 |
- return r;
|
|
|
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 |
+ msix_set_mask_notifier(&proxy->pci_dev,
|
|
|
272dfe3 |
+ virtio_queue_vector(proxy->vdev, n), vq);
|
|
|
272dfe3 |
} else {
|
|
|
272dfe3 |
+ msix_set_mask_notifier(&proxy->pci_dev,
|
|
|
272dfe3 |
+ virtio_queue_vector(proxy->vdev, n), NULL);
|
|
|
272dfe3 |
qemu_set_fd_handler(event_notifier_get_fd(notifier),
|
|
|
272dfe3 |
NULL, NULL, vq);
|
|
|
272dfe3 |
event_notifier_cleanup(notifier);
|
|
|
272dfe3 |
@@ -501,6 +526,8 @@ static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev,
|
|
|
272dfe3 |
|
|
|
272dfe3 |
proxy->pci_dev.config_write = virtio_write_config;
|
|
|
272dfe3 |
|
|
|
272dfe3 |
+ proxy->pci_dev.msix_mask_notifier = virtio_pci_mask_notifier;
|
|
|
272dfe3 |
+
|
|
|
272dfe3 |
size = VIRTIO_PCI_REGION_SIZE(&proxy->pci_dev) + vdev->config_len;
|
|
|
272dfe3 |
if (size & (size-1))
|
|
|
272dfe3 |
size = 1 << qemu_fls(size);
|
|
|
272dfe3 |
--
|
|
|
272dfe3 |
1.6.6.144.g5c3af
|