KVM: eventfd: add irq bypass consumer management

This patch adds the registration/unregistration of an
irq_bypass_consumer on irqfd assignment/deassignment.

Signed-off-by: Eric Auger <eric.auger@linaro.org>
Signed-off-by: Feng Wu <feng.wu@intel.com>
Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/include/linux/kvm_irqfd.h b/include/linux/kvm_irqfd.h
index f926b39a26b66799e4129a7e27e9d8bf4650de4e..0c1de05098c85cfa2a46d53ed843794b73faf5c1 100644 (file)
--- a/include/linux/kvm_irqfd.h
+++ b/include/linux/kvm_irqfd.h
@@ -64,6 +64,8 @@ struct kvm_kernel_irqfd {
        struct list_head list;
        poll_table pt;
        struct work_struct shutdown;
+       struct irq_bypass_consumer consumer;
+       struct irq_bypass_producer *producer;
 };
 
 #endif /* __LINUX_KVM_IRQFD_H */

diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index c4f7abec42616f6040ba07a4e420506fd72cffff..7df356d8f1fd66dfe74f7561ae8f1fb99d373520 100644 (file)
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -35,6 +35,7 @@
 #include <linux/srcu.h>
 #include <linux/slab.h>
 #include <linux/seqlock.h>
+#include <linux/irqbypass.h>
 #include <trace/events/kvm.h>
 
 #include <kvm/iodev.h>
@@ -140,6 +141,9 @@ irqfd_shutdown(struct work_struct *work)
        /*
         * It is now safe to release the object's resources
         */
+#ifdef CONFIG_HAVE_KVM_IRQ_BYPASS
+       irq_bypass_unregister_consumer(&irqfd->consumer);
+#endif
        eventfd_ctx_put(irqfd->eventfd);
        kfree(irqfd);
 }
@@ -391,6 +395,17 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
         * we might race against the POLLHUP
         */
        fdput(f);
+#ifdef CONFIG_HAVE_KVM_IRQ_BYPASS
+       irqfd->consumer.token = (void *)irqfd->eventfd;
+       irqfd->consumer.add_producer = kvm_arch_irq_bypass_add_producer;
+       irqfd->consumer.del_producer = kvm_arch_irq_bypass_del_producer;
+       irqfd->consumer.stop = kvm_arch_irq_bypass_stop;
+       irqfd->consumer.start = kvm_arch_irq_bypass_start;
+       ret = irq_bypass_register_consumer(&irqfd->consumer);
+       if (ret)
+               pr_info("irq bypass consumer (token %p) registration fails: %d\n",
+                               irqfd->consumer.token, ret);
+#endif
 
        return 0;