From patchwork Thu Jul 2 13:17:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 50586 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 86463214B3 for ; Thu, 2 Jul 2015 13:18:34 +0000 (UTC) Received: by laer2 with SMTP id r2sf19955690lae.3 for ; Thu, 02 Jul 2015 06:18:33 -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=97LBv6o2jgGmrHkUrA+fqWCea36jTLo53RJp8D9W9hU=; b=PNcxbYC/w5HIXL1foAsrbsnZYI1MzvXrjTdOnjyYuIfiz4mJV5xHgYi893WbuB3r1E mX2Ndp6RrDuQXNBdQ6z9YV6xTaOQ4hl4XBVTtT1/TZ82DnLLZjddLcWoNi9SrzGQPCNG j/2pIi6QAVnqxNhCSdBKEteIkTSX72X7sdFlXD3xOZqKJPPGWxwIbF45sLXznAfPTP+0 KIhIXwAlOtwIoRZAY6c8CSJQnEjjAwR02WsknpzV9z6UpaOnHdSpVWMGTs2j3ZfzB0Fk i9qmVUcGIX74CmFHE0XHHqYNNQeQOHDVVElSt555gIKOmjpQd9MkuPVOWEcM1EYDLlF3 jUMg== X-Gm-Message-State: ALoCoQnkvlf8qQK0TXPp85r6/n7GPqch2mU7/DA8F6Djnx7pE8l/p05TejylcZhHD8weZHi+w1uN X-Received: by 10.194.175.36 with SMTP id bx4mr19969136wjc.1.1435843113579; Thu, 02 Jul 2015 06:18:33 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.197 with SMTP id ks5ls345907lac.64.gmail; Thu, 02 Jul 2015 06:18:33 -0700 (PDT) X-Received: by 10.152.23.38 with SMTP id j6mr29714250laf.47.1435843113419; Thu, 02 Jul 2015 06:18:33 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id pj6si4471590lbb.17.2015.07.02.06.18.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jul 2015 06:18:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by lbbpo10 with SMTP id po10so31814695lbb.3 for ; Thu, 02 Jul 2015 06:18:33 -0700 (PDT) X-Received: by 10.112.160.165 with SMTP id xl5mr30410182lbb.36.1435843113296; Thu, 02 Jul 2015 06:18:33 -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 hn6csp476384lbb; Thu, 2 Jul 2015 06:18:32 -0700 (PDT) X-Received: by 10.180.99.2 with SMTP id em2mr53618637wib.59.1435843099332; Thu, 02 Jul 2015 06:18:19 -0700 (PDT) Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com. [74.125.82.43]) by mx.google.com with ESMTPS id wn9si8812959wjb.52.2015.07.02.06.18.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jul 2015 06:18:19 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 74.125.82.43 as permitted sender) client-ip=74.125.82.43; Received: by wgqq4 with SMTP id q4so63059273wgq.1 for ; Thu, 02 Jul 2015 06:18:19 -0700 (PDT) X-Received: by 10.180.208.7 with SMTP id ma7mr55894059wic.0.1435843099062; Thu, 02 Jul 2015 06:18:19 -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 tl3sm8157099wjc.20.2015.07.02.06.18.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jul 2015 06:18:18 -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 12/17] irq: bypass: Extend skeleton for ARM forwarding control Date: Thu, 2 Jul 2015 15:17:22 +0200 Message-Id: <1435843047-6327-13-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> 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.217.182 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: , - [add,del]_[consumer,producer] updated to takes both the consumer and producer handles. This is requested to combine info from both, typically to link the source irq owned by the producer with the gsi owned by the consumer (forwarded IRQ setup). - new functions are added: [stop,resume]_[consumer, producer]. Those are needed for forwarding since the state change requires to entermingle actions at consumer, producer. - On handshake, we now call connect, disconnect which features the more complex sequence. - new fields are added on producer side: linux irq, vfio_device handle, active which reflects whether the source is active (at interrupt controller level or at VFIO level - automasked -) and finally an opaque pointer which will be used to point to the vfio_platform_device in this series. - new fields on consumer side: the kvm handle, the gsi Integration of posted interrupt series will help to refine those choices Signed-off-by: Eric Auger --- - connect/disconnect could become a cb too. For forwarding it may make sense to have failure at connection: this would happen when the physical IRQ is either active at irqchip level or VFIO masked. This means some of the cb should return an error and this error management could be prod/cons specific. Where to attach the connect/disconnect cb: to the cons or prod, to both? - Hence may be sensible to do the list_add only if connect returns 0 - disconnect would not be allowed to fail. --- include/linux/irqbypass.h | 26 ++++++++++++++++++++++--- kernel/irq/bypass.c | 48 +++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 67 insertions(+), 7 deletions(-) diff --git a/include/linux/irqbypass.h b/include/linux/irqbypass.h index 718508e..591ae3f 100644 --- a/include/linux/irqbypass.h +++ b/include/linux/irqbypass.h @@ -3,17 +3,37 @@ #include +struct vfio_device; +struct irq_bypass_consumer; +struct kvm; + struct irq_bypass_producer { struct list_head node; void *token; - /* TBD */ + unsigned int irq; /* host physical irq */ + struct vfio_device *vdev; /* vfio device that requested irq */ + /* is irq active at irqchip or VFIO masked? */ + bool active; + void *opaque; + void (*stop_producer)(struct irq_bypass_producer *); + void (*resume_producer)(struct irq_bypass_producer *); + void (*add_consumer)(struct irq_bypass_producer *, + struct irq_bypass_consumer *); + void (*del_consumer)(struct irq_bypass_producer *, + struct irq_bypass_consumer *); }; struct irq_bypass_consumer { struct list_head node; void *token; - void (*add_producer)(struct irq_bypass_producer *); - void (*del_producer)(struct irq_bypass_producer *); + unsigned int gsi; /* the guest gsi */ + struct kvm *kvm; + void (*stop_consumer)(struct irq_bypass_consumer *); + void (*resume_consumer)(struct irq_bypass_consumer *); + void (*add_producer)(struct irq_bypass_consumer *, + struct irq_bypass_producer *); + void (*del_producer)(struct irq_bypass_consumer *, + struct irq_bypass_producer *); }; int irq_bypass_register_producer(struct irq_bypass_producer *); diff --git a/kernel/irq/bypass.c b/kernel/irq/bypass.c index 5d0f92b..fb31fef 100644 --- a/kernel/irq/bypass.c +++ b/kernel/irq/bypass.c @@ -19,6 +19,46 @@ static LIST_HEAD(producers); static LIST_HEAD(consumers); static DEFINE_MUTEX(lock); +/* lock must be hold when calling connect */ +static void connect(struct irq_bypass_producer *prod, + struct irq_bypass_consumer *cons) +{ + pr_info("++++ %s prod(%d) -> cons(%d)\n", + __func__, prod->irq, cons->gsi); + if (prod->stop_producer) + prod->stop_producer(prod); + if (cons->stop_consumer) + cons->stop_consumer(cons); + if (prod->add_consumer) + prod->add_consumer(prod, cons); + if (cons->add_producer) + cons->add_producer(cons, prod); + if (cons->resume_consumer) + cons->resume_consumer(cons); + if (prod->resume_producer) + prod->resume_producer(prod); +} + +/* lock must be hold when calling disconnect */ +static void disconnect(struct irq_bypass_producer *prod, + struct irq_bypass_consumer *cons) +{ + pr_info("---- %s prod(%d) -> cons(%d)\n", + __func__, prod->irq, cons->gsi); + if (prod->stop_producer) + prod->stop_producer(prod); + if (cons->stop_consumer) + cons->stop_consumer(cons); + if (cons->del_producer) + cons->del_producer(cons, prod); + if (prod->del_consumer) + prod->del_consumer(prod, cons); + if (cons->resume_consumer) + cons->resume_consumer(cons); + if (prod->resume_producer) + prod->resume_producer(prod); +} + int irq_bypass_register_producer(struct irq_bypass_producer *producer) { struct irq_bypass_producer *tmp; @@ -38,7 +78,7 @@ int irq_bypass_register_producer(struct irq_bypass_producer *producer) list_for_each_entry(consumer, &consumers, node) { if (consumer->token == producer->token) { - consumer->add_producer(producer); + connect(producer, consumer); break; } } @@ -56,7 +96,7 @@ void irq_bypass_unregister_producer(struct irq_bypass_producer *producer) list_for_each_entry(consumer, &consumers, node) { if (consumer->token == producer->token) { - consumer->del_producer(producer); + disconnect(producer, consumer); break; } } @@ -86,7 +126,7 @@ int irq_bypass_register_consumer(struct irq_bypass_consumer *consumer) list_for_each_entry(producer, &producers, node) { if (producer->token == consumer->token) { - consumer->add_producer(producer); + connect(producer, consumer); break; } } @@ -104,7 +144,7 @@ void irq_bypass_unregister_consumer(struct irq_bypass_consumer *consumer) list_for_each_entry(producer, &producers, node) { if (producer->token == consumer->token) { - consumer->del_producer(producer); + disconnect(producer, consumer); break; } }