From: alex.williamson@redhat.com (Alex Williamson)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 03/10] VFIO: platform: single handler using function pointer
Date: Wed, 12 Aug 2015 12:56:20 -0600 [thread overview]
Message-ID: <1439405780.4023.527.camel@redhat.com> (raw)
In-Reply-To: <1439212864-12954-4-git-send-email-eric.auger@linaro.org>
On Mon, 2015-08-10 at 15:20 +0200, Eric Auger wrote:
> A single handler now is registered whatever the use case: automasked
> or not. A function pointer is set according to the wished behavior
> and the handler calls this function.
>
> The irq lock is taken/released in the root handler. eventfd_signal can
> be called in regions not allowed to sleep.
>
> Signed-off-by: Eric Auger <eric.auger@linaro.org>
>
> ---
>
> v4: creation
> ---
> drivers/vfio/platform/vfio_platform_irq.c | 21 +++++++++++++++------
> drivers/vfio/platform/vfio_platform_private.h | 1 +
> 2 files changed, 16 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c
> index 40f057a..b31b1f0 100644
> --- a/drivers/vfio/platform/vfio_platform_irq.c
> +++ b/drivers/vfio/platform/vfio_platform_irq.c
> @@ -148,11 +148,8 @@ static int vfio_platform_set_irq_unmask(struct vfio_platform_device *vdev,
> static irqreturn_t vfio_automasked_irq_handler(int irq, void *dev_id)
> {
> struct vfio_platform_irq *irq_ctx = dev_id;
> - unsigned long flags;
> int ret = IRQ_NONE;
>
> - spin_lock_irqsave(&irq_ctx->lock, flags);
> -
> if (!irq_ctx->masked) {
> ret = IRQ_HANDLED;
>
> @@ -161,8 +158,6 @@ static irqreturn_t vfio_automasked_irq_handler(int irq, void *dev_id)
> irq_ctx->masked = true;
> }
>
> - spin_unlock_irqrestore(&irq_ctx->lock, flags);
> -
> if (ret == IRQ_HANDLED)
> eventfd_signal(irq_ctx->trigger, 1);
Has this been run with lockdep to check whether this is safe to call
with spinlock_irqsave held?
>
> @@ -178,6 +173,19 @@ static irqreturn_t vfio_irq_handler(int irq, void *dev_id)
> return IRQ_HANDLED;
> }
>
> +static irqreturn_t vfio_handler(int irq, void *dev_id)
> +{
> + struct vfio_platform_irq *irq_ctx = dev_id;
> + unsigned long flags;
> + irqreturn_t ret;
> +
> + spin_lock_irqsave(&irq_ctx->lock, flags);
> + ret = irq_ctx->handler(irq, dev_id);
> + spin_unlock_irqrestore(&irq_ctx->lock, flags);
> +
> + return ret;
> +}
> +
> static void vfio_platform_irq_bypass_stop(struct irq_bypass_producer *prod)
> {
> }
> @@ -229,9 +237,10 @@ static int vfio_set_trigger(struct vfio_platform_device *vdev, int index,
> }
>
> irq->trigger = trigger;
> + irq->handler = handler;
>
> irq_set_status_flags(irq->hwirq, IRQ_NOAUTOEN);
> - ret = request_irq(irq->hwirq, handler, 0, irq->name, irq);
> + ret = request_irq(irq->hwirq, vfio_handler, 0, irq->name, irq);
> if (ret) {
> kfree(irq->name);
> eventfd_ctx_put(trigger);
> diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h
> index 8b4f814..f848a6b 100644
> --- a/drivers/vfio/platform/vfio_platform_private.h
> +++ b/drivers/vfio/platform/vfio_platform_private.h
> @@ -40,6 +40,7 @@ struct vfio_platform_irq {
> struct virqfd *mask;
> struct irq_bypass_producer producer;
> bool forwarded;
> + irqreturn_t (*handler)(int irq, void *dev_id);
> };
>
> struct vfio_platform_region {
next prev parent reply other threads:[~2015-08-12 18:56 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-10 13:20 [PATCH v3 00/10] ARM IRQ forward control based on IRQ bypass manager Eric Auger
2015-08-10 13:20 ` [PATCH v3 01/10] VFIO: platform: registration of a dummy IRQ bypass producer Eric Auger
2015-08-12 18:56 ` Alex Williamson
2015-08-17 15:17 ` Eric Auger
2015-08-10 13:20 ` [PATCH v3 02/10] VFIO: platform: test forwarded state when selecting the IRQ handler Eric Auger
2015-08-10 13:20 ` [PATCH v3 03/10] VFIO: platform: single handler using function pointer Eric Auger
2015-08-12 18:56 ` Alex Williamson [this message]
2015-08-17 15:25 ` Eric Auger
2015-08-10 13:20 ` [PATCH v3 04/10] VFIO: platform: add vfio_platform_set_automasked Eric Auger
2015-08-12 18:56 ` Alex Williamson
2015-08-17 15:38 ` Eric Auger
2015-08-18 17:44 ` Alex Williamson
2015-08-31 11:43 ` Antonios Motakis
2015-08-31 14:54 ` Alex Williamson
2015-08-10 13:20 ` [PATCH v3 05/10] VFIO: platform: add vfio_platform_is_active Eric Auger
2015-08-12 18:56 ` Alex Williamson
2015-08-17 15:39 ` Eric Auger
2015-09-02 19:29 ` Christoffer Dall
2015-08-10 13:21 ` [PATCH v3 06/10] VFIO: platform: add irq bypass producer management Eric Auger
2015-08-12 18:56 ` Alex Williamson
2015-08-17 15:51 ` Eric Auger
2015-09-02 19:32 ` Christoffer Dall
2015-08-10 13:21 ` [PATCH v3 07/10] KVM: arm/arm64: vgic: Allow HW interrupts for non-shared devices Eric Auger
2015-09-02 19:42 ` Christoffer Dall
2015-09-08 12:04 ` Eric Auger
2015-09-14 10:59 ` Christoffer Dall
2015-09-09 8:41 ` Eric Auger
2015-09-14 11:11 ` Christoffer Dall
2015-08-10 13:21 ` [PATCH v3 08/10] KVM: arm/arm64: vgic: support irqfd injection of a forwarded IRQ Eric Auger
2015-08-10 13:21 ` [PATCH v3 09/10] KVM: arm/arm64: vgic: forwarding control Eric Auger
2015-09-02 19:58 ` Christoffer Dall
2015-09-14 9:29 ` Eric Auger
2015-09-14 11:24 ` Christoffer Dall
2015-08-10 13:21 ` [PATCH v3 10/10] KVM: arm/arm64: implement IRQ bypass consumer functions Eric Auger
2015-09-02 19:58 ` [PATCH v3 00/10] ARM IRQ forward control based on IRQ bypass manager Christoffer Dall
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=1439405780.4023.527.camel@redhat.com \
--to=alex.williamson@redhat.com \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).