mirror of https://lore.kernel.org/lkml/
 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>,
	kvm@vger.kernel.org (open list:VFIO DRIVER),
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v8 18/18] vfio/platform: implement IRQ masking/unmasking via an eventfd
Date: Mon, 13 Oct 2014 15:10:25 +0200	[thread overview]
Message-ID: <1413205825-6370-19-git-send-email-a.motakis@virtualopensystems.com> (raw)
In-Reply-To: <1413205825-6370-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     | 46 ++++++++++++++++++++++++---
 drivers/vfio/platform/vfio_platform_private.h |  2 ++
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c
index 7620a17..6abb387 100644
--- a/drivers/vfio/platform/vfio_platform_irq.c
+++ b/drivers/vfio/platform/vfio_platform_irq.c
@@ -45,6 +45,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, void *data)
@@ -52,8 +61,18 @@ static int vfio_platform_set_irq_mask(struct vfio_platform_device *vdev,
 	if (start != 0 || count != 1)
 		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 virqfd_enable((void *) &vdev->irqs[index],
+					     vfio_platform_mask_handler,
+					     NULL, NULL,
+					     &vdev->irqs[index].mask, fd);
+
+		virqfd_disable(&vdev->irqs[index].mask);
+		return 0;
+	}
 
 	if (flags & VFIO_IRQ_SET_DATA_NONE) {
 		vfio_platform_mask(&vdev->irqs[index]);
@@ -82,6 +101,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, void *data)
@@ -89,8 +117,18 @@ static int vfio_platform_set_irq_unmask(struct vfio_platform_device *vdev,
 	if (start != 0 || count != 1)
 		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 virqfd_enable((void *) &vdev->irqs[index],
+					     vfio_platform_unmask_handler,
+					     NULL, NULL,
+					     &vdev->irqs[index].unmask, fd);
+
+		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 65e80e7..23ef038 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.1


      parent reply	other threads:[~2014-10-13 13:13 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1413205825-6370-1-git-send-email-a.motakis@virtualopensystems.com>
2014-10-13 13:10 ` [PATCH v8 01/18] vfio/platform: initial skeleton of VFIO support for platform devices Antonios Motakis
2014-10-13 13:10 ` [PATCH v8 02/18] vfio: platform: probe to devices on the platform bus Antonios Motakis
2014-10-21 16:17   ` Alex Williamson
     [not found]     ` <54468BDA.6050606@linaro.org>
2014-10-22 13:53       ` Antonios Motakis
2014-10-13 13:10 ` [PATCH v8 03/18] vfio: platform: add the VFIO PLATFORM module to Kconfig Antonios Motakis
2014-10-13 13:10 ` [PATCH v8 04/18] vfio: amba: VFIO support for AMBA devices Antonios Motakis
2014-10-13 13:10 ` [PATCH v8 05/18] vfio: amba: add the VFIO for AMBA devices module to Kconfig Antonios Motakis
2014-10-13 13:10 ` [PATCH v8 06/18] vfio/platform: return info for bound device Antonios Motakis
2014-10-13 13:10 ` [PATCH v8 07/18] vfio/platform: return info for device memory mapped IO regions Antonios Motakis
2014-10-21 16:34   ` Alex Williamson
2014-10-21 18:18     ` Bharat.Bhushan
2014-10-21 18:57       ` Alex Williamson
2014-10-22 13:54     ` Antonios Motakis
2014-10-22 16:46       ` Alex Williamson
2014-10-22 17:53         ` Antonios Motakis
2014-10-13 13:10 ` [PATCH v8 08/18] vfio/platform: read and write support for the device fd Antonios Motakis
2014-10-13 13:10 ` [PATCH v8 09/18] vfio/platform: support MMAP of MMIO regions Antonios Motakis
2014-10-21 16:51   ` Alex Williamson
2014-10-22 13:55     ` Antonios Motakis
2014-10-22 16:56       ` Alex Williamson
2014-10-13 13:10 ` [PATCH v8 10/18] vfio/platform: return IRQ info Antonios Motakis
2014-10-13 13:10 ` [PATCH v8 11/18] vfio/platform: initial interrupts support code Antonios Motakis
2014-10-13 13:10 ` [PATCH v8 12/18] vfio/platform: trigger an interrupt via eventfd Antonios Motakis
2014-10-13 13:10 ` [PATCH v8 13/18] vfio/platform: support for maskable and automasked interrupts Antonios Motakis
2014-10-21 17:47   ` Alex Williamson
2014-10-22 13:55     ` Antonios Motakis
2014-10-13 13:10 ` [PATCH v8 14/18] vfio: move eventfd support code for VFIO_PCI to a separate file Antonios Motakis
2014-10-21 17:55   ` Alex Williamson
2014-10-22 13:56     ` Antonios Motakis
2014-10-13 13:10 ` [PATCH v8 15/18] vfio: add local lock in virqfd instead of depending on VFIO PCI Antonios Motakis
2014-10-13 13:10 ` [PATCH v8 16/18] vfio: pass an opaque pointer on virqfd initialization Antonios Motakis
2014-10-13 13:10 ` [PATCH v8 17/18] vfio: initialize the virqfd workqueue in VFIO generic code Antonios Motakis
2014-10-13 13:10 ` 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=1413205825-6370-19-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

all inboxes | Powered by JetHome®