VFIO support for platform devices
Subsystems (5)
v13 cover VFIO support for platform devices
This patch series aims to implement VFIO support for platform devices that reside behind an IOMMU. Examples of such devices are devices behind an ARM SMMU, or behind a Samsung Exynos System MMU.
The API used is based on the existing VFIO API that is also used with PCI devices. Only devices that include a basic set of IRQs and memory regions are targeted; devices with complex relationships with other devices on a device tree are not taken into account at this stage.
This patch series may be applied on the following series/patches:
- [PATCH v3 0/6] vfio: type1: support for ARM SMMUS with VFIO_IOMMU_TYPE1
A copy can be cloned from the branch vfio-platform-v13 at:
git-9UaJU3cA/F/[email protected]:virtualopensystems/linux-kvm-arm.git
Changes since v12:
- Reorder chunks to be bisect-able
Changes since v11:
- Drop support for ARM AMBA devices
- vfio_platform_private.h is now self-contained
- Fix masked IRQ initialization
Changes since v10:
- Check if interrupt is already masked when setting a new trigger
- Fixed kasprintf with unchecked return value in VFIO AMBA driver
Changes since v9:
- Reworked the splitting of the patches that decouple virqfd from PCI
- Some styling issues and typos
- Removed superfluous includes
- AMBA devices are now named vfio-amba- suffixed by the AMBA device id
- Several other cleanups and fixes
Changes since v8:
- Separate irq handler for edge and level triggered interrupts
- Mutex based lock for VFIO fd open/release
- Fixed bug where the first region of a platform device wasn't exposed
- Read only regions can be MMAPed only read only
- Code cleanups
Changes since v7:
- Some initial placeholder functionality for PIO resources
- Cleaned up code for IRQ triggering, masking and unmasking
- Some functionality has been removed from this series and posted separately:
- VFIO_IOMMU_TYPE1 support for ARM SMMUs
- IOMMU NOEXEC patches
- driver_override functionality for AMBA devices
- Several fixes
Changes since v6:
- Integrated support for AMBA devices
- Numerous cleanups and fixes
Changes since v5:
- Full eventfd support for IRQ masking and unmasking.
- Changed IOMMU_EXEC to IOMMU_NOEXEC, along with related flags in VFIO.
- Other fixes based on reviewer comments.
Changes since v4:
- Use static offsets for each region in the VFIO device fd
- Include patch in the series for the ARM SMMU to expose IOMMU_EXEC availability via IOMMU_CAP_DMA_EXEC
- Rebased on VFIO multi domain support:
- IOMMU_EXEC is now available if at least one IOMMU in the container supports it
- Expose IOMMU_EXEC if available via the capability VFIO_IOMMU_PROT_EXEC
- Some bug fixes
Changes since v3:
- Use Kim Phillips' driver_probe_device()
Changes since v2:
- Fixed Read/Write and MMAP on device regions
- Removed dependency on Device Tree
- Interrupts support
- Interrupt masking/unmasking
- Automask level sensitive interrupts
- Introduced VFIO_DMA_MAP_FLAG_EXEC
- Code clean ups
Antonios Motakis (18):
vfio/platform: initial skeleton of VFIO support for platform devices
vfio: platform: probe to devices on the platform bus
vfio: platform: add the VFIO PLATFORM module to Kconfig vfio/platform: return info for bound device vfio/platform: return info for device memory mapped IO regions vfio/platform: read and write support for the device fd vfio/platform: support MMAP of MMIO regions vfio/platform: return IRQ info
vfio/platform: initial interrupts support code vfio/platform: trigger an interrupt via eventfd vfio/platform: support for level sensitive interrupts
vfio: add a vfio_ prefix to virqfd_enable and virqfd_disable and
export
vfio: virqfd: rename vfio_pci_virqfd_init and vfio_pci_virqfd_exit
vfio: add local lock for virqfd instead of depending on VFIO PCI
vfio: pass an opaque pointer on virqfd initialization
vfio: move eventfd support code for VFIO_PCI to a separate file
vfio: initialize the virqfd workqueue in VFIO generic code vfio/platform: implement IRQ masking/unmasking via an eventfd
drivers/vfio/Kconfig | 1 + drivers/vfio/Makefile | 5 +- drivers/vfio/pci/vfio_pci.c | 8 - drivers/vfio/pci/vfio_pci_intrs.c | 238 +----------- drivers/vfio/pci/vfio_pci_private.h | 3 - drivers/vfio/platform/Kconfig | 9 + drivers/vfio/platform/Makefile | 4 + drivers/vfio/platform/vfio_platform.c | 103 +++++ drivers/vfio/platform/vfio_platform_common.c | 521 ++++++++++++++++++++++++++ drivers/vfio/platform/vfio_platform_irq.c | 336 +++++++++++++++++ drivers/vfio/platform/vfio_platform_private.h | 85 +++++ drivers/vfio/vfio.c | 8 + drivers/vfio/virqfd.c | 213 +++++++++++ include/linux/vfio.h | 27 ++ include/uapi/linux/vfio.h | 1 + 15 files changed, 1326 insertions(+), 236 deletions(-) create mode 100644 drivers/vfio/platform/Kconfig create mode 100644 drivers/vfio/platform/Makefile create mode 100644 drivers/vfio/platform/vfio_platform.c create mode 100644 drivers/vfio/platform/vfio_platform_common.c create mode 100644 drivers/vfio/platform/vfio_platform_irq.c create mode 100644 drivers/vfio/platform/vfio_platform_private.h create mode 100644 drivers/vfio/virqfd.c
Signature · 1 line
2.2.2
PATCH v13 1/18 vfio/platform: initial skeleton of VFIO support for platform devices
From: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]>
This patch forms the common skeleton code for platform devices support with VFIO. This will include the core functionality of VFIO_PLATFORM, however binding to the device and discovering the device resources will be done with the help of a separate file where any Linux platform bus specific code will reside.
This will allow us to implement support for also discovering AMBA devices and their resources, but still reuse a large part of the VFIO_PLATFORM implementation.
--- drivers/vfio/platform/vfio_platform_common.c | 121 ++++++++++++++++++++++++++ drivers/vfio/platform/vfio_platform_private.h | 39 +++++++++ 2 files changed, 160 insertions(+) create mode 100644 drivers/vfio/platform/vfio_platform_common.c create mode 100644 drivers/vfio/platform/vfio_platform_private.h
drivers/vfio/platform/vfio_platform_common.c new file +121 -0
@@ -0,0 +1,121 @@ +/* +* Copyright (C) 2013 - Virtual Open Systems +* Author: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License, version 2, as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/device.h> +#include <linux/iommu.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/slab.h> +#include <linux/types.h> +#include <linux/vfio.h> + +#include "vfio_platform_private.h" + +static void vfio_platform_release (void *device_data) +{ +module_put (THIS_MODULE ); +} + +static int vfio_platform_open (void *device_data) +{ +if (!try_module_get (THIS_MODULE )) +return -ENODEV ; + +return 0 ; +} + +static long vfio_platform_ioctl (void *device_data, +unsigned int cmd,unsigned long arg) +{ +if (cmd ==VFIO_DEVICE_GET_INFO ) +return -EINVAL ; + +else if (cmd ==VFIO_DEVICE_GET_REGION_INFO ) +return -EINVAL ; + +else if (cmd ==VFIO_DEVICE_GET_IRQ_INFO ) +return -EINVAL ; + +else if (cmd ==VFIO_DEVICE_SET_IRQS ) +return -EINVAL ; + +else if (cmd ==VFIO_DEVICE_RESET ) +return -EINVAL ; + +return -ENOTTY ; +} + +static ssize_t vfio_platform_read (void *device_data,char __user *buf, +size_t count,loff_t *ppos) +{ +return -EINVAL ; +} + +static ssize_t vfio_platform_write (void *device_data,const char __user *buf, +size_t count,loff_t *ppos) +{ +return -EINVAL ; +} + +static int vfio_platform_mmap (void *device_data,struct vm_area_struct *vma) +{ +return -EINVAL ; +} + +static const struct vfio_device_ops vfio_platform_ops = { + .name ="vfio-platform" , + .open = vfio_platform_open, + .release = vfio_platform_release, + .ioctl = vfio_platform_ioctl, + .read = vfio_platform_read, + .write = vfio_platform_write, + .mmap = vfio_platform_mmap, +}; + +int vfio_platform_probe_common (struct vfio_platform_device *vdev, +struct device *dev) +{ +struct iommu_group *group; +int ret; + +if (!vdev) +return -EINVAL ; + + group =iommu_group_get (dev); +if (!group) { +pr_err ("VFIO: No IOMMU group for device %s\n" , vdev->name); +return -EINVAL ; + } + + ret =vfio_add_group_dev (dev, &vfio_platform_ops, vdev); +if (ret) { +iommu_group_put (group); +return ret; + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (vfio_platform_probe_common); + +struct vfio_platform_device *vfio_platform_remove_common (struct device *dev) +{ +struct vfio_platform_device *vdev; + + vdev =vfio_del_group_dev (dev); +if (vdev) +iommu_group_put (dev->iommu_group); + +return vdev; +} +EXPORT_SYMBOL_GPL (vfio_platform_remove_common);
drivers/vfio/platform/vfio_platform_private.h new file +39 -0
@@ -0,0 +1,39 @@ +/* +* Copyright (C) 2013 - Virtual Open Systems +* Author: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License, version 2, as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#ifndef VFIO_PLATFORM_PRIVATE_H +#define VFIO_PLATFORM_PRIVATE_H + +#include <linux/types.h> +#include <linux/interrupt.h> + +struct vfio_platform_device { +/* +* These fields should be filled by the bus specific binder +*/ +void *opaque; +const char *name; +uint32_t flags; +/* callbacks to discover device resources */ +struct resource * + (*get_resource)(struct vfio_platform_device *vdev,int i); +int (*get_irq)(struct vfio_platform_device *vdev,int i); +}; + +extern int vfio_platform_probe_common (struct vfio_platform_device *vdev, +struct device *dev); +extern struct vfio_platform_device *vfio_platform_remove_common + (struct device *dev); + +#endif /* VFIO_PLATFORM_PRIVATE_H */
Signature · 1 line
2.2.2
PATCH v13 2/18 vfio: platform: probe to devices on the platform bus
In reply to Baptiste ReynalFrom: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]>
Driver to bind to Linux platform devices, and callbacks to discover their resources to be used by the main VFIO PLATFORM code.
--- drivers/vfio/platform/vfio_platform.c | 103 ++++++++++++++++++++++++++++++++++ include/uapi/linux/vfio.h | 1 + 2 files changed, 104 insertions(+) create mode 100644 drivers/vfio/platform/vfio_platform.c
drivers/vfio/platform/vfio_platform.c new file +103 -0
@@ -0,0 +1,103 @@ +/* +* Copyright (C) 2013 - Virtual Open Systems +* Author: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]> +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License, version 2, as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/vfio.h> +#include <linux/platform_device.h> + +#include "vfio_platform_private.h" + +#define DRIVER_VERSION "0.10" +#define DRIVER_AUTHOR "Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]>" +#define DRIVER_DESC "VFIO for platform devices - User Level meta-driver" + +/* probing devices from the linux platform bus */ + +static struct resource *get_platform_resource (struct vfio_platform_device *vdev, +int num) +{ +struct platform_device *dev = (struct platform_device *) vdev->opaque; +int i; + +for (i =0 ; i < dev->num_resources; i++) { +struct resource *r = &dev->resource[i]; + +if (resource_type (r) & (IORESOURCE_MEM |IORESOURCE_IO )) { +if (!num) +return r; + + num--; + } + } +return NULL ; +} + +static int get_platform_irq (struct vfio_platform_device *vdev,int i) +{ +struct platform_device *pdev = (struct platform_device *) vdev->opaque; + +return platform_get_irq (pdev, i); +} + +static int vfio_platform_probe (struct platform_device *pdev) +{ +struct vfio_platform_device *vdev; +int ret; + + vdev =kzalloc (sizeof (*vdev),GFP_KERNEL ); +if (!vdev) +return -ENOMEM ; + + vdev->opaque = (void *) pdev; + vdev->name = pdev->name; + vdev->flags =VFIO_DEVICE_FLAGS_PLATFORM ; + vdev->get_resource = get_platform_resource; + vdev->get_irq = get_platform_irq; + + ret =vfio_platform_probe_common (vdev, &pdev->dev); +if (ret) +kfree (vdev); + +return ret; +} + +static int vfio_platform_remove (struct platform_device *pdev) +{ +struct vfio_platform_device *vdev; + + vdev =vfio_platform_remove_common (&pdev->dev); +if (vdev) { +kfree (vdev); +return 0 ; + } + +return -EINVAL ; +} + +static struct platform_driver vfio_platform_driver = { + .probe = vfio_platform_probe, + .remove = vfio_platform_remove, + .driver = { + .name ="vfio-platform" , + .owner =THIS_MODULE , + }, +}; + +module_platform_driver (vfio_platform_driver); + +MODULE_VERSION (DRIVER_VERSION ); +MODULE_LICENSE ("GPL v2" ); +MODULE_AUTHOR (DRIVER_AUTHOR ); +MODULE_DESCRIPTION (DRIVER_DESC );
include/uapi/linux/vfio.h +1 -0
@@ -159,6 +159,7 @@ struct vfio_device_info {__u32 flags;#define VFIO_DEVICE_FLAGS_RESET (1 << 0)/* Device supports reset */ #define VFIO_DEVICE_FLAGS_PCI (1 << 1)/* vfio-pci device */ +#define VFIO_DEVICE_FLAGS_PLATFORM (1 << 2)/* vfio-platform device */ __u32 num_regions;/* Max region index + 1 */ __u32 num_irqs;/* Max IRQ index + 1 */ };
Signature · 1 line
2.2.2
PATCH v13 3/18 vfio: platform: add the VFIO PLATFORM module to Kconfig
In reply to Baptiste ReynalFrom: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]>
Enable building the VFIO PLATFORM driver that allows to use Linux platform devices with VFIO.
--- drivers/vfio/Kconfig | 1 + drivers/vfio/Makefile | 1 + drivers/vfio/platform/Kconfig | 9 +++++++++ drivers/vfio/platform/Makefile | 4 ++++ 4 files changed, 15 insertions(+) create mode 100644 drivers/vfio/platform/Kconfig create mode 100644 drivers/vfio/platform/Makefile
drivers/vfio/Kconfig +1 -0
@@ -27,3 +27,4 @@ menuconfig VFIO If you don't know what to do here, say N. source "drivers/vfio/pci/Kconfig" +source "drivers/vfio/platform/Kconfig"
drivers/vfio/Makefile +1 -0
@@ -3,3 +3,4 @@ obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o obj-$(CONFIG_VFIO_SPAPR_EEH) += vfio_spapr_eeh.o obj-$(CONFIG_VFIO_PCI) += pci/ +obj-$(CONFIG_VFIO_PLATFORM) += platform/
drivers/vfio/platform/Kconfig new file +9 -0
@@ -0,0 +1,9 @@ +config VFIO_PLATFORM + tristate "VFIO support for platform devices" + depends on VFIO && EVENTFD && ARM + help + Support for platform devices with VFIO. This is required to make + use of platform devices present on the system using the VFIO + framework. + + If you don't know what to do here, say N.
drivers/vfio/platform/Makefile new file +4 -0
@@ -0,0 +1,4 @@ + +vfio-platform-y := vfio_platform.o vfio_platform_common.o + +obj-$(CONFIG_VFIO_PLATFORM) += vfio-platform.o
Signature · 1 line
2.2.2
PATCH v13 4/18 vfio/platform: return info for bound device
In reply to Baptiste ReynalFrom: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]>
A VFIO userspace driver will start by opening the VFIO device that corresponds to an IOMMU group, and will use the ioctl interface to get the basic device info, such as number of memory regions and interrupts, and their properties. This patch enables the VFIO_DEVICE_GET_INFO ioctl call.
--- drivers/vfio/platform/vfio_platform_common.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
drivers/vfio/platform/vfio_platform_common.c +21 -3
@@ -18,6 +18,7 @@#include <linux/mutex.h> #include <linux/slab.h> #include <linux/types.h> +#include <linux/uaccess.h> #include <linux/vfio.h> #include "vfio_platform_private.h"
@@ -38,10 +39,27 @@ static int vfio_platform_open(void *device_data)static long vfio_platform_ioctl (void *device_data,unsigned int cmd,unsigned long arg) { -if (cmd ==VFIO_DEVICE_GET_INFO ) -return -EINVAL ; +struct vfio_platform_device *vdev = device_data; +unsigned long minsz; + +if (cmd ==VFIO_DEVICE_GET_INFO ) { +struct vfio_device_info info; + + minsz = offsetofend(struct vfio_device_info, num_irqs); + +if (copy_from_user (&info, (void __user *)arg, minsz)) +return -EFAULT ; + +if (info.argsz < minsz) +return -EINVAL ; + + info.flags = vdev->flags; + info.num_regions =0 ; + info.num_irqs =0 ; + +return copy_to_user ((void __user *)arg, &info, minsz); -else if (cmd ==VFIO_DEVICE_GET_REGION_INFO ) + }else if (cmd ==VFIO_DEVICE_GET_REGION_INFO )return -EINVAL ;else if (cmd ==VFIO_DEVICE_GET_IRQ_INFO )
Signature · 1 line
2.2.2
PATCH v13 5/18 vfio/platform: return info for device memory mapped IO regions
In reply to Baptiste ReynalFrom: Antonios Motakis <[email protected]>
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.
--- drivers/vfio/platform/vfio_platform_common.c | 106 +++++++++++++++++++++++++- drivers/vfio/platform/vfio_platform_private.h | 22 ++++++ 2 files changed, 124 insertions(+), 4 deletions(-)
drivers/vfio/platform/vfio_platform_common.c +102 -4
@@ -23,17 +23,97 @@#include "vfio_platform_private.h" +static DEFINE_MUTEX (driver_lock); + +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 ; + +switch (resource_type (res)) { +case IORESOURCE_MEM : + vdev->regions[i].type =VFIO_PLATFORM_REGION_TYPE_MMIO ; +break ; +case IORESOURCE_IO : + vdev->regions[i].type =VFIO_PLATFORM_REGION_TYPE_PIO ; +break ; +default : + goto err; + } + } + + 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; + +mutex_lock (&driver_lock); + +if (!(--vdev->refcnt)) { +vfio_platform_regions_cleanup (vdev); + } + +mutex_unlock (&driver_lock); +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 ; +mutex_lock (&driver_lock); + +if (!vdev->refcnt) { + ret =vfio_platform_regions_init (vdev); +if (ret) + goto err_reg; + } + + vdev->refcnt++; + +mutex_unlock (&driver_lock);return 0 ; + +err_reg: +mutex_unlock (&driver_lock); +module_put (THIS_MODULE ); +return ret; } static long vfio_platform_ioctl(void *device_data,
@@ -54,15 +134,33 @@ 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 )
drivers/vfio/platform/vfio_platform_private.h +22 -0
@@ -18,7 +18,29 @@#include <linux/types.h> #include <linux/interrupt.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; +u32 type; +#define VFIO_PLATFORM_REGION_TYPE_MMIO 1 +#define VFIO_PLATFORM_REGION_TYPE_PIO 2 +}; +struct vfio_platform_device { +struct vfio_platform_region *regions; +u32 num_regions; +int refcnt; +/* * These fields should be filled by the bus specific binder */
Signature · 1 line
2.2.2
PATCH v13 6/18 vfio/platform: read and write support for the device fd
In reply to Baptiste ReynalFrom: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]>
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 allow to use read and write functions to the file descriptor pointing to the memory regions.
We implement this functionality only for MMIO regions of platform devices; PIO regions are not being handled at this point.
--- drivers/vfio/platform/vfio_platform_common.c | 150 ++++++++++++++++++++++++++ drivers/vfio/platform/vfio_platform_private.h | 1 + 2 files changed, 151 insertions(+)
drivers/vfio/platform/vfio_platform_common.c +150 -0
@@ -51,6 +51,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 ;
@@ -70,6 +74,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); }
@@ -172,15 +181,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 ; }
drivers/vfio/platform/vfio_platform_private.h +1 -0
@@ -34,6 +34,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 {
Signature · 1 line
2.2.2
PATCH v13 7/18 vfio/platform: support MMAP of MMIO regions
In reply to Baptiste ReynalFrom: Antonios Motakis <[email protected]>
Allow to memory map the MMIO regions of the device so userspace can directly access them. PIO regions are not being handled at this point.
--- drivers/vfio/platform/vfio_platform_common.c | 65 ++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+)
drivers/vfio/platform/vfio_platform_common.c +65 -0
@@ -55,6 +55,16 @@ static int vfio_platform_regions_init(struct vfio_platform_device *vdev)if (!(res->flags &IORESOURCE_READONLY )) vdev->regions[i].flags |=VFIO_REGION_INFO_FLAG_WRITE ; + +/* +* Only regions addressed with PAGE granularity may be +* MMAPed securely. +*/ +if (!(vdev->regions[i].addr & ~PAGE_MASK ) && + !(vdev->regions[i].size & ~PAGE_MASK )) + vdev->regions[i].flags |= +VFIO_REGION_INFO_FLAG_MMAP ; +break ;case IORESOURCE_IO : vdev->regions[i].type =VFIO_PLATFORM_REGION_TYPE_PIO ;
@@ -334,8 +344,63 @@ static ssize_t vfio_platform_write(void *device_data, const char __user *buf,return -EINVAL ; } +static int vfio_platform_mmap_mmio (struct vfio_platform_region region, +struct vm_area_struct *vma) +{ +u64 req_len, pgoff, req_start; + + req_len = vma->vm_end - vma->vm_start; + pgoff = vma->vm_pgoff & + ((1U << (VFIO_PLATFORM_OFFSET_SHIFT -PAGE_SHIFT )) -1 ); + req_start = pgoff <<PAGE_SHIFT ; + +if (region.size <PAGE_SIZE || req_start + req_len > region.size) +return -EINVAL ; + + vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot); + vma->vm_pgoff = (region.addr >>PAGE_SHIFT ) + pgoff; + +return remap_pfn_range (vma, vma->vm_start, vma->vm_pgoff, + req_len, vma->vm_page_prot); +} +static int vfio_platform_mmap (void *device_data,struct vm_area_struct *vma) { +struct vfio_platform_device *vdev = device_data; +unsigned int index; + + index = vma->vm_pgoff >> (VFIO_PLATFORM_OFFSET_SHIFT -PAGE_SHIFT ); + +if (vma->vm_end < vma->vm_start) +return -EINVAL ; +if (!(vma->vm_flags &VM_SHARED )) +return -EINVAL ; +if (index >= vdev->num_regions) +return -EINVAL ; +if (vma->vm_start & ~PAGE_MASK ) +return -EINVAL ; +if (vma->vm_end & ~PAGE_MASK ) +return -EINVAL ; + +if (!(vdev->regions[index].flags &VFIO_REGION_INFO_FLAG_MMAP )) +return -EINVAL ; + +if (!(vdev->regions[index].flags &VFIO_REGION_INFO_FLAG_READ ) + && (vma->vm_flags &VM_READ )) +return -EINVAL ; + +if (!(vdev->regions[index].flags &VFIO_REGION_INFO_FLAG_WRITE ) + && (vma->vm_flags &VM_WRITE )) +return -EINVAL ; + + vma->vm_private_data = vdev; + +if (vdev->regions[index].type &VFIO_PLATFORM_REGION_TYPE_MMIO ) +return vfio_platform_mmap_mmio (vdev->regions[index], vma); + +else if (vdev->regions[index].type &VFIO_PLATFORM_REGION_TYPE_PIO ) +return -EINVAL ;/* not implemented */ +return -EINVAL ; }
Signature · 1 line
2.2.2
PATCH v13 8/18 vfio/platform: return IRQ info
In reply to Baptiste ReynalFrom: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]>
Return information for the interrupts exposed by the device. This patch extends VFIO_DEVICE_GET_INFO with the number of IRQs and enables VFIO_DEVICE_GET_IRQ_INFO.
--- drivers/vfio/platform/Makefile | 2 +- drivers/vfio/platform/vfio_platform_common.c | 31 +++++++++++++--- drivers/vfio/platform/vfio_platform_irq.c | 51 +++++++++++++++++++++++++++ drivers/vfio/platform/vfio_platform_private.h | 10 ++++++ 4 files changed, 89 insertions(+), 5 deletions(-) create mode 100644 drivers/vfio/platform/vfio_platform_irq.c
drivers/vfio/platform/Makefile +1 -1
@@ -1,4 +1,4 @@ -vfio-platform-y := vfio_platform.o vfio_platform_common.o +vfio-platform-y := vfio_platform.o vfio_platform_common.o vfio_platform_irq.o obj-$(CONFIG_VFIO_PLATFORM) += vfio-platform.o
drivers/vfio/platform/vfio_platform_common.c +27 -4
@@ -101,6 +101,7 @@ static void vfio_platform_release(void *device_data)if (!(--vdev->refcnt)) {vfio_platform_regions_cleanup (vdev); +vfio_platform_irq_cleanup (vdev); }mutex_unlock (&driver_lock);
@@ -122,6 +123,10 @@ static int vfio_platform_open(void *device_data) ret =vfio_platform_regions_init (vdev);if (ret) goto err_reg; + + ret =vfio_platform_irq_init (vdev); +if (ret) + goto err_irq; } vdev->refcnt++;
@@ -129,6 +134,8 @@ static int vfio_platform_open(void *device_data)mutex_unlock (&driver_lock);return 0 ; +err_irq: +vfio_platform_regions_cleanup (vdev); err_reg:mutex_unlock (&driver_lock);module_put (THIS_MODULE );
@@ -154,7 +161,7 @@ static long vfio_platform_ioctl(void *device_data, info.flags = vdev->flags; info.num_regions = vdev->num_regions; - info.num_irqs =0 ; + info.num_irqs = vdev->num_irqs;return copy_to_user ((void __user *)arg, &info, minsz);
@@ -179,10 +186,26 @@ static long vfio_platform_ioctl(void *device_data,return copy_to_user ((void __user *)arg, &info, minsz); - }else if (cmd ==VFIO_DEVICE_GET_IRQ_INFO ) -return -EINVAL ; + }else if (cmd ==VFIO_DEVICE_GET_IRQ_INFO ) { +struct vfio_irq_info info; + + minsz = offsetofend(struct vfio_irq_info, count); + +if (copy_from_user (&info, (void __user *)arg, minsz)) +return -EFAULT ; + +if (info.argsz < minsz) +return -EINVAL ; + +if (info.index >= vdev->num_irqs) +return -EINVAL ; + + info.flags = vdev->irqs[info.index].flags; + info.count = vdev->irqs[info.index].count; + +return copy_to_user ((void __user *)arg, &info, minsz); -else if (cmd ==VFIO_DEVICE_SET_IRQS ) + }else if (cmd ==VFIO_DEVICE_SET_IRQS )return -EINVAL ;else if (cmd ==VFIO_DEVICE_RESET )
drivers/vfio/platform/vfio_platform_irq.c new file +51 -0
51 lines not on this page · raw message
drivers/vfio/platform/vfio_platform_private.h +10 -0
@@ -27,6 +27,11 @@#define VFIO_PLATFORM_INDEX_TO_OFFSET (index) \ ((u64)(index) << VFIO_PLATFORM_OFFSET_SHIFT) +struct vfio_platform_irq { +u32 flags; +u32 count; +}; +struct vfio_platform_region {u64 addr;resource_size_t size;
@@ -40,6 +45,8 @@ struct vfio_platform_region {struct vfio_platform_device {struct vfio_platform_region *regions;u32 num_regions; +struct vfio_platform_irq *irqs; +u32 num_irqs;int refcnt;/*
@@ -59,4 +66,7 @@ extern int vfio_platform_probe_common(struct vfio_platform_device *vdev,extern struct vfio_platform_device *vfio_platform_remove_common (struct device *dev); +extern int vfio_platform_irq_init (struct vfio_platform_device *vdev); +extern void vfio_platform_irq_cleanup (struct vfio_platform_device *vdev); +#endif /* VFIO_PLATFORM_PRIVATE_H */
Signature · 1 line
2.2.2
PATCH v13 9/18 vfio/platform: initial interrupts support code
In reply to Baptiste ReynalFrom: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]>
This patch is a skeleton for the VFIO_DEVICE_SET_IRQS IOCTL, around which most IRQ functionality is implemented in VFIO.
--- drivers/vfio/platform/vfio_platform_common.c | 52 +++++++++++++++++++++-- drivers/vfio/platform/vfio_platform_irq.c | 59 +++++++++++++++++++++++++++ drivers/vfio/platform/vfio_platform_private.h | 7 ++++ 3 files changed, 115 insertions(+), 3 deletions(-)
drivers/vfio/platform/vfio_platform_common.c +49 -3
@@ -205,10 +205,54 @@ static long vfio_platform_ioctl(void *device_data,return copy_to_user ((void __user *)arg, &info, minsz); - }else if (cmd ==VFIO_DEVICE_SET_IRQS ) -return -EINVAL ; + }else if (cmd ==VFIO_DEVICE_SET_IRQS ) { +struct vfio_irq_set hdr; +u8 *data =NULL ; +int ret =0 ; + + minsz = offsetofend(struct vfio_irq_set, count); + +if (copy_from_user (&hdr, (void __user *)arg, minsz)) +return -EFAULT ; + +if (hdr.argsz < minsz) +return -EINVAL ; + +if (hdr.index >= vdev->num_irqs) +return -EINVAL ; + +if (hdr.flags & ~(VFIO_IRQ_SET_DATA_TYPE_MASK | +VFIO_IRQ_SET_ACTION_TYPE_MASK )) +return -EINVAL ; -else if (cmd ==VFIO_DEVICE_RESET ) +if (!(hdr.flags &VFIO_IRQ_SET_DATA_NONE )) { +size_t size; + +if (hdr.flags &VFIO_IRQ_SET_DATA_BOOL ) + size =sizeof (uint8_t ); +else if (hdr.flags &VFIO_IRQ_SET_DATA_EVENTFD ) + size =sizeof (int32_t ); +else +return -EINVAL ; + +if (hdr.argsz - minsz < size) +return -EINVAL ; + + data =memdup_user ((void __user *)(arg + minsz), size); +if (IS_ERR (data)) +return PTR_ERR (data); + } + +mutex_lock (&vdev->igate); + + ret =vfio_platform_set_irqs_ioctl (vdev, hdr.flags, hdr.index, + hdr.start, hdr.count, data); +mutex_unlock (&vdev->igate); +kfree (data); + +return ret; + + }else if (cmd ==VFIO_DEVICE_RESET )return -EINVAL ;return -ENOTTY ;
@@ -458,6 +502,8 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev,return ret; } +mutex_init (&vdev->igate); +return 0 ; }EXPORT_SYMBOL_GPL (vfio_platform_probe_common);
drivers/vfio/platform/vfio_platform_irq.c +59 -0
78 lines not on this page · raw message
drivers/vfio/platform/vfio_platform_private.h +7 -0
@@ -30,6 +30,7 @@struct vfio_platform_irq {u32 flags;u32 count; +int hwirq; };struct vfio_platform_region {
@@ -48,6 +49,7 @@ struct vfio_platform_device {struct vfio_platform_irq *irqs;u32 num_irqs;int refcnt; +struct mutex igate;/* * These fields should be filled by the bus specific binder
@@ -69,4 +71,9 @@ extern struct vfio_platform_device *vfio_platform_remove_commonextern int vfio_platform_irq_init (struct vfio_platform_device *vdev);extern void vfio_platform_irq_cleanup (struct vfio_platform_device *vdev); +extern int vfio_platform_set_irqs_ioctl (struct vfio_platform_device *vdev, +uint32_t flags,unsigned index, +unsigned start,unsigned count, +void *data); +#endif /* VFIO_PLATFORM_PRIVATE_H */
Signature · 1 line
2.2.2
PATCH v13 10/18 vfio/platform: trigger an interrupt via eventfd
In reply to Baptiste ReynalFrom: Antonios Motakis <[email protected]>
This patch allows to set an eventfd for a platform device's interrupt, and also to trigger the interrupt eventfd from userspace for testing. Level sensitive interrupts are marked as maskable and are handled in a later patch. Edge triggered interrupts are not advertised as maskable and are implemented here using a simple and efficient IRQ handler.
--- drivers/vfio/platform/vfio_platform_irq.c | 94 ++++++++++++++++++++++++++- drivers/vfio/platform/vfio_platform_private.h | 2 + 2 files changed, 94 insertions(+), 2 deletions(-)
drivers/vfio/platform/vfio_platform_irq.c +92 -2
@@ -39,12 +39,92 @@ static int vfio_platform_set_irq_unmask(struct vfio_platform_device *vdev,return -EINVAL ; } +static irqreturn_t vfio_irq_handler (int irq,void *dev_id) +{ +struct vfio_platform_irq *irq_ctx = dev_id; + +eventfd_signal (irq_ctx->trigger,1 ); + +return IRQ_HANDLED ; +} + +static int vfio_set_trigger (struct vfio_platform_device *vdev,int index, +int fd,irq_handler_t handler) +{ +struct vfio_platform_irq *irq = &vdev->irqs[index]; +struct eventfd_ctx *trigger; +int ret; + +if (irq->trigger) { +free_irq (irq->hwirq, irq); +kfree (irq->name); +eventfd_ctx_put (irq->trigger); + irq->trigger =NULL ; + } + +if (fd <0 )/* Disable only */ +return 0 ; + + irq->name =kasprintf (GFP_KERNEL ,"vfio-irq[%d](%s)" , + irq->hwirq, vdev->name); +if (!irq->name) +return -ENOMEM ; + + trigger =eventfd_ctx_fdget (fd); +if (IS_ERR (trigger)) { +kfree (irq->name); +return PTR_ERR (trigger); + } + + irq->trigger = trigger; + + ret =request_irq (irq->hwirq, handler,0 , irq->name, irq); +if (ret) { +kfree (irq->name); +eventfd_ctx_put (trigger); + irq->trigger =NULL ; +return ret; + } + +return 0 ; +} +static int vfio_platform_set_irq_trigger (struct vfio_platform_device *vdev,unsigned index,unsigned start,unsigned count,uint32_t flags,void *data) { -return -EINVAL ; +struct vfio_platform_irq *irq = &vdev->irqs[index]; +irq_handler_t handler; + +if (vdev->irqs[index].flags &VFIO_IRQ_INFO_AUTOMASKED ) +return -EINVAL ;/* not implemented */ +else + handler = vfio_irq_handler; + +if (!count && (flags &VFIO_IRQ_SET_DATA_NONE )) +return vfio_set_trigger (vdev, index,-1 , handler); + +if (start !=0 || count !=1 ) +return -EINVAL ; + +if (flags &VFIO_IRQ_SET_DATA_EVENTFD ) { +int32_t fd = *(int32_t *)data; + +return vfio_set_trigger (vdev, index, fd, handler); + } + +if (flags &VFIO_IRQ_SET_DATA_NONE ) { +handler (irq->hwirq, irq); + + }else if (flags &VFIO_IRQ_SET_DATA_BOOL ) { +uint8_t trigger = *(uint8_t *)data; + +if (trigger) +handler (irq->hwirq, irq); + } + +return 0 ; } int vfio_platform_set_irqs_ioctl(struct vfio_platform_device *vdev,
@@ -90,7 +170,12 @@ int vfio_platform_irq_init(struct vfio_platform_device *vdev)if (hwirq <0 ) goto err; - vdev->irqs[i].flags =0 ; + vdev->irqs[i].flags =VFIO_IRQ_INFO_EVENTFD ; + +if (irq_get_trigger_type (hwirq) &IRQ_TYPE_LEVEL_MASK ) + vdev->irqs[i].flags |=VFIO_IRQ_INFO_MASKABLE + |VFIO_IRQ_INFO_AUTOMASKED ; + vdev->irqs[i].count =1 ; vdev->irqs[i].hwirq = hwirq; }
@@ -105,6 +190,11 @@ err:void vfio_platform_irq_cleanup (struct vfio_platform_device *vdev) { +int i; + +for (i =0 ; i < vdev->num_irqs; i++) +vfio_set_trigger (vdev, i,-1 ,NULL ); + vdev->num_irqs =0 ;kfree (vdev->irqs); }
drivers/vfio/platform/vfio_platform_private.h +2 -0
@@ -31,6 +31,8 @@ struct vfio_platform_irq {u32 flags;u32 count;int hwirq; +char *name; +struct eventfd_ctx *trigger; };struct vfio_platform_region {
Signature · 1 line
2.2.2
PATCH v13 11/18 vfio/platform: support for level sensitive interrupts
In reply to Baptiste ReynalFrom: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]>
Level sensitive interrupts are exposed as maskable and automasked interrupts and are masked and disabled automatically when they fire.
[Baptiste Reynal: Move masked interrupt initialization from "vfio/platform:
trigger an interrupt via eventfd"]
--- drivers/vfio/platform/vfio_platform_irq.c | 103 +++++++++++++++++++++++++- drivers/vfio/platform/vfio_platform_private.h | 2 + 2 files changed, 102 insertions(+), 3 deletions(-)
drivers/vfio/platform/vfio_platform_irq.c +100 -3
@@ -23,12 +23,59 @@#include "vfio_platform_private.h" +static void vfio_platform_mask (struct vfio_platform_irq *irq_ctx) +{ +unsigned long flags; + +spin_lock_irqsave (&irq_ctx->lock, flags); + +if (!irq_ctx->masked) { +disable_irq_nosync (irq_ctx->hwirq); + irq_ctx->masked = true; + } + +spin_unlock_irqrestore (&irq_ctx->lock, flags); +} +static int vfio_platform_set_irq_mask (struct vfio_platform_device *vdev,unsigned index,unsigned start,unsigned count,uint32_t flags,void *data) { -return -EINVAL ; +if (start !=0 || count !=1 ) +return -EINVAL ; + +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_NONE ) { +vfio_platform_mask (&vdev->irqs[index]); + + }else if (flags &VFIO_IRQ_SET_DATA_BOOL ) { +uint8_t mask = *(uint8_t *)data; + +if (mask) +vfio_platform_mask (&vdev->irqs[index]); + } + +return 0 ; +} + +static void vfio_platform_unmask (struct vfio_platform_irq *irq_ctx) +{ +unsigned long flags; + +spin_lock_irqsave (&irq_ctx->lock, flags); + +if (irq_ctx->masked) { +enable_irq (irq_ctx->hwirq); + irq_ctx->masked = false; + } + +spin_unlock_irqrestore (&irq_ctx->lock, flags); } static int vfio_platform_set_irq_unmask(struct vfio_platform_device *vdev,
@@ -36,7 +83,50 @@ static int vfio_platform_set_irq_unmask(struct vfio_platform_device *vdev, unsigned count, uint32_t flags, void *data) { - return -EINVAL; + if (start != 0 || count != 1) + return -EINVAL; + +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_NONE ) { +vfio_platform_unmask (&vdev->irqs[index]); + + }else if (flags &VFIO_IRQ_SET_DATA_BOOL ) { +uint8_t unmask = *(uint8_t *)data; + +if (unmask) +vfio_platform_unmask (&vdev->irqs[index]); + } + +return 0 ; +} + +static irqreturn_t vfio_automasked_irq_handler (int irq,void *dev_id) +{ +struct vfio_platform_irq *irq_ctx = dev_id; +unsigned long flags; +int ret =IRQ_NONE ; + +spin_lock_irqsave (&irq_ctx->lock, flags); + +if (!irq_ctx->masked) { + ret =IRQ_HANDLED ; + +/* automask maskable interrupts */ +disable_irq_nosync (irq_ctx->hwirq); + irq_ctx->masked = true; + } + +spin_unlock_irqrestore (&irq_ctx->lock, flags); + +if (ret ==IRQ_HANDLED ) +eventfd_signal (irq_ctx->trigger,1 ); + +return ret; }static irqreturn_t vfio_irq_handler (int irq,void *dev_id)
@@ -78,6 +168,7 @@ static int vfio_set_trigger(struct vfio_platform_device *vdev, int index, irq->trigger = trigger; +irq_set_status_flags (irq->hwirq,IRQ_NOAUTOEN ); ret =request_irq (irq->hwirq, handler,0 , irq->name, irq);if (ret) {kfree (irq->name);
@@ -86,6 +177,9 @@ static int vfio_set_trigger(struct vfio_platform_device *vdev, int index,return ret; } +if (!irq->masked) +enable_irq (irq->hwirq); +return 0 ; }
@@ -98,7 +192,7 @@ static int vfio_platform_set_irq_trigger(struct vfio_platform_device *vdev,irq_handler_t handler;if (vdev->irqs[index].flags &VFIO_IRQ_INFO_AUTOMASKED ) -return -EINVAL ;/* not implemented */ + handler = vfio_automasked_irq_handler;else handler = vfio_irq_handler;
@@ -170,6 +264,8 @@ int vfio_platform_irq_init(struct vfio_platform_device *vdev)if (hwirq <0 ) goto err; +spin_lock_init (&vdev->irqs[i].lock); + vdev->irqs[i].flags =VFIO_IRQ_INFO_EVENTFD ;if (irq_get_trigger_type (hwirq) &IRQ_TYPE_LEVEL_MASK )
@@ -178,6 +274,7 @@ int vfio_platform_irq_init(struct vfio_platform_device *vdev) vdev->irqs[i].count =1 ; vdev->irqs[i].hwirq = hwirq; + vdev->irqs[i].masked = false; } vdev->num_irqs = cnt;
drivers/vfio/platform/vfio_platform_private.h +2 -0
@@ -33,6 +33,8 @@ struct vfio_platform_irq {int hwirq;char *name;struct eventfd_ctx *trigger; +bool masked; +spinlock_t lock; };struct vfio_platform_region {
Signature · 1 line
2.2.2
PATCH v13 12/18 vfio: add a vfio_ prefix to virqfd_enable and virqfd_disable and export
In reply to Baptiste ReynalFrom: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]>
We want to reuse virqfd functionality in multiple VFIO drivers; before moving these functions to core VFIO, add the vfio_ prefix to the virqfd_enable and virqfd_disable functions, and export them so they can be used from other modules.
--- drivers/vfio/pci/vfio_pci_intrs.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
drivers/vfio/pci/vfio_pci_intrs.c +16 -14
@@ -126,10 +126,10 @@ static void virqfd_inject(struct work_struct *work) virqfd->thread (virqfd->vdev, virqfd->data); } -static int virqfd_enable (struct vfio_pci_device *vdev, -int (*handler)(struct vfio_pci_device *,void *), -void (*thread)(struct vfio_pci_device *,void *), -void *data,struct virqfd **pvirqfd,int fd) +int vfio_virqfd_enable (struct vfio_pci_device *vdev, +int (*handler)(struct vfio_pci_device *,void *), +void (*thread)(struct vfio_pci_device *,void *), +void *data,struct virqfd **pvirqfd,int fd) {struct fd irqfd;struct eventfd_ctx *ctx;
@@ -215,9 +215,9 @@ err_fd:return ret; } +EXPORT_SYMBOL_GPL (vfio_virqfd_enable); -static void virqfd_disable (struct vfio_pci_device *vdev, -struct virqfd **pvirqfd) +void vfio_virqfd_disable (struct vfio_pci_device *vdev,struct virqfd **pvirqfd) {unsigned long flags;
@@ -237,6 +237,7 @@ static void virqfd_disable(struct vfio_pci_device *vdev,*/ flush_workqueue (vfio_irqfd_cleanup_wq); } +EXPORT_SYMBOL_GPL (vfio_virqfd_disable);/* * INTx
@@ -440,8 +441,8 @@ static int vfio_intx_set_signal(struct vfio_pci_device *vdev, int fd)static void vfio_intx_disable (struct vfio_pci_device *vdev) {vfio_intx_set_signal (vdev,-1 ); -virqfd_disable (vdev, &vdev->ctx[0 ].unmask); -virqfd_disable (vdev, &vdev->ctx[0 ].mask); +vfio_virqfd_disable (vdev, &vdev->ctx[0 ].unmask); +vfio_virqfd_disable (vdev, &vdev->ctx[0 ].mask); vdev->irq_type =VFIO_PCI_NUM_IRQS ; vdev->num_ctx =0 ;kfree (vdev->ctx);
@@ -605,8 +606,8 @@ static void vfio_msi_disable(struct vfio_pci_device *vdev, bool msix)vfio_msi_set_block (vdev,0 , vdev->num_ctx,NULL , msix);for (i =0 ; i < vdev->num_ctx; i++) { -virqfd_disable (vdev, &vdev->ctx[i].unmask); -virqfd_disable (vdev, &vdev->ctx[i].mask); +vfio_virqfd_disable (vdev, &vdev->ctx[i].unmask); +vfio_virqfd_disable (vdev, &vdev->ctx[i].mask); }if (msix) {
@@ -639,11 +640,12 @@ static int vfio_pci_set_intx_unmask(struct vfio_pci_device *vdev, }else if (flags &VFIO_IRQ_SET_DATA_EVENTFD ) {int32_t fd = *(int32_t *)data;if (fd >=0 ) -return virqfd_enable (vdev, vfio_pci_intx_unmask_handler, - vfio_send_intx_eventfd,NULL , - &vdev->ctx[0 ].unmask, fd); +return vfio_virqfd_enable (vdev, + vfio_pci_intx_unmask_handler, + vfio_send_intx_eventfd,NULL , + &vdev->ctx[0 ].unmask, fd); -virqfd_disable (vdev, &vdev->ctx[0 ].unmask); +vfio_virqfd_disable (vdev, &vdev->ctx[0 ].unmask); }return 0 ;
Signature · 1 line
2.2.2
PATCH v13 13/18 vfio: virqfd: rename vfio_pci_virqfd_init and vfio_pci_virqfd_exit
In reply to Baptiste ReynalFrom: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]>
The functions vfio_pci_virqfd_init and vfio_pci_virqfd_exit are not really PCI specific, since we plan to reuse the virqfd code with more VFIO drivers in addition to VFIO_PCI.
[Baptiste Reynal: Move rename vfio_pci_virqfd_init and vfio_pci_virqfd_exit from "vfio: add a vfio_ prefix to virqfd_enable and virqfd_disable and export"]
--- drivers/vfio/pci/vfio_pci.c | 6 +++--- drivers/vfio/pci/vfio_pci_intrs.c | 4 ++-- drivers/vfio/pci/vfio_pci_private.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/vfio/pci/vfio_pci.c +3 -3
@@ -1012,7 +1012,7 @@ put_devs: static void __exit vfio_pci_cleanup(void) {pci_unregister_driver (&vfio_pci_driver); -vfio_pci_virqfd_exit (); +vfio_virqfd_exit ();vfio_pci_uninit_perm_bits (); }
@@ -1026,7 +1026,7 @@ static int __init vfio_pci_init(void)return ret;/* Start the virqfd cleanup handler */ - ret =vfio_pci_virqfd_init (); + ret =vfio_virqfd_init ();if (ret) goto out_virqfd;
@@ -1038,7 +1038,7 @@ static int __init vfio_pci_init(void)return 0 ; out_driver: -vfio_pci_virqfd_exit (); +vfio_virqfd_exit (); out_virqfd:vfio_pci_uninit_perm_bits ();return ret;
drivers/vfio/pci/vfio_pci_intrs.c +2 -2
@@ -45,7 +45,7 @@ struct virqfd {static struct workqueue_struct *vfio_irqfd_cleanup_wq; -int __init vfio_pci_virqfd_init (void ) +int __init vfio_virqfd_init (void ) { vfio_irqfd_cleanup_wq =create_singlethread_workqueue ("vfio-irqfd-cleanup" );
@@ -55,7 +55,7 @@ int __init vfio_pci_virqfd_init(void)return 0 ; } -void vfio_pci_virqfd_exit (void ) +void vfio_virqfd_exit (void ) {destroy_workqueue (vfio_irqfd_cleanup_wq); }
drivers/vfio/pci/vfio_pci_private.h +2 -2
@@ -86,8 +86,8 @@ extern ssize_t vfio_pci_vga_rw(struct vfio_pci_device *vdev, char __user *buf,extern int vfio_pci_init_perm_bits (void );extern void vfio_pci_uninit_perm_bits (void ); -extern int vfio_pci_virqfd_init (void ); -extern void vfio_pci_virqfd_exit (void ); +extern int vfio_virqfd_init (void ); +extern void vfio_virqfd_exit (void );extern int vfio_config_init (struct vfio_pci_device *vdev);extern void vfio_config_free (struct vfio_pci_device *vdev);
Signature · 1 line
2.2.2
PATCH v13 14/18 vfio: add local lock for virqfd instead of depending on VFIO PCI
In reply to Baptiste ReynalFrom: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]>
The Virqfd code needs to keep accesses to any struct *virqfd safe, but this comes into play only when creating or destroying eventfds, so sharing the same spinlock with the VFIO bus driver is not necessary.
--- drivers/vfio/pci/vfio_pci_intrs.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)
drivers/vfio/pci/vfio_pci_intrs.c +16 -15
@@ -44,6 +44,7 @@ struct virqfd { };static struct workqueue_struct *vfio_irqfd_cleanup_wq; +DEFINE_SPINLOCK (virqfd_lock);int __init vfio_virqfd_init (void ) {
@@ -80,21 +81,21 @@ static int virqfd_wakeup(wait_queue_t *wait, unsigned mode, int sync, void *key)if (flags &POLLHUP ) {unsigned long flags; -spin_lock_irqsave (&virqfd->vdev->irqlock, flags); +spin_lock_irqsave (&virqfd_lock, flags);/* * The eventfd is closing, if the virqfd has not yet been * queued for release, as determined by testing whether the -* vdev pointer to it is still valid, queue it now. As +* virqfd pointer to it is still valid, queue it now. As * with kvm irqfds, we know we won't race against the virqfd -* going away because we hold wqh->lock to get here. +* going away because we hold the lock to get here. */ if (*(virqfd->pvirqfd) == virqfd) { *(virqfd->pvirqfd) =NULL ;virqfd_deactivate (virqfd); } -spin_unlock_irqrestore (&virqfd->vdev->irqlock, flags); +spin_unlock_irqrestore (&virqfd_lock, flags); }return 0 ;
@@ -170,16 +171,16 @@ int vfio_virqfd_enable(struct vfio_pci_device *vdev,* we update the pointer to the virqfd under lock to avoid * pushing multiple jobs to release the same virqfd. */ -spin_lock_irq (&vdev->irqlock); +spin_lock_irq (&virqfd_lock);if (*pvirqfd) { -spin_unlock_irq (&vdev->irqlock); +spin_unlock_irq (&virqfd_lock); ret = -EBUSY ; goto err_busy; } *pvirqfd = virqfd; -spin_unlock_irq (&vdev->irqlock); +spin_unlock_irq (&virqfd_lock);/* * Install our own custom wake-up handling so we are notified via
@@ -217,18 +218,18 @@ err_fd: }EXPORT_SYMBOL_GPL (vfio_virqfd_enable); -void vfio_virqfd_disable (struct vfio_pci_device *vdev,struct virqfd **pvirqfd) +void vfio_virqfd_disable (struct virqfd **pvirqfd) {unsigned long flags; -spin_lock_irqsave (&vdev->irqlock, flags); +spin_lock_irqsave (&virqfd_lock, flags);if (*pvirqfd) {virqfd_deactivate (*pvirqfd); *pvirqfd =NULL ; } -spin_unlock_irqrestore (&vdev->irqlock, flags); +spin_unlock_irqrestore (&virqfd_lock, flags);/* * Block until we know all outstanding shutdown jobs have completed.
@@ -441,8 +442,8 @@ static int vfio_intx_set_signal(struct vfio_pci_device *vdev, int fd)static void vfio_intx_disable (struct vfio_pci_device *vdev) {vfio_intx_set_signal (vdev,-1 ); -vfio_virqfd_disable (vdev, &vdev->ctx[0 ].unmask); -vfio_virqfd_disable (vdev, &vdev->ctx[0 ].mask); +vfio_virqfd_disable (&vdev->ctx[0 ].unmask); +vfio_virqfd_disable (&vdev->ctx[0 ].mask); vdev->irq_type =VFIO_PCI_NUM_IRQS ; vdev->num_ctx =0 ;kfree (vdev->ctx);
@@ -606,8 +607,8 @@ static void vfio_msi_disable(struct vfio_pci_device *vdev, bool msix)vfio_msi_set_block (vdev,0 , vdev->num_ctx,NULL , msix);for (i =0 ; i < vdev->num_ctx; i++) { -vfio_virqfd_disable (vdev, &vdev->ctx[i].unmask); -vfio_virqfd_disable (vdev, &vdev->ctx[i].mask); +vfio_virqfd_disable (&vdev->ctx[i].unmask); +vfio_virqfd_disable (&vdev->ctx[i].mask); }if (msix) {
@@ -645,7 +646,7 @@ static int vfio_pci_set_intx_unmask(struct vfio_pci_device *vdev, vfio_send_intx_eventfd,NULL , &vdev->ctx[0].unmask, fd); -vfio_virqfd_disable (vdev, &vdev->ctx[0 ].unmask); +vfio_virqfd_disable (&vdev->ctx[0 ].unmask); }return 0 ;
Signature · 1 line
2.2.2
PATCH v13 15/18 vfio: pass an opaque pointer on virqfd initialization
In reply to Baptiste ReynalFrom: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]>
VFIO_PCI passes the VFIO device structure *vdev via eventfd to the handler that implements masking/unmasking of IRQs via an eventfd. We can replace it in the virqfd infrastructure with an opaque type so we can make use of the mechanism from other VFIO bus drivers.
--- drivers/vfio/pci/vfio_pci_intrs.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
drivers/vfio/pci/vfio_pci_intrs.c +16 -14
@@ -31,10 +31,10 @@* IRQfd - generic */ struct virqfd { -struct vfio_pci_device *vdev; +void *opaque;struct eventfd_ctx *eventfd; -int (*handler)(struct vfio_pci_device *,void *); -void (*thread)(struct vfio_pci_device *,void *); +int (*handler)(void *,void *); +void (*thread)(void *,void *);void *data;struct work_struct inject;wait_queue_t wait;
@@ -74,7 +74,7 @@ static int virqfd_wakeup(wait_queue_t *wait, unsigned mode, int sync, void *key)if (flags &POLLIN ) {/* An event has been signaled, call function */ if ((!virqfd->handler || - virqfd->handler (virqfd->vdev, virqfd->data)) && + virqfd->handler (virqfd->opaque, virqfd->data)) && virqfd->thread)schedule_work (&virqfd->inject); }
@@ -124,12 +124,12 @@ static void virqfd_inject(struct work_struct *work) { struct virqfd *virqfd = container_of(work, struct virqfd, inject);if (virqfd->thread) - virqfd->thread (virqfd->vdev, virqfd->data); + virqfd->thread (virqfd->opaque, virqfd->data); } -int vfio_virqfd_enable (struct vfio_pci_device *vdev, -int (*handler)(struct vfio_pci_device *,void *), -void (*thread)(struct vfio_pci_device *,void *), +int vfio_virqfd_enable (void *opaque, +int (*handler)(void *,void *), +void (*thread)(void *,void *),void *data,struct virqfd **pvirqfd,int fd) {struct fd irqfd;
@@ -143,7 +143,7 @@ int vfio_virqfd_enable(struct vfio_pci_device *vdev,return -ENOMEM ; virqfd->pvirqfd = pvirqfd; - virqfd->vdev = vdev; + virqfd->opaque = opaque; virqfd->handler = handler; virqfd->thread = thread; virqfd->data = data;
@@ -196,7 +196,7 @@ int vfio_virqfd_enable(struct vfio_pci_device *vdev,* before we registered and trigger it as if we didn't miss it. */ if (events &POLLIN ) { -if ((!handler ||handler (vdev, data)) && thread) +if ((!handler ||handler (opaque, data)) && thread)schedule_work (&virqfd->inject); }
@@ -243,8 +243,10 @@ EXPORT_SYMBOL_GPL(vfio_virqfd_disable);/* * INTx */ -static void vfio_send_intx_eventfd (struct vfio_pci_device *vdev,void *unused) +static void vfio_send_intx_eventfd (void *opaque,void *unused) { +struct vfio_pci_device *vdev = opaque; +if (likely (is_intx (vdev) && !vdev->virq_disabled))eventfd_signal (vdev->ctx[0 ].trigger,1 ); }
@@ -287,9 +289,9 @@ void vfio_pci_intx_mask(struct vfio_pci_device *vdev)* a signal is necessary, which can then be handled via a work queue * or directly depending on the caller. */ -static int vfio_pci_intx_unmask_handler (struct vfio_pci_device *vdev, -void *unused) +static int vfio_pci_intx_unmask_handler (void *opaque,void *unused) { +struct vfio_pci_device *vdev = opaque;struct pci_dev *pdev = vdev->pdev;unsigned long flags;int ret =0 ;
@@ -641,7 +643,7 @@ static int vfio_pci_set_intx_unmask(struct vfio_pci_device *vdev, }else if (flags &VFIO_IRQ_SET_DATA_EVENTFD ) {int32_t fd = *(int32_t *)data;if (fd >=0 ) -return vfio_virqfd_enable (vdev, +return vfio_virqfd_enable ((void *) vdev, vfio_pci_intx_unmask_handler, vfio_send_intx_eventfd,NULL , &vdev->ctx[0 ].unmask, fd);
Signature · 1 line
2.2.2
PATCH v13 16/18 vfio: move eventfd support code for VFIO_PCI to a separate file
In reply to Baptiste ReynalFrom: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]>
The virqfd functionality that is used by VFIO_PCI to implement interrupt masking and unmasking via an eventfd, is generic enough and can be reused by another driver. Move it to a separate file in order to allow the code to be shared.
--- drivers/vfio/pci/Makefile | 3 +- drivers/vfio/pci/vfio_pci_intrs.c | 215 ------------------------------------ drivers/vfio/pci/vfio_pci_private.h | 3 - drivers/vfio/virqfd.c | 213 +++++++++++++++++++++++++++++++++++ include/linux/vfio.h | 27 +++++ 5 files changed, 242 insertions(+), 219 deletions(-) create mode 100644 drivers/vfio/virqfd.c
drivers/vfio/pci/Makefile +2 -1
@@ -1,4 +1,5 @@ -vfio-pci-y := vfio_pci.o vfio_pci_intrs.o vfio_pci_rdwr.o vfio_pci_config.o +vfio-pci-y := vfio_pci.o vfio_pci_intrs.o vfio_pci_rdwr.o vfio_pci_config.o \ + ../virqfd.o obj-$(CONFIG_VFIO_PCI) += vfio-pci.o
drivers/vfio/pci/vfio_pci_intrs.c +0 -215
228 lines not on this page · raw message
drivers/vfio/pci/vfio_pci_private.h +0 -3
@@ -86,9 +86,6 @@ extern ssize_t vfio_pci_vga_rw(struct vfio_pci_device *vdev, char __user *buf,extern int vfio_pci_init_perm_bits (void );extern void vfio_pci_uninit_perm_bits (void ); -extern int vfio_virqfd_init (void ); -extern void vfio_virqfd_exit (void ); -extern int vfio_config_init (struct vfio_pci_device *vdev);extern void vfio_config_free (struct vfio_pci_device *vdev);#endif /* VFIO_PCI_PRIVATE_H */
drivers/vfio/virqfd.c new file +213 -0
213 lines not on this page · raw message
include/linux/vfio.h +27 -0
@@ -14,6 +14,8 @@#include <linux/iommu.h> #include <linux/mm.h> +#include <linux/workqueue.h> +#include <linux/poll.h> #include <uapi/linux/vfio.h> /**
@@ -121,4 +123,29 @@ static inline long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group,return -ENOTTY ; }#endif /* CONFIG_EEH */ + +/* +* IRQfd - generic +*/ +struct virqfd { +void *opaque; +struct eventfd_ctx *eventfd; +int (*handler)(void *,void *); +void (*thread)(void *,void *); +void *data; +struct work_struct inject; +wait_queue_t wait; +poll_table pt; +struct work_struct shutdown; +struct virqfd **pvirqfd; +}; + +extern int vfio_virqfd_init (void ); +extern void vfio_virqfd_exit (void ); +extern int vfio_virqfd_enable (void *opaque, +int (*handler)(void *,void *), +void (*thread)(void *,void *), +void *data,struct virqfd **pvirqfd,int fd); +extern void vfio_virqfd_disable (struct virqfd **pvirqfd); +#endif /* VFIO_H */
Signature · 1 line
2.2.2
PATCH v13 17/18 vfio: initialize the virqfd workqueue in VFIO generic code
In reply to Baptiste ReynalFrom: Antonios Motakis <a.motakis-lrHrjnjw1UfHK3s98zE1ajGjJy/[email protected]>
Now we have finally completely decoupled virqfd from VFIO_PCI. We can initialize it from the VFIO generic code, in order to safely use it from multiple independent VFIO bus drivers.
--- drivers/vfio/Makefile | 4 +++- drivers/vfio/pci/Makefile | 3 +-- drivers/vfio/pci/vfio_pci.c | 8 -------- drivers/vfio/vfio.c | 8 ++++++++ 4 files changed, 12 insertions(+), 11 deletions(-)
drivers/vfio/Makefile +3 -1
@@ -1,4 +1,6 @@ -obj-$(CONFIG_VFIO) += vfio.o +vfio_core-y := vfio.o virqfd.o + +obj-$(CONFIG_VFIO) += vfio_core.o obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o obj-$(CONFIG_VFIO_SPAPR_EEH) += vfio_spapr_eeh.o
drivers/vfio/pci/Makefile +1 -2
@@ -1,5 +1,4 @@ -vfio-pci-y := vfio_pci.o vfio_pci_intrs.o vfio_pci_rdwr.o vfio_pci_config.o \ - ../virqfd.o +vfio-pci-y := vfio_pci.o vfio_pci_intrs.o vfio_pci_rdwr.o vfio_pci_config.o obj-$(CONFIG_VFIO_PCI) += vfio-pci.o
drivers/vfio/pci/vfio_pci.c +0 -8
@@ -1012,7 +1012,6 @@ put_devs: static void __exit vfio_pci_cleanup(void) {pci_unregister_driver (&vfio_pci_driver); -vfio_virqfd_exit ();vfio_pci_uninit_perm_bits (); }
@@ -1025,11 +1024,6 @@ static int __init vfio_pci_init(void)if (ret)return ret; -/* Start the virqfd cleanup handler */ - ret =vfio_virqfd_init (); -if (ret) - goto out_virqfd; -/* Register and scan for devices */ ret =pci_register_driver (&vfio_pci_driver);if (ret)
@@ -1038,8 +1032,6 @@ static int __init vfio_pci_init(void)return 0 ; out_driver: -vfio_virqfd_exit (); -out_virqfd:vfio_pci_uninit_perm_bits ();return ret; }
drivers/vfio/vfio.c +8 -0
@@ -1464,6 +1464,11 @@ static int __init vfio_init(void)if (ret) goto err_cdev_add; +/* Start the virqfd cleanup handler used by some VFIO bus drivers */ + ret =vfio_virqfd_init (); +if (ret) + goto err_virqfd; +pr_info (DRIVER_DESC " version: " DRIVER_VERSION "\n" );/*
@@ -1476,6 +1481,8 @@ static int __init vfio_init(void)return 0 ; +err_virqfd: +cdev_del (&vfio.group_cdev); err_cdev_add:unregister_chrdev_region (vfio.group_devt,MINORMASK ); err_alloc_chrdev:
@@ -1490,6 +1497,7 @@ static void __exit vfio_cleanup(void) {WARN_ON (!list_empty (&vfio.group_list)); +vfio_virqfd_exit ();idr_destroy (&vfio.group_idr);cdev_del (&vfio.group_cdev);unregister_chrdev_region (vfio.group_devt,MINORMASK );
Signature · 1 line
2.2.2
PATCH v13 18/18 vfio/platform: implement IRQ masking/unmasking via an eventfd
In reply to Baptiste ReynalFrom: Antonios Motakis <[email protected]>
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.
--- drivers/vfio/platform/vfio_platform_irq.c | 47 ++++++++++++++++++++++++--- drivers/vfio/platform/vfio_platform_private.h | 2 ++ 2 files changed, 45 insertions(+), 4 deletions(-)
drivers/vfio/platform/vfio_platform_irq.c +43 -4
@@ -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]);
drivers/vfio/platform/vfio_platform_private.h +2 -0
@@ -35,6 +35,8 @@ struct vfio_platform_irq {struct eventfd_ctx *trigger;bool masked;spinlock_t lock; +struct virqfd *unmask; +struct virqfd *mask; };struct vfio_platform_region {
Signature · 1 line
2.2.2
Hi everyone,
Are there any comments on this patch series? If not, Is there anything keeping this series from getting merged upstream?
Thanks,
Baptiste
Quoted 119 lines · Baptiste Reynal
This patch series aims to implement VFIO support for platform devices that reside behind an IOMMU. Examples of such devices are devices behind an ARM SMMU, or behind a Samsung Exynos System MMU.
The API used is based on the existing VFIO API that is also used with PCI devices. Only devices that include a basic set of IRQs and memory regions are
targeted; devices with complex relationships with other devices on a device tree are not taken into account at this stage.This patch series may be applied on the following series/patches:
- [PATCH v3 0/6] vfio: type1: support for ARM SMMUS withVFIO_IOMMU_TYPE1A copy can be cloned from the branch vfio-platform-v13 at:
[email protected]:virtualopensystems/linux-kvm-arm.gitChanges since v12:
- Reorder chunks to be bisect-able
Changes since v11:
- Drop support for ARM AMBA devices
-vfio_platform_private.his now self-contained
- Fix masked IRQ initialization
Changes since v10:
- Check if interrupt is already masked when setting a new trigger
- Fixed kasprintf with unchecked return value in VFIO AMBA driver
Changes since v9:
- Reworked the splitting of the patches that decouple virqfd from PCI
- Some styling issues and typos
- Removed superfluous includes
- AMBA devices are now named vfio-amba- suffixed by the AMBA device id
- Several other cleanups and fixes
Changes since v8:
- Separate irq handler for edge and level triggered interrupts
- Mutex based lock for VFIO fd open/release
- Fixed bug where the first region of a platform device wasn't exposed
- Read only regions can be MMAPed only read only
- Code cleanups
Changes since v7:
- Some initial placeholder functionality for PIO resources
- Cleaned up code for IRQ triggering, masking and unmasking
- Some functionality has been removed from this series and posted
separately:
-VFIO_IOMMU_TYPE1support for ARM SMMUs
- IOMMU NOEXEC patches
-driver_overridefunctionality for AMBA devices
- Several fixes
Changes since v6:
- Integrated support for AMBA devices
- Numerous cleanups and fixes
Changes since v5:
- Full eventfd support for IRQ masking and unmasking.
- ChangedIOMMU_EXECtoIOMMU_NOEXEC, along with related flags in VFIO.
- Other fixes based on reviewer comments.
Changes since v4:
- Use static offsets for each region in the VFIO device fd
- Include patch in the series for the ARM SMMU to exposeIOMMU_EXECavailability viaIOMMU_CAP_DMA_EXEC
- Rebased on VFIO multi domain support:
-IOMMU_EXECis now available if at least one IOMMU in the container supports it
- ExposeIOMMU_EXECif available via the capabilityVFIO_IOMMU_PROT_EXEC
- Some bug fixes
Changes since v3:
- Use Kim Phillips'driver_probe_device()
Changes since v2:
- Fixed Read/Write and MMAP on device regions
- Removed dependency on Device Tree
- Interrupts support
- Interrupt masking/unmasking
- Automask level sensitive interrupts
- IntroducedVFIO_DMA_MAP_FLAG_EXEC
- Code clean upsAntonios Motakis (18):
vfio/platform: initial skeleton of VFIO support for platform devices
vfio: platform: probe to devices on the platform bus
vfio: platform: add the VFIO PLATFORM module toKconfigvfio/platform: return info for bound device vfio/platform: return info for device memory mapped IO regions vfio/platform: read and write support for the device fd vfio/platform: support MMAP of MMIO regions vfio/platform: return IRQ info
vfio/platform: initial interrupts support code vfio/platform: trigger an interrupt via eventfd vfio/platform: support for level sensitive interrupts
vfio: add avfio_prefix tovirqfd_enableandvirqfd_disableand
export
vfio: virqfd: renamevfio_pci_virqfd_initandvfio_pci_virqfd_exit
vfio: add local lock for virqfd instead of depending on VFIO PCI
vfio: pass an opaque pointer on virqfd initialization
vfio: move eventfd support code forVFIO_PCIto a separate file
vfio: initialize the virqfd workqueue in VFIO generic code vfio/platform: implement IRQ masking/unmasking via an eventfddrivers/vfio/Kconfig | 1 + drivers/vfio/Makefile | 5 +- drivers/vfio/pci/vfio_pci.c | 8 - drivers/vfio/pci/vfio_pci_intrs.c | 238 +----------- drivers/vfio/pci/vfio_pci_private.h | 3 - drivers/vfio/platform/Kconfig | 9 + drivers/vfio/platform/Makefile | 4 + drivers/vfio/platform/vfio_platform.c | 103 +++++ drivers/vfio/platform/vfio_platform_common.c | 521 ++++++++++++++++++++++++++ drivers/vfio/platform/vfio_platform_irq.c | 336 +++++++++++++++++ drivers/vfio/platform/vfio_platform_private.h | 85 +++++ drivers/vfio/vfio.c | 8 + drivers/vfio/virqfd.c | 213 +++++++++++ include/linux/vfio.h | 27 ++ include/uapi/linux/vfio.h | 1 + 15 files changed, 1326 insertions(+), 236 deletions(-) create mode 100644 drivers/vfio/platform/Kconfig create mode 100644 drivers/vfio/platform/Makefile create mode 100644 drivers/vfio/platform/vfio_platform.c create mode 100644 drivers/vfio/platform/vfio_platform_common.c create mode 100644 drivers/vfio/platform/vfio_platform_irq.c create mode 100644 drivers/vfio/platform/vfio_platform_private.h create mode 100644 drivers/vfio/virqfd.c
Quoted 4 lines
--
2.2.2
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Hi Baptiste,
Quoted 23 lines · Baptiste Reynal
Hi everyone,
Are there any comments on this patch series? If not, Is there anything keeping this series from getting merged upstream?
Thanks,
BaptisteQuoted 12 lines · Baptiste Reynal
This patch series aims to implement VFIO support for platform devices that reside behind an IOMMU. Examples of such devices are devices behind an ARM SMMU, or behind a Samsung Exynos System MMU.
The API used is based on the existing VFIO API that is also used with PCI devices. Only devices that include a basic set of IRQs and memory regions are
targeted; devices with complex relationships with other devices on a device tree are not taken into account at this stage.This patch series may be applied on the following series/patches:
- [PATCH v3 0/6] vfio: type1: support for ARM SMMUS withVFIO_IOMMU_TYPE1
Unfortunately, this patch set you depend on seems to have been abandoned:
http://www.spinics.net/lists/kvm/msg112976.html
We can't use an enum as a bitfield. This also highlights a bit of an issue with vfio-platform, who is to be the sub-maintainer? Is it you? Antonios? Me? I can't even test this code, so I'm hoping there's someone signed up to prevent this code from immediately bit rotting. Thanks,
Alex
Quoted 110 lines
Quoted 110 lines
A copy can be cloned from the branch vfio-platform-v13 at:
[email protected]:virtualopensystems/linux-kvm-arm.gitChanges since v12:
- Reorder chunks to be bisect-able
Changes since v11:
- Drop support for ARM AMBA devices
-vfio_platform_private.his now self-contained
- Fix masked IRQ initialization
Changes since v10:
- Check if interrupt is already masked when setting a new trigger
- Fixed kasprintf with unchecked return value in VFIO AMBA driver
Changes since v9:
- Reworked the splitting of the patches that decouple virqfd from PCI
- Some styling issues and typos
- Removed superfluous includes
- AMBA devices are now named vfio-amba- suffixed by the AMBA device id
- Several other cleanups and fixes
Changes since v8:
- Separate irq handler for edge and level triggered interrupts
- Mutex based lock for VFIO fd open/release
- Fixed bug where the first region of a platform device wasn't exposed
- Read only regions can be MMAPed only read only
- Code cleanups
Changes since v7:
- Some initial placeholder functionality for PIO resources
- Cleaned up code for IRQ triggering, masking and unmasking
- Some functionality has been removed from this series and posted
separately:
-VFIO_IOMMU_TYPE1support for ARM SMMUs
- IOMMU NOEXEC patches
-driver_overridefunctionality for AMBA devices
- Several fixes
Changes since v6:
- Integrated support for AMBA devices
- Numerous cleanups and fixes
Changes since v5:
- Full eventfd support for IRQ masking and unmasking.
- ChangedIOMMU_EXECtoIOMMU_NOEXEC, along with related flags in VFIO.
- Other fixes based on reviewer comments.
Changes since v4:
- Use static offsets for each region in the VFIO device fd
- Include patch in the series for the ARM SMMU to exposeIOMMU_EXECavailability viaIOMMU_CAP_DMA_EXEC
- Rebased on VFIO multi domain support:
-IOMMU_EXECis now available if at least one IOMMU in the container supports it
- ExposeIOMMU_EXECif available via the capabilityVFIO_IOMMU_PROT_EXEC
- Some bug fixes
Changes since v3:
- Use Kim Phillips'driver_probe_device()
Changes since v2:
- Fixed Read/Write and MMAP on device regions
- Removed dependency on Device Tree
- Interrupts support
- Interrupt masking/unmasking
- Automask level sensitive interrupts
- IntroducedVFIO_DMA_MAP_FLAG_EXEC
- Code clean upsAntonios Motakis (18):
vfio/platform: initial skeleton of VFIO support for platform devices
vfio: platform: probe to devices on the platform bus
vfio: platform: add the VFIO PLATFORM module toKconfigvfio/platform: return info for bound device vfio/platform: return info for device memory mapped IO regions vfio/platform: read and write support for the device fd vfio/platform: support MMAP of MMIO regions vfio/platform: return IRQ info
vfio/platform: initial interrupts support code vfio/platform: trigger an interrupt via eventfd vfio/platform: support for level sensitive interrupts
vfio: add avfio_prefix tovirqfd_enableandvirqfd_disableand
export
vfio: virqfd: renamevfio_pci_virqfd_initandvfio_pci_virqfd_exit
vfio: add local lock for virqfd instead of depending on VFIO PCI
vfio: pass an opaque pointer on virqfd initialization
vfio: move eventfd support code forVFIO_PCIto a separate file
vfio: initialize the virqfd workqueue in VFIO generic code vfio/platform: implement IRQ masking/unmasking via an eventfddrivers/vfio/Kconfig | 1 + drivers/vfio/Makefile | 5 +- drivers/vfio/pci/vfio_pci.c | 8 - drivers/vfio/pci/vfio_pci_intrs.c | 238 +----------- drivers/vfio/pci/vfio_pci_private.h | 3 - drivers/vfio/platform/Kconfig | 9 + drivers/vfio/platform/Makefile | 4 + drivers/vfio/platform/vfio_platform.c | 103 +++++ drivers/vfio/platform/vfio_platform_common.c | 521 ++++++++++++++++++++++++++ drivers/vfio/platform/vfio_platform_irq.c | 336 +++++++++++++++++ drivers/vfio/platform/vfio_platform_private.h | 85 +++++ drivers/vfio/vfio.c | 8 + drivers/vfio/virqfd.c | 213 +++++++++++ include/linux/vfio.h | 27 ++ include/uapi/linux/vfio.h | 1 + 15 files changed, 1326 insertions(+), 236 deletions(-) create mode 100644 drivers/vfio/platform/Kconfig create mode 100644 drivers/vfio/platform/Makefile create mode 100644 drivers/vfio/platform/vfio_platform.c create mode 100644 drivers/vfio/platform/vfio_platform_common.c create mode 100644 drivers/vfio/platform/vfio_platform_irq.c create mode 100644 drivers/vfio/platform/vfio_platform_private.h create mode 100644 drivers/vfio/virqfd.c--
2.2.2
Hi Baptiste,
Quoted 4 lines · Baptiste Reynal
Hi everyone,
Are there any comments on this patch series? If not, Is there anything keeping this series from getting merged upstream?
For a start, it looks like the dependency mentioned below is still not in, which is a bit of a problem.
Also, trying to merge your branch below (after fixing the URL), I get some conflicts with the current mainline, so that's a bit of a show stopper too.
Can you start by rebasing on top of 4.0-rc1 with all the dependencies, reposting the series, and cc-ing the original author of the patches (as I cannot see Antonios on the CC list)?
Thanks,
M.
Quoted 124 lines
Thanks,
BaptisteOn Fri, Jan 30, 2015 at 2:46 PM, Baptiste Reynal <[email protected]<mailto:[email protected]>> wrote:
This patch series aims to implement VFIO support for platform devices that
reside behind an IOMMU. Examples of such devices are devices behind an ARM
SMMU, or behind a Samsung Exynos System MMU.The API used is based on the existing VFIO API that is also used with PCI devices. Only devices that include a basic set of IRQs and memory regions are targeted; devices with complex relationships with other devices on a device tree are not taken into account at this stage.
This patch series may be applied on the following series/patches:
- [PATCH v3 0/6] vfio: type1: support for ARM SMMUS withVFIO_IOMMU_TYPE1A copy can be cloned from the branch vfio-platform-v13 at:
[email protected]:virtualopensystems/linux-kvm-arm.gitChanges since v12:
- Reorder chunks to be bisect-able
Changes since v11:
- Drop support for ARM AMBA devices
-vfio_platform_private.his now self-contained
- Fix masked IRQ initialization
Changes since v10:
- Check if interrupt is already masked when setting a new trigger
- Fixed kasprintf with unchecked return value in VFIO AMBA driver
Changes since v9:
- Reworked the splitting of the patches that decouple virqfd from PCI
- Some styling issues and typos
- Removed superfluous includes
- AMBA devices are now named vfio-amba- suffixed by the AMBA device id
- Several other cleanups and fixes
Changes since v8:
- Separate irq handler for edge and level triggered interrupts
- Mutex based lock for VFIO fd open/release
- Fixed bug where the first region of a platform device wasn't exposed
- Read only regions can be MMAPed only read only
- Code cleanups
Changes since v7:
- Some initial placeholder functionality for PIO resources
- Cleaned up code for IRQ triggering, masking and unmasking
- Some functionality has been removed from this series and posted separately:
-VFIO_IOMMU_TYPE1support for ARM SMMUs
- IOMMU NOEXEC patches
-driver_overridefunctionality for AMBA devices
- Several fixes
Changes since v6:
- Integrated support for AMBA devices
- Numerous cleanups and fixes
Changes since v5:
- Full eventfd support for IRQ masking and unmasking.
- ChangedIOMMU_EXECtoIOMMU_NOEXEC, along with related flags in VFIO.
- Other fixes based on reviewer comments.
Changes since v4:
- Use static offsets for each region in the VFIO device fd
- Include patch in the series for the ARM SMMU to exposeIOMMU_EXECavailability viaIOMMU_CAP_DMA_EXEC
- Rebased on VFIO multi domain support:
-IOMMU_EXECis now available if at least one IOMMU in the container supports it
- ExposeIOMMU_EXECif available via the capabilityVFIO_IOMMU_PROT_EXEC
- Some bug fixes
Changes since v3:
- Use Kim Phillips'driver_probe_device()
Changes since v2:
- Fixed Read/Write and MMAP on device regions
- Removed dependency on Device Tree
- Interrupts support
- Interrupt masking/unmasking
- Automask level sensitive interrupts
- IntroducedVFIO_DMA_MAP_FLAG_EXEC
- Code clean upsAntonios Motakis (18):
vfio/platform: initial skeleton of VFIO support for platform devices
vfio: platform: probe to devices on the platform bus
vfio: platform: add the VFIO PLATFORM module toKconfigvfio/platform: return info for bound device vfio/platform: return info for device memory mapped IO regions vfio/platform: read and write support for the device fd vfio/platform: support MMAP of MMIO regions vfio/platform: return IRQ info
vfio/platform: initial interrupts support code vfio/platform: trigger an interrupt via eventfd vfio/platform: support for level sensitive interrupts
vfio: add avfio_prefix tovirqfd_enableandvirqfd_disableand
export
vfio: virqfd: renamevfio_pci_virqfd_initandvfio_pci_virqfd_exit
vfio: add local lock for virqfd instead of depending on VFIO PCI
vfio: pass an opaque pointer on virqfd initialization
vfio: move eventfd support code forVFIO_PCIto a separate file
vfio: initialize the virqfd workqueue in VFIO generic code vfio/platform: implement IRQ masking/unmasking via an eventfddrivers/vfio/Kconfig | 1 + drivers/vfio/Makefile | 5 +- drivers/vfio/pci/vfio_pci.c | 8 - drivers/vfio/pci/vfio_pci_intrs.c | 238 +----------- drivers/vfio/pci/vfio_pci_private.h | 3 - drivers/vfio/platform/Kconfig | 9 + drivers/vfio/platform/Makefile | 4 + drivers/vfio/platform/vfio_platform.c | 103 +++++ drivers/vfio/platform/vfio_platform_common.c | 521 ++++++++++++++++++++++++++ drivers/vfio/platform/vfio_platform_irq.c | 336 +++++++++++++++++ drivers/vfio/platform/vfio_platform_private.h | 85 +++++ drivers/vfio/vfio.c | 8 + drivers/vfio/virqfd.c | 213 +++++++++++ include/linux/vfio.h | 27 ++ include/uapi/linux/vfio.h | 1 + 15 files changed, 1326 insertions(+), 236 deletions(-) create mode 100644 drivers/vfio/platform/Kconfig create mode 100644 drivers/vfio/platform/Makefile create mode 100644 drivers/vfio/platform/vfio_platform.c create mode 100644 drivers/vfio/platform/vfio_platform_common.c create mode 100644 drivers/vfio/platform/vfio_platform_irq.c create mode 100644 drivers/vfio/platform/vfio_platform_private.h create mode 100644 drivers/vfio/virqfd.c--
2.2.2
Signature · 1 line
Jazz is not dead. It just smells funny...
Thanks for your answers.
I am now the sub-maintainer of vfio-platform. I will handle the rebase of these serie and fix "[PATCH v3 0/6] vfio: type1: support for ARM SMMUS with VFIO_IOMMU_TYPE1". New versions are coming soon.
Regards,
Baptiste
Quoted 153 lines · Marc Zyngier
Hi Baptiste,
Quoted 4 lines · Baptiste Reynal
Hi everyone,
Are there any comments on this patch series? If not, Is there anything keeping this series from getting merged upstream?
For a start, it looks like the dependency mentioned below is still not in, which is a bit of a problem.
Also, trying to merge your branch below (after fixing the URL), I get some conflicts with the current mainline, so that's a bit of a show stopper too.
Can you start by rebasing on top of 4.0-rc1 with all the dependencies, reposting the series, and cc-ing the original author of the patches (as I cannot see Antonios on the CC list)?
Thanks,
M.Quoted 4 lines
Thanks,
BaptisteOn Fri, Jan 30, 2015 at 2:46 PM, Baptiste Reynal <
[email protected]<mailto:[email protected]>>
Quoted 1 line · wrote:
This patch series aims to implement VFIO support for platform devices
that
Quoted 1 line
reside behind an IOMMU. Examples of such devices are devices behind an
ARM
Quoted 4 lines
SMMU, or behind a Samsung Exynos System MMU.
The API used is based on the existing VFIO API that is also used with PCI devices. Only devices that include a basic set of IRQs and memory
regions are
Quoted 1 line
targeted; devices with complex relationships with other devices on a
device
Quoted 4 lines
tree are not taken into account at this stage.
This patch series may be applied on the following series/patches:
- [PATCH v3 0/6] vfio: type1: support for ARM SMMUS with
VFIO_IOMMU_TYPE1Quoted 21 lines
A copy can be cloned from the branch vfio-platform-v13 at:
[email protected]:virtualopensystems/linux-kvm-arm.gitChanges since v12:
- Reorder chunks to be bisect-able
Changes since v11:
- Drop support for ARM AMBA devices
-vfio_platform_private.his now self-contained
- Fix masked IRQ initialization
Changes since v10:
- Check if interrupt is already masked when setting a new trigger
- Fixed kasprintf with unchecked return value in VFIO AMBA driver
Changes since v9:
- Reworked the splitting of the patches that decouple virqfd from PCI
- Some styling issues and typos
- Removed superfluous includes
- AMBA devices are now named vfio-amba- suffixed by the AMBA device id
- Several other cleanups and fixes
Changes since v8:
- Separate irq handler for edge and level triggered interruptsQuoted 8 lines
- Mutex based lock for VFIO fd open/release
- Fixed bug where the first region of a platform device wasn't exposed
- Read only regions can be MMAPed only read only
- Code cleanups
Changes since v7:
- Some initial placeholder functionality for PIO resources
- Cleaned up code for IRQ triggering, masking and unmasking
- Some functionality has been removed from this series and postedseparately:
Quoted 11 lines
-
VFIO_IOMMU_TYPE1support for ARM SMMUs
- IOMMU NOEXEC patches
-driver_overridefunctionality for AMBA devices
- Several fixes
Changes since v6:
- Integrated support for AMBA devices
- Numerous cleanups and fixes
Changes since v5:
- Full eventfd support for IRQ masking and unmasking.
- ChangedIOMMU_EXECtoIOMMU_NOEXEC, along with related flags in VFIO.
- Other fixes based on reviewer comments.Quoted 8 lines
Changes since v4:
- Use static offsets for each region in the VFIO device fd
- Include patch in the series for the ARM SMMU to exposeIOMMU_EXECavailability viaIOMMU_CAP_DMA_EXEC
- Rebased on VFIO multi domain support:
-IOMMU_EXECis now available if at least one IOMMU in the container supports it
- ExposeIOMMU_EXECif available via the capability
VFIO_IOMMU_PROT_EXECQuoted 33 lines
- Some bug fixes
Changes since v3:
- Use Kim Phillips'driver_probe_device()
Changes since v2:
- Fixed Read/Write and MMAP on device regions
- Removed dependency on Device Tree
- Interrupts support
- Interrupt masking/unmasking
- Automask level sensitive interrupts
- IntroducedVFIO_DMA_MAP_FLAG_EXEC
- Code clean upsAntonios Motakis (18):
vfio/platform: initial skeleton of VFIO support for platform devices
vfio: platform: probe to devices on the platform bus
vfio: platform: add the VFIO PLATFORM module toKconfigvfio/platform: return info for bound device vfio/platform: return info for device memory mapped IO regions vfio/platform: read and write support for the device fd vfio/platform: support MMAP of MMIO regions vfio/platform: return IRQ info
vfio/platform: initial interrupts support code vfio/platform: trigger an interrupt via eventfd vfio/platform: support for level sensitive interrupts
vfio: add avfio_prefix tovirqfd_enableandvirqfd_disableand
export
vfio: virqfd: renamevfio_pci_virqfd_initandvfio_pci_virqfd_exit
vfio: add local lock for virqfd instead of depending on VFIO PCI
vfio: pass an opaque pointer on virqfd initialization
vfio: move eventfd support code forVFIO_PCIto a separate file
vfio: initialize the virqfd workqueue in VFIO generic code vfio/platform: implement IRQ masking/unmasking via an eventfdQuoted 9 lines
drivers/vfio/Kconfig | 1 + drivers/vfio/Makefile | 5 +- drivers/vfio/pci/vfio_pci.c | 8 - drivers/vfio/pci/vfio_pci_intrs.c | 238 +----------- drivers/vfio/pci/vfio_pci_private.h | 3 - drivers/vfio/platform/Kconfig | 9 + drivers/vfio/platform/Makefile | 4 + drivers/vfio/platform/vfio_platform.c | 103 +++++ drivers/vfio/platform/vfio_platform_common.c | 521++++++++++++++++++++++++++
Quoted 15 lines
drivers/vfio/platform/vfio_platform_irq.c | 336 +++++++++++++++++ drivers/vfio/platform/vfio_platform_private.h | 85 +++++ drivers/vfio/vfio.c | 8 + drivers/vfio/virqfd.c | 213 +++++++++++ include/linux/vfio.h | 27 ++ include/uapi/linux/vfio.h | 1 + 15 files changed, 1326 insertions(+), 236 deletions(-) create mode 100644 drivers/vfio/platform/Kconfig create mode 100644 drivers/vfio/platform/Makefile create mode 100644 drivers/vfio/platform/vfio_platform.c create mode 100644 drivers/vfio/platform/vfio_platform_common.c create mode 100644 drivers/vfio/platform/vfio_platform_irq.c create mode 100644 drivers/vfio/platform/vfio_platform_private.h create mode 100644 drivers/vfio/virqfd.c
Quoted 9 lines
Quoted 4 lines
--
2.2.2--
Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm