From patchwork Mon Jul 6 12:11:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 50740 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D3F6D229FC for ; Mon, 6 Jul 2015 12:12:17 +0000 (UTC) Received: by wgfk9 with SMTP id k9sf49469662wgf.1 for ; Mon, 06 Jul 2015 05:12:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=TheNxNebTBPhab8A5y3E8VXd8PbqKmyFPezhiTYSrgw=; b=a2Ryy1EEs1numQyZmoT69ZdrYqapBCLtrvtAzYsA6FJd/JFpqjS+iM2W1v9VAEsarK aJkU86PrecvzYAQPN6b3VFr09K4iU7oU5PXUysDUrTEj9xeFzwxsPMTaC85NCUJjof9q c3ztEgtN9/u3gStINaFEM8Lhx8ybDro11wA6i9t0Uv6/BYuWfO91lrA6CbAtClO2T9t0 5C34Wg8xnk15xb7GUP32SYuuuDQvNaEpQ1JSyOnzdedWtcCWyOlO4L/v3J6vOISSTvtw acn1Im4Q2o8NxFSws5YCuVNj6ELtfgnzva4rtfub1KeXSsIhZU3Q8JeTAifx6Fm138SJ mGag== X-Gm-Message-State: ALoCoQlYs2ojTTRj32vGIgj4Z+GDoWjyHw2hDLdtvhp1UjEvRBTMru4GdPc9leAWuXoZwKys7K/b X-Received: by 10.194.209.180 with SMTP id mn20mr30351918wjc.5.1436184737200; Mon, 06 Jul 2015 05:12:17 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.39 with SMTP id p7ls166302lap.104.gmail; Mon, 06 Jul 2015 05:12:16 -0700 (PDT) X-Received: by 10.152.2.2 with SMTP id 2mr49753050laq.58.1436184736968; Mon, 06 Jul 2015 05:12:16 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id ur9si15098610lac.98.2015.07.06.05.12.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jul 2015 05:12:16 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by lagx9 with SMTP id x9so152042257lag.1 for ; Mon, 06 Jul 2015 05:12:16 -0700 (PDT) X-Received: by 10.152.37.228 with SMTP id b4mr48375981lak.117.1436184736871; Mon, 06 Jul 2015 05:12:16 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1684370lbb; Mon, 6 Jul 2015 05:12:15 -0700 (PDT) X-Received: by 10.180.13.171 with SMTP id i11mr92106869wic.5.1436184729749; Mon, 06 Jul 2015 05:12:09 -0700 (PDT) Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com. [74.125.82.48]) by mx.google.com with ESMTPS id jt5si29961276wjc.48.2015.07.06.05.12.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jul 2015 05:12:09 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.48 as permitted sender) client-ip=74.125.82.48; Received: by wgqq4 with SMTP id q4so138604095wgq.1 for ; Mon, 06 Jul 2015 05:12:09 -0700 (PDT) X-Received: by 10.194.220.100 with SMTP id pv4mr100325930wjc.71.1436184729374; Mon, 06 Jul 2015 05:12:09 -0700 (PDT) Received: from gnx2579.home (LCaen-156-56-7-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by mx.google.com with ESMTPSA id v3sm27806709wja.31.2015.07.06.05.12.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jul 2015 05:12:08 -0700 (PDT) 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 v2 6/6] KVM: eventfd: add irq bypass consumer management Date: Mon, 6 Jul 2015 14:11:32 +0200 Message-Id: <1436184692-20927-7-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436184692-20927-1-git-send-email-eric.auger@linaro.org> References: <1436184692-20927-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch adds the registration/unregistration of an irq_bypass_consumer on irqfd assignment/deassignment. Signed-off-by: Eric Auger --- v1 -> v2: - populate of kvm and gsi removed - unregister the consumer on irqfd_shutdown --- include/linux/kvm_irqfd.h | 1 + virt/kvm/eventfd.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/include/linux/kvm_irqfd.h b/include/linux/kvm_irqfd.h index f926b39..3c0bd07 100644 --- a/include/linux/kvm_irqfd.h +++ b/include/linux/kvm_irqfd.h @@ -64,6 +64,7 @@ struct kvm_kernel_irqfd { struct list_head list; poll_table pt; struct work_struct shutdown; + struct irq_bypass_consumer consumer; }; #endif /* __LINUX_KVM_IRQFD_H */ diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c index b79dc61..9452754 100644 --- a/virt/kvm/eventfd.c +++ b/virt/kvm/eventfd.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -140,6 +141,7 @@ irqfd_shutdown(struct work_struct *work) /* * It is now safe to release the object's resources */ + irq_bypass_unregister_consumer(&irqfd->consumer); eventfd_ctx_put(irqfd->eventfd); kfree(irqfd); } @@ -380,7 +382,14 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args) */ fdput(f); - /* irq_bypass_register_consumer(); */ + 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.resume = kvm_arch_irq_bypass_resume; + irqfd->consumer.update = kvm_arch_irq_bypass_update; + ret = irq_bypass_register_consumer(&irqfd->consumer); + WARN_ON(ret); return 0; @@ -481,8 +490,6 @@ kvm_irqfd_deassign(struct kvm *kvm, struct kvm_irqfd *args) struct kvm_kernel_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); @@ -501,6 +508,7 @@ 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->consumer); } }