mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Eric Auger <eric.auger@linaro.org>
To: eric.auger@st.com, eric.auger@linaro.org,
	alex.williamson@redhat.com, b.reynal@virtualopensystems.com,
	christoffer.dall@linaro.org, marc.zyngier@arm.com,
	linux-arm-kernel@lists.infradead.org,
	kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org
Cc: andre.przywara@arm.com, linux-kernel@vger.kernel.org, patches@linaro.org
Subject: [PATCH v4 07/13] VFIO: platform: add irq bypass producer management
Date: Thu, 19 Nov 2015 14:53:57 +0000	[thread overview]
Message-ID: <1447944843-17731-8-git-send-email-eric.auger@linaro.org> (raw)
In-Reply-To: <1447944843-17731-1-git-send-email-eric.auger@linaro.org>

This patch populates the IRQ bypass callacks:
- stop/start producer simply consist in disabling/enabling the host irq
- add/del consumer: basically set the automasked flag to false/true

Signed-off-by: Eric Auger <eric.auger@linaro.org>

---
v3 -> v4:
- use vfio_platform_set_forwarded in place of vfio_platform_set_automasked
- use vfio_platform_irq_is_active and its returned value
- reword comments related to auto/explicit VFIO masking

v2 -> v3:
- vfio_platform_irq_bypass_add_consumer now returns an error in case
  the IRQ is recognized as active
- active boolean not set anymore
- do not VFIO mask the IRQ anymore on unforward

v1 -> v2:
- device handle caching in vfio_platform_device is introduced in a
  separate patch
- use container_of
---
 drivers/vfio/platform/vfio_platform_irq.c | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c
index cb7d5e9..e486c32 100644
--- a/drivers/vfio/platform/vfio_platform_irq.c
+++ b/drivers/vfio/platform/vfio_platform_irq.c
@@ -224,23 +224,49 @@ out:
 
 static void vfio_platform_irq_bypass_stop(struct irq_bypass_producer *prod)
 {
+	disable_irq(prod->irq);
 }
 
 static void vfio_platform_irq_bypass_start(struct irq_bypass_producer *prod)
 {
+	enable_irq(prod->irq);
 }
 
 static int vfio_platform_irq_bypass_add_consumer(
 			struct irq_bypass_producer *prod,
 			struct irq_bypass_consumer *cons)
 {
-	return 0;
+	struct vfio_platform_irq *irq =
+		container_of(prod, struct vfio_platform_irq, producer);
+	int ret;
+
+	/*
+	 * if the IRQ is active at irqchip level or masked by VFIO
+	 * this means the host IRQ may be under injection and
+	 * it is not safe to change the forwarding state at that time.
+	 * It is not possible to discriminate VFIO explicit masking
+	 * from VFIO auto-masking, leading to possible false detection of
+	 * IRQ activity. It is up to the user-space to avoid VFIO explicit
+	 * masking situation. In case of failure, no retry is attempted and
+	 * bypass setup simply fails.
+	 */
+	ret = vfio_platform_irq_is_active(irq);
+	if (ret < 0)
+		return ret;
+	else if (ret == 1)
+		return -EAGAIN;
+
+	return vfio_platform_set_forwarded(irq, true);
 }
 
 static void vfio_platform_irq_bypass_del_consumer(
 			struct irq_bypass_producer *prod,
 			struct irq_bypass_consumer *cons)
 {
+	struct vfio_platform_irq *irq =
+		container_of(prod, struct vfio_platform_irq, producer);
+
+	vfio_platform_set_forwarded(irq, false);
 }
 
 static int vfio_set_trigger(struct vfio_platform_device *vdev, int index,
-- 
1.9.1


  parent reply	other threads:[~2015-11-19 14:54 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-19 14:53 [PATCH v4 00/13] ARM IRQ forward control based on IRQ bypass manager Eric Auger
2015-11-19 14:53 ` [PATCH v4 01/13] KVM: arm/arm64: select IRQ_BYPASS_MANAGER Eric Auger
2015-11-19 14:53 ` [PATCH v4 02/13] VFIO: platform: registration of a dummy IRQ bypass producer Eric Auger
2015-11-19 14:53 ` [PATCH v4 03/13] VFIO: platform: test forwarded state when selecting the IRQ handler Eric Auger
2015-11-19 14:53 ` [PATCH v4 04/13] VFIO: platform: single handler using function pointer Eric Auger
2015-11-19 14:53 ` [PATCH v4 05/13] VFIO: platform: add vfio_platform_set_forwarded Eric Auger
2015-11-19 14:53 ` [PATCH v4 06/13] VFIO: platform: add vfio_platform_irq_is_active Eric Auger
2015-11-19 14:53 ` Eric Auger [this message]
2015-11-19 14:53 ` [PATCH v4 08/13] KVM: arm/arm64: vgic: adapt state machine for non shared mapped interrupts Eric Auger
2015-11-19 14:53 ` [PATCH v4 09/13] KVM: arm/arm64: vgic: support irqfd injection of a mapped IRQ Eric Auger
2015-11-19 14:54 ` [PATCH v4 10/13] KVM: arm/arm64: vgic: forwarding control Eric Auger
2015-11-19 14:54 ` [PATCH v4 11/13] KVM: arm/arm64: vgic: implement clear active for non shared mapped IRQ Eric Auger
2015-11-19 14:54 ` [PATCH v4 12/13] KVM: arm/arm64: vgic: implement clear pending " Eric Auger
2015-11-19 14:54 ` [PATCH v4 13/13] KVM: arm/arm64: implement IRQ bypass consumer functions Eric Auger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1447944843-17731-8-git-send-email-eric.auger@linaro.org \
    --to=eric.auger@linaro.org \
    --cc=alex.williamson@redhat.com \
    --cc=andre.przywara@arm.com \
    --cc=b.reynal@virtualopensystems.com \
    --cc=christoffer.dall@linaro.org \
    --cc=eric.auger@st.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=patches@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®