Linux IOMMU Development
 help / color / mirror / Atom feed
From: Antonios Motakis <a.motakis@virtualopensystems.com>
To: kvmarm@lists.cs.columbia.edu, iommu@lists.linux-foundation.org,
	alex.williamson@redhat.com
Cc: will.deacon@arm.com, tech@virtualopensystems.com,
	christoffer.dall@linaro.org, eric.auger@linaro.org,
	kim.phillips@freescale.com, marc.zyngier@arm.com,
	Antonios Motakis <a.motakis@virtualopensystems.com>,
	"open list:VFIO DRIVER" <kvm@vger.kernel.org>,
	open list <linux-kernel@vger.kernel.org>
Subject: [PATCH v11 20/20] vfio/platform: implement IRQ masking/unmasking via an eventfd
Date: Tue,  6 Jan 2015 11:48:55 +0100	[thread overview]
Message-ID: <1420541335-17190-21-git-send-email-a.motakis@virtualopensystems.com> (raw)
In-Reply-To: <1420541335-17190-1-git-send-email-a.motakis@virtualopensystems.com>

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@virtualopensystems.com>
---
 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 b3602cb..6ade36b 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.4


      parent reply	other threads:[~2015-01-06 10:48 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-06 10:48 [PATCH v11 00/20] VFIO support for platform and ARM AMBA devices Antonios Motakis
     [not found] ` <1420541335-17190-1-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
2015-01-06 10:48   ` [PATCH v11 01/20] vfio/platform: initial skeleton of VFIO support for platform devices Antonios Motakis
2015-01-06 10:48   ` [PATCH v11 02/20] vfio: platform: probe to devices on the platform bus Antonios Motakis
2015-01-06 10:48   ` [PATCH v11 04/20] vfio: amba: VFIO support for AMBA devices Antonios Motakis
2015-01-06 10:48   ` [PATCH v11 06/20] vfio/platform: return info for bound device Antonios Motakis
2015-01-06 10:48   ` [PATCH v11 08/20] vfio/platform: read and write support for the device fd Antonios Motakis
2015-01-06 10:48   ` [PATCH v11 11/20] vfio/platform: initial interrupts support code Antonios Motakis
2015-01-06 10:48   ` [PATCH v11 12/20] vfio/platform: trigger an interrupt via eventfd Antonios Motakis
2015-01-06 10:48   ` [PATCH v11 18/20] vfio: move eventfd support code for VFIO_PCI to a separate file Antonios Motakis
2015-01-06 10:48   ` [PATCH v11 19/20] vfio: initialize the virqfd workqueue in VFIO generic code Antonios Motakis
2015-01-08 16:58   ` [PATCH v11 00/20] VFIO support for platform and ARM AMBA devices Eric Auger
2015-01-09  8:39   ` Eric Auger
     [not found]     ` <54AF93AB.9030302-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-01-09 11:33       ` Antonios Motakis
     [not found]         ` <CAG8rG2yc1ityUwswPiTR_w5f3tSeX_KB2g06HcPCPARXPHGvfg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-01-16 13:25           ` Baptiste Reynal
     [not found]             ` <CAN9JPjERBVnGku8_BJuesMnzJyQYUgz6rJhL_VrCOgLVQuXyuw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-01-19 10:17               ` Eric Auger
     [not found]                 ` <54BCD9A6.4050501-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-01-19 12:27                   ` Eric Auger
     [not found]                     ` <54BCF846.1070906-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-01-19 17:00                       ` Baptiste Reynal
     [not found]                         ` <CAN9JPjF5sAH-UNKtBhfiHK7cQJBwNwg2UEcrj8sv9Em6MnBVxg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-01-19 18:09                           ` Eric Auger
     [not found]                             ` <54BD4857.3070707-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-01-20 15:10                               ` Baptiste Reynal
     [not found]                                 ` <CAN9JPjEhUhjgnDAMmMGxgFoLkhqQYgvsKeZ2+oDKzWMCe+qzhw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-01-20 16:33                                   ` Eric Auger
2015-01-19 18:39   ` Alex Williamson
     [not found]     ` <1421692750.6130.377.camel-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2015-01-21 12:54       ` Antonios Motakis
2015-01-06 10:48 ` [PATCH v11 03/20] vfio: platform: add the VFIO PLATFORM module to Kconfig Antonios Motakis
2015-01-06 10:48 ` [PATCH v11 05/20] vfio: amba: add the VFIO for AMBA devices " Antonios Motakis
2015-01-06 10:48 ` [PATCH v11 07/20] vfio/platform: return info for device memory mapped IO regions Antonios Motakis
2015-01-06 10:48 ` [PATCH v11 09/20] vfio/platform: support MMAP of MMIO regions Antonios Motakis
2015-01-06 10:48 ` [PATCH v11 10/20] vfio/platform: return IRQ info Antonios Motakis
2015-01-06 10:48 ` [PATCH v11 13/20] vfio/platform: support for level sensitive interrupts Antonios Motakis
2015-01-06 10:48 ` [PATCH v11 14/20] vfio: add a vfio_ prefix to virqfd_enable and virqfd_disable and export Antonios Motakis
2015-01-06 10:48 ` [PATCH v11 15/20] vfio: virqfd: rename vfio_pci_virqfd_init and vfio_pci_virqfd_exit Antonios Motakis
2015-01-06 10:48 ` [PATCH v11 16/20] vfio: add local lock for virqfd instead of depending on VFIO PCI Antonios Motakis
2015-01-06 10:48 ` [PATCH v11 17/20] vfio: pass an opaque pointer on virqfd initialization Antonios Motakis
2015-01-06 10:48 ` Antonios Motakis [this message]

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=1420541335-17190-21-git-send-email-a.motakis@virtualopensystems.com \
    --to=a.motakis@virtualopensystems.com \
    --cc=alex.williamson@redhat.com \
    --cc=christoffer.dall@linaro.org \
    --cc=eric.auger@linaro.org \
    --cc=iommu@lists.linux-foundation.org \
    --cc=kim.phillips@freescale.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=tech@virtualopensystems.com \
    --cc=will.deacon@arm.com \
    /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