Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753797AbbGBNUG (ORCPT ); Thu, 2 Jul 2015 09:20:06 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:33930 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751260AbbGBNS2 (ORCPT ); Thu, 2 Jul 2015 09:18:28 -0400 From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, christoffer.dall@linaro.org, marc.zyngier@arm.com, alex.williamson@redhat.com, pbonzini@redhat.com, avi.kivity@gmail.com, mtosatti@redhat.com, feng.wu@intel.com, joro@8bytes.org, b.reynal@virtualopensystems.com Cc: linux-kernel@vger.kernel.org, patches@linaro.org Subject: [RFC 16/17] KVM: eventfd: add irq bypass consumer management Date: Thu, 2 Jul 2015 15:17:26 +0200 Message-Id: <1435843047-6327-17-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1435843047-6327-1-git-send-email-eric.auger@linaro.org> References: <1435843047-6327-1-git-send-email-eric.auger@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2271 Lines: 77 This patch adds the registration/unregistration of an irq_bypass_consumer on irqfd assignment/deassignment. Signed-off-by: Eric Auger --- virt/kvm/eventfd.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index f3da161..425a47b 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -93,6 +94,7 @@ struct _irqfd { struct list_head list; poll_table pt; struct work_struct shutdown; + struct irq_bypass_consumer *cons; }; static struct workqueue_struct *irqfd_cleanup_wq; @@ -429,7 +431,21 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args) */ fdput(f); - /* irq_bypass_register_consumer(); */ + irqfd->cons = kzalloc(sizeof(struct irq_bypass_consumer), + GFP_KERNEL); + if (!irqfd->cons) { + ret = -ENOMEM; + goto fail; + } + irqfd->cons->token = (void *)irqfd->eventfd; + irqfd->cons->gsi = irqfd->gsi; + irqfd->cons->kvm = kvm; + irqfd->cons->add_producer = kvm_arch_add_producer; + irqfd->cons->del_producer = kvm_arch_del_producer; + irqfd->cons->stop_consumer = kvm_arch_stop_consumer; + irqfd->cons->resume_consumer = kvm_arch_resume_consumer; + ret = irq_bypass_register_consumer(irqfd->cons); + WARN_ON(ret); return 0; @@ -530,8 +546,6 @@ kvm_irqfd_deassign(struct kvm *kvm, struct kvm_irqfd *args) struct _irqfd *irqfd, *tmp; struct eventfd_ctx *eventfd; - /* irq_bypass_unregister_consumer() */ - eventfd = eventfd_ctx_fdget(args->fd); if (IS_ERR(eventfd)) return PTR_ERR(eventfd); @@ -550,6 +564,8 @@ kvm_irqfd_deassign(struct kvm *kvm, struct kvm_irqfd *args) irqfd->irq_entry.type = 0; write_seqcount_end(&irqfd->irq_entry_sc); irqfd_deactivate(irqfd); + irq_bypass_unregister_consumer(irqfd->cons); + kfree(irqfd->cons); } } -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/