From bf7b4b930d45c58c036544d16d9cdb665b5274cb Mon Sep 17 00:00:00 2001 From: Michael S. Tsirkin Date: Wed, 3 Mar 2010 19:59:05 -0300 Subject: [PATCH 17/17] virtio-pci: irqfd support RH-Author: Michael S. Tsirkin Message-id: <52e25f86b71b640f07fe77a3adf5b18ace3a55c1.1267644824.git.mst@redhat.com> Patchwork-id: 7492 O-Subject: [PATCHv3 17/17] virtio-pci: irqfd support Bugzilla: 562958 RH-Acked-by: Juan Quintela RH-Acked-by: Amit Shah RH-Acked-by: Gerd Hoffmann Use irqfd when supported by kernel. This uses msix mask notifiers: when vector is masked, we poll it from userspace. When it is unmasked, we poll it from kernel. Signed-off-by: Michael S. Tsirkin --- hw/virtio-pci.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) Signed-off-by: Eduardo Habkost --- hw/virtio-pci.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index c12e6f3..cba188c 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -401,6 +401,27 @@ static void virtio_pci_guest_notifier_read(void *opaque) } } +static int virtio_pci_mask_notifier(PCIDevice *dev, unsigned vector, + void *opaque, int masked) +{ + VirtQueue *vq = opaque; + EventNotifier *notifier = virtio_queue_guest_notifier(vq); + int r = kvm_set_irqfd(dev->msix_irq_entries[vector].gsi, + event_notifier_get_fd(notifier), + !masked); + if (r < 0) { + return (r == -ENOSYS) ? 0 : r; + } + if (masked) { + qemu_set_fd_handler(event_notifier_get_fd(notifier), + virtio_pci_guest_notifier_read, NULL, vq); + } else { + qemu_set_fd_handler(event_notifier_get_fd(notifier), + NULL, NULL, NULL); + } + return 0; +} + static int virtio_pci_guest_notifier(void *opaque, int n, bool assign) { VirtIOPCIProxy *proxy = opaque; @@ -413,7 +434,11 @@ static int virtio_pci_guest_notifier(void *opaque, int n, bool assign) return r; qemu_set_fd_handler(event_notifier_get_fd(notifier), virtio_pci_guest_notifier_read, NULL, vq); + msix_set_mask_notifier(&proxy->pci_dev, + virtio_queue_vector(proxy->vdev, n), vq); } else { + msix_set_mask_notifier(&proxy->pci_dev, + virtio_queue_vector(proxy->vdev, n), NULL); qemu_set_fd_handler(event_notifier_get_fd(notifier), NULL, NULL, NULL); event_notifier_cleanup(notifier); @@ -498,6 +523,8 @@ static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev, proxy->pci_dev.config_write = virtio_write_config; + proxy->pci_dev.msix_mask_notifier = virtio_pci_mask_notifier; + size = VIRTIO_PCI_REGION_SIZE(&proxy->pci_dev) + vdev->config_len; if (size & (size-1)) size = 1 << qemu_fls(size); -- 1.6.3.rc4.29.g8146