From: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
To: kvmarm-FPEHb7Xf0XXUo1n7N8X6UoWGPAHP3yOg@public.gmane.org,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Cc: "open list:VFIO DRIVER"
<kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
marc.zyngier-5wv7dgnIgG8@public.gmane.org,
will.deacon-5wv7dgnIgG8@public.gmane.org,
open list <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
Antonios Motakis
<a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>,
tech-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org,
christoffer.dall-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org
Subject: [PATCH v10 20/20] vfio/platform: implement IRQ masking/unmasking via an eventfd
Date: Thu, 27 Nov 2014 18:33:00 +0100 [thread overview]
Message-ID: <1417109580-10505-21-git-send-email-a.motakis@virtualopensystems.com> (raw)
In-Reply-To: <1417109580-10505-1-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
With this patch the VFIO user will be able to set an eventfd that can be
used in order to mask and unmask IRQs of platform devices.
Signed-off-by: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
---
drivers/vfio/platform/vfio_platform_irq.c | 47 ++++++++++++++++++++++++---
drivers/vfio/platform/vfio_platform_private.h | 2 ++
2 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c
index 1765b6c..0e90365 100644
--- a/drivers/vfio/platform/vfio_platform_irq.c
+++ b/drivers/vfio/platform/vfio_platform_irq.c
@@ -37,6 +37,15 @@ static void vfio_platform_mask(struct vfio_platform_irq *irq_ctx)
spin_unlock_irqrestore(&irq_ctx->lock, flags);
}
+static int vfio_platform_mask_handler(void *opaque, void *unused)
+{
+ struct vfio_platform_irq *irq_ctx = opaque;
+
+ vfio_platform_mask(irq_ctx);
+
+ return 0;
+}
+
static int vfio_platform_set_irq_mask(struct vfio_platform_device *vdev,
unsigned index, unsigned start,
unsigned count, uint32_t flags,
@@ -48,8 +57,18 @@ static int vfio_platform_set_irq_mask(struct vfio_platform_device *vdev,
if (!(vdev->irqs[index].flags & VFIO_IRQ_INFO_MASKABLE))
return -EINVAL;
- if (flags & VFIO_IRQ_SET_DATA_EVENTFD)
- return -EINVAL; /* not implemented yet */
+ if (flags & VFIO_IRQ_SET_DATA_EVENTFD) {
+ int32_t fd = *(int32_t *)data;
+
+ if (fd >= 0)
+ return vfio_virqfd_enable((void *) &vdev->irqs[index],
+ vfio_platform_mask_handler,
+ NULL, NULL,
+ &vdev->irqs[index].mask, fd);
+
+ vfio_virqfd_disable(&vdev->irqs[index].mask);
+ return 0;
+ }
if (flags & VFIO_IRQ_SET_DATA_NONE) {
vfio_platform_mask(&vdev->irqs[index]);
@@ -78,6 +97,15 @@ static void vfio_platform_unmask(struct vfio_platform_irq *irq_ctx)
spin_unlock_irqrestore(&irq_ctx->lock, flags);
}
+static int vfio_platform_unmask_handler(void *opaque, void *unused)
+{
+ struct vfio_platform_irq *irq_ctx = opaque;
+
+ vfio_platform_unmask(irq_ctx);
+
+ return 0;
+}
+
static int vfio_platform_set_irq_unmask(struct vfio_platform_device *vdev,
unsigned index, unsigned start,
unsigned count, uint32_t flags,
@@ -89,8 +117,19 @@ static int vfio_platform_set_irq_unmask(struct vfio_platform_device *vdev,
if (!(vdev->irqs[index].flags & VFIO_IRQ_INFO_MASKABLE))
return -EINVAL;
- if (flags & VFIO_IRQ_SET_DATA_EVENTFD)
- return -EINVAL; /* not implemented yet */
+ if (flags & VFIO_IRQ_SET_DATA_EVENTFD) {
+ int32_t fd = *(int32_t *)data;
+
+ if (fd >= 0)
+ return vfio_virqfd_enable((void *) &vdev->irqs[index],
+ vfio_platform_unmask_handler,
+ NULL, NULL,
+ &vdev->irqs[index].unmask,
+ fd);
+
+ vfio_virqfd_disable(&vdev->irqs[index].unmask);
+ return 0;
+ }
if (flags & VFIO_IRQ_SET_DATA_NONE) {
vfio_platform_unmask(&vdev->irqs[index]);
diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h
index eef6d1b..c3d5b4b 100644
--- a/drivers/vfio/platform/vfio_platform_private.h
+++ b/drivers/vfio/platform/vfio_platform_private.h
@@ -32,6 +32,8 @@ struct vfio_platform_irq {
struct eventfd_ctx *trigger;
bool masked;
spinlock_t lock;
+ struct virqfd *unmask;
+ struct virqfd *mask;
};
struct vfio_platform_region {
--
2.1.3
next prev parent reply other threads:[~2014-11-27 17:33 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-27 17:32 [PATCH v10 00/20] VFIO support for platform and ARM AMBA devices Antonios Motakis
[not found] ` <1417109580-10505-1-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
2014-11-27 17:32 ` [PATCH v10 01/20] vfio/platform: initial skeleton of VFIO support for platform devices Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 02/20] vfio: platform: probe to devices on the platform bus Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 03/20] vfio: platform: add the VFIO PLATFORM module to Kconfig Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 04/20] vfio: amba: VFIO support for AMBA devices Antonios Motakis
[not found] ` <1417109580-10505-5-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
2014-12-09 14:18 ` Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 05/20] vfio: amba: add the VFIO for AMBA devices module to Kconfig Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 06/20] vfio/platform: return info for bound device Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 07/20] vfio/platform: return info for device memory mapped IO regions Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 08/20] vfio/platform: read and write support for the device fd Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 09/20] vfio/platform: support MMAP of MMIO regions Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 10/20] vfio/platform: return IRQ info Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 11/20] vfio/platform: initial interrupts support code Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 12/20] vfio/platform: trigger an interrupt via eventfd Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 13/20] vfio/platform: support for level sensitive interrupts Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 14/20] vfio: add a vfio_ prefix to virqfd_enable and virqfd_disable and export Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 15/20] vfio: virqfd: rename vfio_pci_virqfd_init and vfio_pci_virqfd_exit Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 16/20] vfio: add local lock for virqfd instead of depending on VFIO PCI Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 17/20] vfio: pass an opaque pointer on virqfd initialization Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 18/20] vfio: move eventfd support code for VFIO_PCI to a separate file Antonios Motakis
2014-11-27 17:32 ` [PATCH v10 19/20] vfio: initialize the virqfd workqueue in VFIO generic code Antonios Motakis
2014-11-27 17:33 ` Antonios Motakis [this message]
2014-11-28 18:05 ` [PATCH v10 00/20] VFIO support for platform and ARM AMBA devices Eric Auger
[not found] ` <5478B963.5050707-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-12-01 12:45 ` Antonios Motakis
[not found] ` <CAG8rG2wAt-wa26wBPA+2stb+Xn=B52thd8osRHWQm9WeQZbO1Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-12-01 14:29 ` Eric Auger
2014-12-07 19:12 ` Alex Williamson
[not found] ` <1417979565.1095.22.camel-xdHQ/5r00wBBDLzU/O5InQ@public.gmane.org>
2014-12-09 14:24 ` Antonios Motakis
[not found] ` <CAG8rG2wB9KtjYGEL91TDS9AiKFHjPHJKjqyRPJj7wqKP6c+Knw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-12-09 15:08 ` Alex Williamson
[not found] ` <1418137697.1095.126.camel-xdHQ/5r00wBBDLzU/O5InQ@public.gmane.org>
2014-12-10 14:00 ` Antonios Motakis
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=1417109580-10505-21-git-send-email-a.motakis@virtualopensystems.com \
--to=a.motakis-lrhrjnjw1ufhk3s98ze1ajgjjy/sre9j@public.gmane.org \
--cc=alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=christoffer.dall-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=kvmarm-FPEHb7Xf0XXUo1n7N8X6UoWGPAHP3yOg@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=marc.zyngier-5wv7dgnIgG8@public.gmane.org \
--cc=tech-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org \
--cc=will.deacon-5wv7dgnIgG8@public.gmane.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