Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1649912
| From | Eric Auger <eric.auger@redhat.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 02/10] VFIO: platform: Introduce direct EOI interrupt handler |
| Date | 2017-05-24 22:20 +0200 |
| Message-ID | <tKKVc-6Ww-17@gated-at.bofh.it> (permalink) |
| References | <tKKVb-6Ww-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
We add two new fields in vfio_platform_irq: deoi and handler.
If deoi is set, this means the physical IRQ attached to the virtual
IRQ is directly deactivated by the guest and the VFIO driver does
not need to disable the physical IRQ and mask it at VFIO level.
The handler pointer points to either the automasked or "deoi" handler.
This latter is the same as the one used for edge sensitive IRQs.
A wrapper handler is introduced that calls the chosen handler function.
The irq lock is taken/released in the wrapper handler. eventfd_signal
can be called in regions not allowed to sleep.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
---
---
drivers/vfio/platform/vfio_platform_irq.c | 24 +++++++++++++++++-------
drivers/vfio/platform/vfio_platform_private.h | 2 ++
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c
index 831f0b0..2f82459 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 && !irq_ctx->automasked) {
ret = IRQ_HANDLED;
@@ -161,8 +158,6 @@ static irqreturn_t vfio_automasked_irq_handler(int irq, void *dev_id)
irq_ctx->automasked = true;
}
- spin_unlock_irqrestore(&irq_ctx->lock, flags);
-
if (ret == IRQ_HANDLED)
eventfd_signal(irq_ctx->trigger, 1);
@@ -178,6 +173,19 @@ static irqreturn_t vfio_irq_handler(int irq, void *dev_id)
return IRQ_HANDLED;
}
+static irqreturn_t vfio_wrapper_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 int vfio_set_trigger(struct vfio_platform_device *vdev, int index,
int fd, irq_handler_t handler)
{
@@ -208,9 +216,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_wrapper_handler, 0, irq->name, irq);
if (ret) {
kfree(irq->name);
eventfd_ctx_put(trigger);
@@ -232,7 +241,8 @@ static int vfio_platform_set_irq_trigger(struct vfio_platform_device *vdev,
struct vfio_platform_irq *irq = &vdev->irqs[index];
irq_handler_t handler;
- if (vdev->irqs[index].flags & VFIO_IRQ_INFO_AUTOMASKED)
+ if (vdev->irqs[index].flags & VFIO_IRQ_INFO_AUTOMASKED &&
+ !irq->deoi)
handler = vfio_automasked_irq_handler;
else
handler = vfio_irq_handler;
diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h
index 8a3cfa9..b80a380 100644
--- a/drivers/vfio/platform/vfio_platform_private.h
+++ b/drivers/vfio/platform/vfio_platform_private.h
@@ -38,6 +38,8 @@ struct vfio_platform_irq {
spinlock_t lock;
struct virqfd *unmask;
struct virqfd *mask;
+ bool deoi;
+ irqreturn_t (*handler)(int irq, void *dev_id);
};
struct vfio_platform_region {
--
2.5.5
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/10] ARM/ARM64 Direct EOI setup for VFIO wired interrupts Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
[PATCH 02/10] VFIO: platform: Introduce direct EOI interrupt handler Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
Re: [PATCH 02/10] VFIO: platform: Introduce direct EOI interrupt handler Alex Williamson <alex.williamson@redhat.com> - 2017-05-31 20:30 +0200
[PATCH 06/10] irqbypass: Add a private field in the producer Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
[PATCH 01/10] vfio: platform: Add automasked field to vfio_platform_irq Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
Re: [PATCH 01/10] vfio: platform: Add automasked field to vfio_platform_irq Marc Zyngier <marc.zyngier@arm.com> - 2017-05-25 20:10 +0200
Re: [PATCH 01/10] vfio: platform: Add automasked field to vfio_platform_irq Auger Eric <eric.auger@redhat.com> - 2017-05-30 14:50 +0200
Re: [PATCH 01/10] vfio: platform: Add automasked field to vfio_platform_irq Alex Williamson <alex.williamson@redhat.com> - 2017-05-31 19:50 +0200
[PATCH 07/10] VFIO: pci: Direct EOI irq bypass for ARM/ARM64 Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
[PATCH 04/10] VFIO: pci: Add automasked field to vfio_pci_irq_ctx Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
Re: [PATCH 04/10] VFIO: pci: Add automasked field to vfio_pci_irq_ctx Alex Williamson <alex.williamson@redhat.com> - 2017-05-31 20:30 +0200
[PATCH 10/10] KVM: arm/arm64: register DEOI irq bypass consumer on ARM/ARM64 Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
[PATCH 08/10] KVM: arm/arm64: vgic: Handle unshared mapped interrupts Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
Re: [PATCH 08/10] KVM: arm/arm64: vgic: Handle unshared mapped interrupts Marc Zyngier <marc.zyngier@arm.com> - 2017-05-25 21:20 +0200
Re: [PATCH 08/10] KVM: arm/arm64: vgic: Handle unshared mapped interrupts Auger Eric <eric.auger@redhat.com> - 2017-05-30 15:00 +0200
Re: [PATCH 08/10] KVM: arm/arm64: vgic: Handle unshared mapped interrupts Christoffer Dall <cdall@linaro.org> - 2017-06-02 15:40 +0200
Re: [PATCH 08/10] KVM: arm/arm64: vgic: Handle unshared mapped interrupts Marc Zyngier <marc.zyngier@arm.com> - 2017-06-02 16:20 +0200
Re: [PATCH 08/10] KVM: arm/arm64: vgic: Handle unshared mapped interrupts Christoffer Dall <cdall@linaro.org> - 2017-06-02 18:40 +0200
[PATCH 03/10] VFIO: platform: Direct EOI irq bypass for ARM/ARM64 Eric Auger <eric.auger@redhat.com> - 2017-05-24 22:20 +0200
Re: [PATCH 03/10] VFIO: platform: Direct EOI irq bypass for ARM/ARM64 Alex Williamson <alex.williamson@redhat.com> - 2017-05-31 20:30 +0200
Re: [PATCH 03/10] VFIO: platform: Direct EOI irq bypass for ARM/ARM64 Auger Eric <eric.auger@redhat.com> - 2017-05-31 21:40 +0200
Re: [PATCH 03/10] VFIO: platform: Direct EOI irq bypass for ARM/ARM64 Marc Zyngier <marc.zyngier@arm.com> - 2017-06-01 12:50 +0200
csiph-web