From: Eric Auger <eric.auger-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
To: Antonios Motakis
<a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>,
kvmarm-FPEHb7Xf0XXUo1n7N8X6UoWGPAHP3yOg@public.gmane.org,
iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
alex.williamson-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Cc: VFIO DRIVER <kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
marc.zyngier-5wv7dgnIgG8@public.gmane.org,
will.deacon-5wv7dgnIgG8@public.gmane.org,
open list <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
tech-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org,
christoffer.dall-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org
Subject: Re: [PATCH v9 08/19] vfio/platform: read and write support for the device fd
Date: Wed, 12 Nov 2014 16:46:37 +0100 [thread overview]
Message-ID: <546380DD.8000802@linaro.org> (raw)
In-Reply-To: <1414433284-31719-9-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
On 10/27/2014 07:07 PM, Antonios Motakis wrote:
> VFIO returns a file descriptor which we can use to manipulate the memory
> regions of the device. Usually, the user will mmap memory regions that are
> addressable on page boundaries, however for memory regions where this is
> not the case we cannot provide mmap functionality due to security concerns.
> For this reason we also need allow to read and write to the memory regions
some rewording needed here
> via the file descriptor. Implement this funcionality
typo
Regards
Eric
only for MMIO regions
> of platform devices; PIO regions are not being handled at this point.
>
> Signed-off-by: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
> ---
> drivers/vfio/platform/vfio_platform_common.c | 150 ++++++++++++++++++++++++++
> drivers/vfio/platform/vfio_platform_private.h | 1 +
> 2 files changed, 151 insertions(+)
>
> diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c
> index 82de752..e10a8d0 100644
> --- a/drivers/vfio/platform/vfio_platform_common.c
> +++ b/drivers/vfio/platform/vfio_platform_common.c
> @@ -55,6 +55,10 @@ static int vfio_platform_regions_init(struct vfio_platform_device *vdev)
> switch (resource_type(res)) {
> case IORESOURCE_MEM:
> vdev->regions[i].type = VFIO_PLATFORM_REGION_TYPE_MMIO;
> + vdev->regions[i].flags |= VFIO_REGION_INFO_FLAG_READ;
> + if (!(res->flags & IORESOURCE_READONLY))
> + vdev->regions[i].flags |=
> + VFIO_REGION_INFO_FLAG_WRITE;
> break;
> case IORESOURCE_IO:
> vdev->regions[i].type = VFIO_PLATFORM_REGION_TYPE_PIO;
> @@ -74,6 +78,11 @@ err:
>
> static void vfio_platform_regions_cleanup(struct vfio_platform_device *vdev)
> {
> + int i;
> +
> + for (i = 0; i < vdev->num_regions; i++)
> + iounmap(vdev->regions[i].ioaddr);
> +
> vdev->num_regions = 0;
> kfree(vdev->regions);
> }
> @@ -176,15 +185,156 @@ static long vfio_platform_ioctl(void *device_data,
> return -ENOTTY;
> }
>
> +static ssize_t vfio_platform_read_mmio(struct vfio_platform_region reg,
> + char __user *buf, size_t count,
> + loff_t off)
> +{
> + unsigned int done = 0;
> +
> + if (!reg.ioaddr) {
> + reg.ioaddr =
> + ioremap_nocache(reg.addr, reg.size);
> +
> + if (!reg.ioaddr)
> + return -ENOMEM;
> + }
> +
> + while (count) {
> + size_t filled;
> +
> + if (count >= 4 && !(off % 4)) {
> + u32 val;
> +
> + val = ioread32(reg.ioaddr + off);
> + if (copy_to_user(buf, &val, 4))
> + goto err;
> +
> + filled = 4;
> + } else if (count >= 2 && !(off % 2)) {
> + u16 val;
> +
> + val = ioread16(reg.ioaddr + off);
> + if (copy_to_user(buf, &val, 2))
> + goto err;
> +
> + filled = 2;
> + } else {
> + u8 val;
> +
> + val = ioread8(reg.ioaddr + off);
> + if (copy_to_user(buf, &val, 1))
> + goto err;
> +
> + filled = 1;
> + }
> +
> +
> + count -= filled;
> + done += filled;
> + off += filled;
> + buf += filled;
> + }
> +
> + return done;
> +err:
> + return -EFAULT;
> +}
> +
> static ssize_t vfio_platform_read(void *device_data, char __user *buf,
> size_t count, loff_t *ppos)
> {
> + struct vfio_platform_device *vdev = device_data;
> + unsigned int index = VFIO_PLATFORM_OFFSET_TO_INDEX(*ppos);
> + loff_t off = *ppos & VFIO_PLATFORM_OFFSET_MASK;
> +
> + if (index >= vdev->num_regions)
> + return -EINVAL;
> +
> + if (!(vdev->regions[index].flags & VFIO_REGION_INFO_FLAG_READ))
> + return -EINVAL;
> +
> + if (vdev->regions[index].type & VFIO_PLATFORM_REGION_TYPE_MMIO)
> + return vfio_platform_read_mmio(vdev->regions[index],
> + buf, count, off);
> + else if (vdev->regions[index].type & VFIO_PLATFORM_REGION_TYPE_PIO)
> + return -EINVAL; /* not implemented */
> +
> return -EINVAL;
> }
>
> +static ssize_t vfio_platform_write_mmio(struct vfio_platform_region reg,
> + const char __user *buf, size_t count,
> + loff_t off)
> +{
> + unsigned int done = 0;
> +
> + if (!reg.ioaddr) {
> + reg.ioaddr =
> + ioremap_nocache(reg.addr, reg.size);
> +
> + if (!reg.ioaddr)
> + return -ENOMEM;
> + }
> +
> + while (count) {
> + size_t filled;
> +
> + if (count >= 4 && !(off % 4)) {
> + u32 val;
> +
> + if (copy_from_user(&val, buf, 4))
> + goto err;
> + iowrite32(val, reg.ioaddr + off);
> +
> + filled = 4;
> + } else if (count >= 2 && !(off % 2)) {
> + u16 val;
> +
> + if (copy_from_user(&val, buf, 2))
> + goto err;
> + iowrite16(val, reg.ioaddr + off);
> +
> + filled = 2;
> + } else {
> + u8 val;
> +
> + if (copy_from_user(&val, buf, 1))
> + goto err;
> + iowrite8(val, reg.ioaddr + off);
> +
> + filled = 1;
> + }
> +
> + count -= filled;
> + done += filled;
> + off += filled;
> + buf += filled;
> + }
> +
> + return done;
> +err:
> + return -EFAULT;
> +}
> +
> static ssize_t vfio_platform_write(void *device_data, const char __user *buf,
> size_t count, loff_t *ppos)
> {
> + struct vfio_platform_device *vdev = device_data;
> + unsigned int index = VFIO_PLATFORM_OFFSET_TO_INDEX(*ppos);
> + loff_t off = *ppos & VFIO_PLATFORM_OFFSET_MASK;
> +
> + if (index >= vdev->num_regions)
> + return -EINVAL;
> +
> + if (!(vdev->regions[index].flags & VFIO_REGION_INFO_FLAG_WRITE))
> + return -EINVAL;
> +
> + if (vdev->regions[index].type & VFIO_PLATFORM_REGION_TYPE_MMIO)
> + return vfio_platform_write_mmio(vdev->regions[index],
> + buf, count, off);
> + else if (vdev->regions[index].type & VFIO_PLATFORM_REGION_TYPE_PIO)
> + return -EINVAL; /* not implemented */
> +
> return -EINVAL;
> }
>
> diff --git a/drivers/vfio/platform/vfio_platform_private.h b/drivers/vfio/platform/vfio_platform_private.h
> index b24729f..1f251b2 100644
> --- a/drivers/vfio/platform/vfio_platform_private.h
> +++ b/drivers/vfio/platform/vfio_platform_private.h
> @@ -31,6 +31,7 @@ struct vfio_platform_region {
> u32 type;
> #define VFIO_PLATFORM_REGION_TYPE_MMIO 1
> #define VFIO_PLATFORM_REGION_TYPE_PIO 2
> + void __iomem *ioaddr;
> };
>
> struct vfio_platform_device {
>
next prev parent reply other threads:[~2014-11-12 15:46 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-27 18:07 [PATCH v9 00/19] VFIO support for platform and AMBA devices on ARM Antonios Motakis
[not found] ` <1414433284-31719-1-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
2014-10-27 18:07 ` [PATCH v9 01/19] vfio/platform: initial skeleton of VFIO support for platform devices Antonios Motakis
[not found] ` <1414433284-31719-2-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
2014-11-12 10:05 ` Eric Auger
[not found] ` <546330DE.5010002-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-11-12 16:49 ` Alex Williamson
[not found] ` <1415810985.16601.361.camel-85EaTFmN5p//9pzu0YdTqQ@public.gmane.org>
2014-11-20 14:10 ` Antonios Motakis
2014-10-27 18:07 ` [PATCH v9 02/19] vfio: platform: probe to devices on the platform bus Antonios Motakis
2014-10-27 18:07 ` [PATCH v9 03/19] vfio: platform: add the VFIO PLATFORM module to Kconfig Antonios Motakis
2014-11-12 9:52 ` Hongbo Zhang
[not found] ` <CAOhR-w1nARQqtUX3nLBZYNg3PufDJMkOYeiJmpaz4fzPSZAmaQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-11-12 9:57 ` Antonios Motakis
2014-11-13 8:05 ` Hongbo Zhang
[not found] ` <CAOhR-w3pB9AfXODFfzv0VthnkPwW0d5DPoW26u1xGVCR1_W6RQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-11-20 14:10 ` Antonios Motakis
[not found] ` <1414433284-31719-4-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
2014-11-12 9:38 ` Hongbo Zhang
[not found] ` <CAOhR-w2N3SF=3DTgFr22JfAKDXxzz0PASznJaRjK3oBrRTVcsw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-11-12 10:05 ` Bharat.Bhushan-KZfg59tc24xl57MIdRCFDg
2014-11-12 10:38 ` Hongbo Zhang
[not found] ` <CAOhR-w305sv-_D3QNCtifkzODTv0XoPKBEs6C2MRT1fPVKjZ8A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-11-12 11:00 ` Bharat.Bhushan-KZfg59tc24xl57MIdRCFDg
2014-11-12 11:17 ` Hongbo Zhang
2014-11-12 10:00 ` Eric Auger
2014-10-27 18:07 ` [PATCH v9 04/19] vfio: amba: VFIO support for AMBA devices Antonios Motakis
[not found] ` <1414433284-31719-5-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
2014-10-31 18:40 ` Alex Williamson
[not found] ` <1414780819.27420.314.camel-85EaTFmN5p//9pzu0YdTqQ@public.gmane.org>
2014-11-05 9:50 ` Antonios Motakis
2014-10-27 18:07 ` [PATCH v9 05/19] vfio: amba: add the VFIO for AMBA devices module to Kconfig Antonios Motakis
2014-10-27 18:07 ` [PATCH v9 06/19] vfio/platform: return info for bound device Antonios Motakis
[not found] ` <1414433284-31719-7-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
2014-11-12 10:32 ` Eric Auger
[not found] ` <5463373C.2010202-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-11-12 16:36 ` Alex Williamson
[not found] ` <1415810168.16601.353.camel-85EaTFmN5p//9pzu0YdTqQ@public.gmane.org>
2014-11-20 14:10 ` Antonios Motakis
[not found] ` <CAG8rG2z_iCXEDGnfuZW_g+29NjhRXzUaDG3AUEVh1zvbf298BA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-11-20 14:26 ` Eric Auger
2014-10-27 18:07 ` [PATCH v9 07/19] vfio/platform: return info for device memory mapped IO regions Antonios Motakis
[not found] ` <1414433284-31719-8-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
2014-10-31 18:58 ` Alex Williamson
[not found] ` <1414781936.27420.317.camel-85EaTFmN5p//9pzu0YdTqQ@public.gmane.org>
2014-11-05 9:50 ` Antonios Motakis
2014-11-12 10:58 ` Eric Auger
[not found] ` <54633D5B.4040204-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-11-20 14:11 ` Antonios Motakis
[not found] ` <CAG8rG2wngS7+8yVQFydQzQkzzMKc8i9hcs2eH3+fKh+KZqmReQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-11-24 15:53 ` Antonios Motakis
2014-10-27 18:07 ` [PATCH v9 08/19] vfio/platform: read and write support for the device fd Antonios Motakis
[not found] ` <1414433284-31719-9-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
2014-11-12 15:46 ` Eric Auger [this message]
[not found] ` <546380DD.8000802-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-11-20 14:11 ` Antonios Motakis
2014-10-27 18:07 ` [PATCH v9 09/19] vfio/platform: support MMAP of MMIO regions Antonios Motakis
2014-10-27 18:07 ` [PATCH v9 10/19] vfio/platform: return IRQ info Antonios Motakis
[not found] ` <1414433284-31719-11-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
2014-10-31 19:11 ` Alex Williamson
[not found] ` <1414782674.27420.320.camel-85EaTFmN5p//9pzu0YdTqQ@public.gmane.org>
2014-11-05 10:04 ` Antonios Motakis
2014-10-27 18:07 ` [PATCH v9 11/19] vfio/platform: initial interrupts support code Antonios Motakis
2014-10-27 18:07 ` [PATCH v9 12/19] vfio/platform: trigger an interrupt via eventfd Antonios Motakis
[not found] ` <1414433284-31719-13-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
2014-10-31 19:36 ` Alex Williamson
[not found] ` <1414784174.27420.327.camel-85EaTFmN5p//9pzu0YdTqQ@public.gmane.org>
2014-11-05 10:08 ` Antonios Motakis
2014-11-12 14:22 ` Eric Auger
[not found] ` <54636D25.6060009-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2014-11-20 14:11 ` Antonios Motakis
2014-11-20 14:24 ` Eric Auger
2014-10-27 18:07 ` [PATCH v9 13/19] vfio/platform: support for level sensitive interrupts Antonios Motakis
[not found] ` <1414433284-31719-14-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
2014-10-31 19:36 ` Alex Williamson
[not found] ` <1414784196.27420.328.camel-85EaTFmN5p//9pzu0YdTqQ@public.gmane.org>
2014-11-05 10:10 ` Antonios Motakis
2014-11-12 15:03 ` Eric Auger
2014-11-12 15:03 ` Eric Auger
2014-10-27 18:07 ` [PATCH v9 14/19] vfio: move eventfd support code for VFIO_PCI to a separate file Antonios Motakis
[not found] ` <1414433284-31719-15-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
2014-10-27 19:16 ` Bjorn Helgaas
[not found] ` <CAErSpo55o00=YwtWChFaxC1tEAwv_A5nB90mDU9J6kpb9Tqf_Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2014-10-31 16:03 ` Antonios Motakis
2014-10-27 18:08 ` [PATCH v9 15/19] vfio: add local lock in virqfd instead of depending on VFIO PCI Antonios Motakis
[not found] ` <1414433284-31719-16-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
2014-10-31 19:43 ` Alex Williamson
[not found] ` <1414784583.27420.330.camel-85EaTFmN5p//9pzu0YdTqQ@public.gmane.org>
2014-11-05 10:04 ` Antonios Motakis
2014-10-27 18:08 ` [PATCH v9 16/19] vfio: pass an opaque pointer on virqfd initialization Antonios Motakis
2014-10-27 18:08 ` [PATCH v9 17/19] vfio: virqfd: add vfio_ prefix to virqfd_enable and virqfd_disable Antonios Motakis
[not found] ` <1414433284-31719-18-git-send-email-a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/sRE9J@public.gmane.org>
2014-10-27 20:12 ` Bjorn Helgaas
2014-10-31 16:06 ` Antonios Motakis
2014-10-27 18:08 ` [PATCH v9 18/19] vfio: initialize the virqfd workqueue in VFIO generic code Antonios Motakis
2014-10-27 18:08 ` [PATCH v9 19/19] 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=546380DD.8000802@linaro.org \
--to=eric.auger-qsej5fyqhm4dnm+yrofe0a@public.gmane.org \
--cc=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=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;
as well as URLs for NNTP newsgroup(s).