From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031975AbdEXUNn (ORCPT ); Wed, 24 May 2017 16:13:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38416 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031936AbdEXUNj (ORCPT ); Wed, 24 May 2017 16:13:39 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E0054C059725 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=eric.auger@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E0054C059725 From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, alex.williamson@redhat.com, pbonzini@redhat.com, marc.zyngier@arm.com, christoffer.dall@linaro.org Cc: drjones@redhat.com, wei@redhat.com Subject: [PATCH 01/10] vfio: platform: Add automasked field to vfio_platform_irq Date: Wed, 24 May 2017 22:13:14 +0200 Message-Id: <1495656803-28011-2-git-send-email-eric.auger@redhat.com> In-Reply-To: <1495656803-28011-1-git-send-email-eric.auger@redhat.com> References: <1495656803-28011-1-git-send-email-eric.auger@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 24 May 2017 20:13:39 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For direct EOI modality we will need to differentiate a userspace masking from the IRQ handler auto-masking. Signed-off-by: Eric Auger --- drivers/vfio/platform/vfio_platform_irq.c | 10 ++++++---- drivers/vfio/platform/vfio_platform_private.h | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c index 46d4750..831f0b0 100644 --- a/drivers/vfio/platform/vfio_platform_irq.c +++ b/drivers/vfio/platform/vfio_platform_irq.c @@ -29,7 +29,7 @@ static void vfio_platform_mask(struct vfio_platform_irq *irq_ctx) spin_lock_irqsave(&irq_ctx->lock, flags); - if (!irq_ctx->masked) { + if (!irq_ctx->masked && !irq_ctx->automasked) { disable_irq_nosync(irq_ctx->hwirq); irq_ctx->masked = true; } @@ -89,9 +89,10 @@ static void vfio_platform_unmask(struct vfio_platform_irq *irq_ctx) spin_lock_irqsave(&irq_ctx->lock, flags); - if (irq_ctx->masked) { + if (irq_ctx->masked || irq_ctx->automasked) { enable_irq(irq_ctx->hwirq); irq_ctx->masked = false; + irq_ctx->automasked = false; } spin_unlock_irqrestore(&irq_ctx->lock, flags); @@ -152,12 +153,12 @@ static irqreturn_t vfio_automasked_irq_handler(int irq, void *dev_id) spin_lock_irqsave(&irq_ctx->lock, flags); - if (!irq_ctx->masked) { + if (!irq_ctx->masked && !irq_ctx->automasked) { ret = IRQ_HANDLED; /* automask maskable interrupts */ disable_irq_nosync(irq_ctx->hwirq); - irq_ctx->masked = true; + irq_ctx->automasked = true; } spin_unlock_irqrestore(&irq_ctx->lock, flags); @@ -315,6 +316,7 @@ int vfio_platform_irq_init(struct vfio_platform_device *vdev) vdev->irqs[i].count = 1; vdev->irqs[i].hwirq = hwirq; vdev->irqs[i].masked = false; + vdev->irqs[i].automasked = false; } vdev->num_irqs = cnt; diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h index 85ffe5d..8a3cfa9 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -34,6 +34,7 @@ struct vfio_platform_irq { char *name; struct eventfd_ctx *trigger; bool masked; + bool automasked; spinlock_t lock; struct virqfd *unmask; struct virqfd *mask; -- 2.5.5 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Auger Subject: [PATCH 01/10] vfio: platform: Add automasked field to vfio_platform_irq Date: Wed, 24 May 2017 22:13:14 +0200 Message-ID: <1495656803-28011-2-git-send-email-eric.auger@redhat.com> References: <1495656803-28011-1-git-send-email-eric.auger@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: eric.auger.pro@gmail.com, eric.auger@redhat.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, alex.williamson@redhat.com, pbonzini@redhat.com, marc.zyngier@arm.com, christoffer.dall@linaro.org Return-path: In-Reply-To: <1495656803-28011-1-git-send-email-eric.auger@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu List-Id: kvm.vger.kernel.org For direct EOI modality we will need to differentiate a userspace masking from the IRQ handler auto-masking. Signed-off-by: Eric Auger --- drivers/vfio/platform/vfio_platform_irq.c | 10 ++++++---- drivers/vfio/platform/vfio_platform_private.h | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c index 46d4750..831f0b0 100644 --- a/drivers/vfio/platform/vfio_platform_irq.c +++ b/drivers/vfio/platform/vfio_platform_irq.c @@ -29,7 +29,7 @@ static void vfio_platform_mask(struct vfio_platform_irq *irq_ctx) spin_lock_irqsave(&irq_ctx->lock, flags); - if (!irq_ctx->masked) { + if (!irq_ctx->masked && !irq_ctx->automasked) { disable_irq_nosync(irq_ctx->hwirq); irq_ctx->masked = true; } @@ -89,9 +89,10 @@ static void vfio_platform_unmask(struct vfio_platform_irq *irq_ctx) spin_lock_irqsave(&irq_ctx->lock, flags); - if (irq_ctx->masked) { + if (irq_ctx->masked || irq_ctx->automasked) { enable_irq(irq_ctx->hwirq); irq_ctx->masked = false; + irq_ctx->automasked = false; } spin_unlock_irqrestore(&irq_ctx->lock, flags); @@ -152,12 +153,12 @@ static irqreturn_t vfio_automasked_irq_handler(int irq, void *dev_id) spin_lock_irqsave(&irq_ctx->lock, flags); - if (!irq_ctx->masked) { + if (!irq_ctx->masked && !irq_ctx->automasked) { ret = IRQ_HANDLED; /* automask maskable interrupts */ disable_irq_nosync(irq_ctx->hwirq); - irq_ctx->masked = true; + irq_ctx->automasked = true; } spin_unlock_irqrestore(&irq_ctx->lock, flags); @@ -315,6 +316,7 @@ int vfio_platform_irq_init(struct vfio_platform_device *vdev) vdev->irqs[i].count = 1; vdev->irqs[i].hwirq = hwirq; vdev->irqs[i].masked = false; + vdev->irqs[i].automasked = false; } vdev->num_irqs = cnt; diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h index 85ffe5d..8a3cfa9 100644 --- a/drivers/vfio/platform/vfio_platform_private.h +++ b/drivers/vfio/platform/vfio_platform_private.h @@ -34,6 +34,7 @@ struct vfio_platform_irq { char *name; struct eventfd_ctx *trigger; bool masked; + bool automasked; spinlock_t lock; struct virqfd *unmask; struct virqfd *mask; -- 2.5.5