From patchwork Thu Jul 2 13:17:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 6709451 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BF0D8C05AC for ; Thu, 2 Jul 2015 13:22:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B600D206D2 for ; Thu, 2 Jul 2015 13:22:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AAA56206C7 for ; Thu, 2 Jul 2015 13:22:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZAeQ8-00012t-T4; Thu, 02 Jul 2015 13:20:52 +0000 Received: from mail-wg0-f51.google.com ([74.125.82.51]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZAeOA-0004PN-Pg for linux-arm-kernel@lists.infradead.org; Thu, 02 Jul 2015 13:18:52 +0000 Received: by wguu7 with SMTP id u7so63062233wgu.3 for ; Thu, 02 Jul 2015 06:18:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NaN0wPKZrPYubAj9q0um9fJqg8TgGLL2Az5yU6/bOx8=; b=hgLcSXK2GOo8s+5cOTodaGj0MnDaZ5wpo86NkSbTqoF5OKNryDpJo1DNTtt8vN7HYA 3EUre27hFhtG39LLZ93LYjWDbM6DGCimwtytcy9Orql/IG/IwuyYohElg4gaSX0qVan/ 4egnC83pSbHF7Wyt05KEiqLXsknH4glx/Y1CG/MhCWroGd2ZQJfUD2Iy5mSRyPaEmBYU fch1PlCAY876ylBmojHwu3lCPzsjykMbj2k/C1ppauzybmGHprTGpuCgaruSs6fOKFjv H7SKwTuvzClIUtucoDBWqPHnS5VndGpVJ93BzfU0TLC5HtTlsU6a391SPT3arAXZfDtw jwmQ== X-Gm-Message-State: ALoCoQnGA6DgInI1eK9MRllf+tfNBvbqJzg/IFdE58Bi14suXVWofh4g0zjzSI4kxBuSCyQUSviM X-Received: by 10.180.109.136 with SMTP id hs8mr16337466wib.73.1435843109159; Thu, 02 Jul 2015 06:18:29 -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.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jul 2015 06:18:28 -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 Subject: [RFC 17/17] VFIO: platform: add irq bypass producer management Date: Thu, 2 Jul 2015 15:17:27 +0200 Message-Id: <1435843047-6327-18-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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150702_061851_211247_F564D0F1 X-CRM114-Status: GOOD ( 19.17 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, patches@linaro.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds irq_bypass_producer registration/unregistration. VFIO producer callbacks are populated: - stop/resume producer simply consist in disabling/enabling the host irq - add/del consumer: basically set the automasked flag to false/true The vfio_platform_device pointer is passed as producer opaque. We also cache the device handle in vfio_platform_device. This makes possible to easily retrieve the vfio_device at registration. Signed-off-by: Eric Auger --- drivers/vfio/platform/vfio_platform_common.c | 2 + drivers/vfio/platform/vfio_platform_irq.c | 83 +++++++++++++++++++++++++++ drivers/vfio/platform/vfio_platform_private.h | 2 + 3 files changed, 87 insertions(+) diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c index 9acfca6..12d4540 100644 --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c @@ -546,6 +546,8 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev, if (!vdev) return -EINVAL; + vdev->dev = dev; + group = iommu_group_get(dev); if (!group) { pr_err("VFIO: No IOMMU group for device %s\n", vdev->name); diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c index f6d83ed..0061e6e 100644 --- a/drivers/vfio/platform/vfio_platform_irq.c +++ b/drivers/vfio/platform/vfio_platform_irq.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "vfio_platform_private.h" @@ -185,6 +186,70 @@ static irqreturn_t vfio_handler(int irq, void *dev_id) return ret; } +static void vfio_platform_stop_producer(struct irq_bypass_producer *prod) +{ + pr_info("%s disable %d\n", __func__, prod->irq); + disable_irq(prod->irq); +} + +static void vfio_platform_resume_producer(struct irq_bypass_producer *prod) +{ + pr_info("%s enable %d\n", __func__, prod->irq); + enable_irq(prod->irq); +} + +static void vfio_platform_add_consumer(struct irq_bypass_producer *prod, + struct irq_bypass_consumer *cons) +{ + int i, ret; + struct vfio_platform_device *vdev = + (struct vfio_platform_device *)prod->opaque; + + pr_info("%s irq=%d gsi =%d\n", __func__, prod->irq, cons->gsi); + + for (i = 0; i < vdev->num_irqs; i++) { + if (vdev->irqs[i].prod == prod) + break; + } + WARN_ON(i == vdev->num_irqs); + + //TODO + /* + * if the IRQ is active at irqchip level or VFIO (auto)masked + * this means the host IRQ is already under injection in the + * guest and this not safe to change the forwarding state at + * that stage. + * It is not possible to differentiate user-space masking + * from auto-masking, leading to possible false detection of + * active state. + */ + prod->active = vfio_external_is_active(prod->vdev, i, 0, 0); + + ret = vfio_external_set_automasked(prod->vdev, i, 0, 0, false); + WARN_ON(ret); +} + +static void vfio_platform_del_consumer(struct irq_bypass_producer *prod, + struct irq_bypass_consumer *cons) +{ + int i; + struct vfio_platform_device *vdev = + (struct vfio_platform_device *)prod->opaque; + + pr_info("%s irq=%d gsi =%d\n", __func__, prod->irq, cons->gsi); + + for (i = 0; i < vdev->num_irqs; i++) { + if (vdev->irqs[i].prod == prod) + break; + } + WARN_ON(i == vdev->num_irqs); + + if (prod->active) + vfio_external_mask(prod->vdev, i, 0, 0); + + vfio_external_set_automasked(prod->vdev, i, 0, 0, true); +} + static int vfio_set_trigger(struct vfio_platform_device *vdev, int index, int fd, irq_handler_t handler) { @@ -192,8 +257,11 @@ static int vfio_set_trigger(struct vfio_platform_device *vdev, int index, struct eventfd_ctx *trigger; int ret; + if (irq->trigger) { free_irq(irq->hwirq, irq); + irq_bypass_unregister_producer(irq->prod); + kfree(irq->prod); kfree(irq->name); eventfd_ctx_put(irq->trigger); irq->trigger = NULL; @@ -225,6 +293,21 @@ static int vfio_set_trigger(struct vfio_platform_device *vdev, int index, return ret; } + irq->prod = kzalloc(sizeof(struct irq_bypass_producer), + GFP_KERNEL); + if (!irq->prod) + return -ENOMEM; + irq->prod->token = (void *)trigger; + irq->prod->irq = irq->hwirq; + irq->prod->vdev = vfio_device_get_from_dev(vdev->dev); + irq->prod->opaque = (void *)vdev; + irq->prod->add_consumer = vfio_platform_add_consumer; + irq->prod->del_consumer = vfio_platform_del_consumer; + irq->prod->stop_producer = vfio_platform_stop_producer; + irq->prod->resume_producer = vfio_platform_resume_producer; + ret = irq_bypass_register_producer(irq->prod); + WARN_ON(ret); + if (!irq->masked) enable_irq(irq->hwirq); diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h index 5f46c68..1255306 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -38,6 +38,7 @@ struct vfio_platform_irq { struct virqfd *unmask; struct virqfd *mask; irqreturn_t (*handler)(int irq, void *dev_id); + struct irq_bypass_producer *prod; }; struct vfio_platform_region { @@ -57,6 +58,7 @@ struct vfio_platform_device { u32 num_irqs; int refcnt; struct mutex igate; + struct device *dev; /* * These fields should be filled by the bus specific binder