mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Antonios Motakis <a.motakis@virtualopensystems.com>
To: alex.williamson@redhat.com, kvmarm@lists.cs.columbia.edu,
	iommu@lists.linux-foundation.org
Cc: tech@virtualopensystems.com, kvm@vger.kernel.org,
	christoffer.dall@linaro.org, will.deacon@arm.com,
	kim.phillips@freescale.com, eric.auger@linaro.org,
	marc.zyngier@arm.com,
	Antonios Motakis <a.motakis@virtualopensystems.com>,
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCHv7 15/26] vfio/platform: return info for device memory mapped IO regions
Date: Tue, 23 Sep 2014 16:46:14 +0200	[thread overview]
Message-ID: <1411483586-29304-16-git-send-email-a.motakis@virtualopensystems.com> (raw)
In-Reply-To: <1411483586-29304-1-git-send-email-a.motakis@virtualopensystems.com>

This patch enables the IOCTLs VFIO_DEVICE_GET_REGION_INFO ioctl call,
which allows the user to learn about the available MMIO resources of
a device.

Signed-off-by: Antonios Motakis <a.motakis@virtualopensystems.com>
---
 drivers/vfio/platform/vfio_platform_common.c  | 84 +++++++++++++++++++++++++--
 drivers/vfio/platform/vfio_platform_private.h | 19 ++++++
 2 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c
index ba5edfd..469bdcb 100644
--- a/drivers/vfio/platform/vfio_platform_common.c
+++ b/drivers/vfio/platform/vfio_platform_common.c
@@ -27,17 +27,73 @@
 
 #include "vfio_platform_private.h"
 
+static int vfio_platform_regions_init(struct vfio_platform_device *vdev)
+{
+	int cnt = 0, i;
+
+	while (vdev->get_resource(vdev, cnt))
+		cnt++;
+
+	vdev->regions = kcalloc(cnt, sizeof(struct vfio_platform_region),
+				GFP_KERNEL);
+	if (!vdev->regions)
+		return -ENOMEM;
+
+	for (i = 0; i < cnt;  i++) {
+		struct resource *res =
+			vdev->get_resource(vdev, i);
+
+		if (!res)
+			goto err;
+
+		vdev->regions[i].addr = res->start;
+		vdev->regions[i].size = resource_size(res);
+		vdev->regions[i].flags = 0;
+	}
+
+	vdev->num_regions = cnt;
+
+	return 0;
+err:
+	kfree(vdev->regions);
+	return -EINVAL;
+}
+
+static void vfio_platform_regions_cleanup(struct vfio_platform_device *vdev)
+{
+	vdev->num_regions = 0;
+	kfree(vdev->regions);
+}
+
 static void vfio_platform_release(void *device_data)
 {
+	struct vfio_platform_device *vdev = device_data;
+
+	if (atomic_dec_and_test(&vdev->refcnt))
+		vfio_platform_regions_cleanup(vdev);
+
 	module_put(THIS_MODULE);
 }
 
 static int vfio_platform_open(void *device_data)
 {
+	struct vfio_platform_device *vdev = device_data;
+	int ret;
+
 	if (!try_module_get(THIS_MODULE))
 		return -ENODEV;
 
+	if (atomic_inc_return(&vdev->refcnt) == 1) {
+		ret = vfio_platform_regions_init(vdev);
+		if (ret)
+			goto err_reg;
+	}
+
 	return 0;
+
+err_reg:
+	module_put(THIS_MODULE);
+	return ret;
 }
 
 static long vfio_platform_ioctl(void *device_data,
@@ -58,18 +114,36 @@ static long vfio_platform_ioctl(void *device_data,
 			return -EINVAL;
 
 		info.flags = vdev->flags;
-		info.num_regions = 0;
+		info.num_regions = vdev->num_regions;
 		info.num_irqs = 0;
 
 		return copy_to_user((void __user *)arg, &info, minsz);
 
-	} else if (cmd == VFIO_DEVICE_GET_REGION_INFO)
-		return -EINVAL;
+	} else if (cmd == VFIO_DEVICE_GET_REGION_INFO) {
+		struct vfio_region_info info;
+
+		minsz = offsetofend(struct vfio_region_info, offset);
+
+		if (copy_from_user(&info, (void __user *)arg, minsz))
+			return -EFAULT;
+
+		if (info.argsz < minsz)
+			return -EINVAL;
+
+		if (info.index >= vdev->num_regions)
+			return -EINVAL;
+
+		/* map offset to the physical address  */
+		info.offset = VFIO_PLATFORM_INDEX_TO_OFFSET(info.index);
+		info.size = vdev->regions[info.index].size;
+		info.flags = vdev->regions[info.index].flags;
+
+		return copy_to_user((void __user *)arg, &info, minsz);
 
-	else if (cmd == VFIO_DEVICE_GET_IRQ_INFO)
+	} else if (cmd == VFIO_DEVICE_GET_IRQ_INFO) {
 		return -EINVAL;
 
-	else if (cmd == VFIO_DEVICE_SET_IRQS)
+	} else if (cmd == VFIO_DEVICE_SET_IRQS)
 		return -EINVAL;
 
 	else if (cmd == VFIO_DEVICE_RESET)
diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h
index ef76737..383164a 100644
--- a/drivers/vfio/platform/vfio_platform_private.h
+++ b/drivers/vfio/platform/vfio_platform_private.h
@@ -15,7 +15,26 @@
 #ifndef VFIO_PLATFORM_PRIVATE_H
 #define VFIO_PLATFORM_PRIVATE_H
 
+#define VFIO_PLATFORM_OFFSET_SHIFT   40
+#define VFIO_PLATFORM_OFFSET_MASK (((u64)(1) << VFIO_PLATFORM_OFFSET_SHIFT) - 1)
+
+#define VFIO_PLATFORM_OFFSET_TO_INDEX(off)	\
+	(off >> VFIO_PLATFORM_OFFSET_SHIFT)
+
+#define VFIO_PLATFORM_INDEX_TO_OFFSET(index)	\
+	((u64)(index) << VFIO_PLATFORM_OFFSET_SHIFT)
+
+struct vfio_platform_region {
+	u64			addr;
+	resource_size_t		size;
+	u32			flags;
+};
+
 struct vfio_platform_device {
+	struct vfio_platform_region	*regions;
+	u32				num_regions;
+	atomic_t			refcnt;
+
 	/*
 	 * These fields should be filled by the bus driver at binding time
 	 */
-- 
1.8.3.2


  parent reply	other threads:[~2014-09-23 14:48 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1411483586-29304-1-git-send-email-a.motakis@virtualopensystems.com>
2014-09-23 14:46 ` [PATCHv7 01/26] iommu/arm-smmu: change IOMMU_EXEC to IOMMU_NOEXEC Antonios Motakis
2014-09-23 14:58   ` Will Deacon
2014-09-23 22:14     ` Alex Williamson
2014-09-23 14:46 ` [PATCHv7 02/26] iommu: add capability IOMMU_CAP_NOEXEC Antonios Motakis
2014-09-26  9:48   ` Joerg Roedel
2014-09-26 15:00     ` Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 03/26] iommu/arm-smmu: add IOMMU_CAP_NOEXEC to the ARM SMMU driver Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 04/26] vfio/iommu_type1: support for platform bus devices on ARM Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 05/26] vfio: introduce the VFIO_DMA_MAP_FLAG_NOEXEC flag Antonios Motakis
2014-09-23 22:21   ` Alex Williamson
2014-09-23 22:30     ` Alex Williamson
2014-09-26 15:45       ` Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 06/26] vfio/iommu_type1: implement " Antonios Motakis
2014-09-23 22:40   ` Alex Williamson
2014-09-26 15:39     ` Antonios Motakis
2014-09-26 20:27       ` Alex Williamson
2014-09-29 10:38         ` Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 07/26] driver core: amba: add device binding path 'driver_override' Antonios Motakis
2014-09-23 22:45   ` Alex Williamson
2014-09-26 15:10     ` Antonios Motakis
2014-09-26 15:37   ` Russell King - ARM Linux
2014-09-29 10:14     ` Antonios Motakis
2014-10-08 12:18     ` Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 08/26] driver core: amba: add documentation for " Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 09/26] vfio/platform: initial skeleton of VFIO support for platform devices Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 10/26] vfio: platform: probe to devices on the platform bus Antonios Motakis
2014-09-23 23:01   ` Alex Williamson
2014-09-26 15:30     ` Antonios Motakis
2014-09-26 20:18       ` Alex Williamson
2014-09-29 10:21         ` Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 11/26] vfio: platform: add the VFIO PLATFORM module to Kconfig Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 12/26] vfio: amba: VFIO support for AMBA devices Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 13/26] vfio: amba: add the VFIO for AMBA devices module to Kconfig Antonios Motakis
2014-09-23 23:11   ` Alex Williamson
2014-09-26 15:06     ` Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 14/26] vfio/platform: return info for bound device Antonios Motakis
2014-09-23 14:46 ` Antonios Motakis [this message]
2014-09-23 14:46 ` [PATCHv7 16/26] vfio/platform: read and write support for the device fd Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 17/26] vfio/platform: support MMAP of MMIO regions Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 18/26] vfio/platform: return IRQ info Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 19/26] vfio/platform: initial interrupts support code Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 20/26] vfio/platform: trigger an interrupt via eventfd Antonios Motakis
2014-09-24 17:00   ` Alex Williamson
2014-09-26 15:03     ` Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 21/26] vfio/platform: support for maskable and automasked interrupts Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 22/26] vfio: move eventfd support code for VFIO_PCI to a separate file Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 23/26] vfio: add local lock in virqfd instead of depending on VFIO PCI Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 24/26] vfio: pass an opaque pointer on virqfd initialization Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 25/26] vfio: initialize the virqfd workqueue in VFIO generic code Antonios Motakis
2014-09-23 14:46 ` [PATCHv7 26/26] vfio/platform: implement IRQ masking/unmasking via an eventfd 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=1411483586-29304-16-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®