[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v10 2/7] hw/vfio/platform: vfio-platform skeleto
From: |
Alex Bennée |
Subject: |
Re: [Qemu-devel] [PATCH v10 2/7] hw/vfio/platform: vfio-platform skeleton |
Date: |
Tue, 17 Feb 2015 10:56:37 +0000 |
Eric Auger <address@hidden> writes:
> Minimal VFIO platform implementation supporting register space
> user mapping but not IRQ assignment.
>
> Signed-off-by: Kim Phillips <address@hidden>
> Signed-off-by: Eric Auger <address@hidden>
See comments inline.
<snip>
> +/**
> + * vfio_populate_device - initialize MMIO region and IRQ
> + * @vbasedev: the VFIO device
> + *
> + * query the VFIO device for exposed MMIO regions and IRQ and
> + * populate the associated fields in the device struct
> + */
> +static int vfio_populate_device(VFIODevice *vbasedev)
> +{
> + struct vfio_region_info reg_info = { .argsz = sizeof(reg_info) };
This could be inside the for block.
> + int i, ret = -1;
> + VFIOPlatformDevice *vdev =
> + container_of(vbasedev, VFIOPlatformDevice, vbasedev);
> +
> + if (!(vbasedev->flags & VFIO_DEVICE_FLAGS_PLATFORM)) {
> + error_report("vfio: Um, this isn't a platform device");
> + goto error;
> + }
> +
> + vdev->regions = g_malloc0(sizeof(VFIORegion *) *
> vbasedev->num_regions);
I may have considered a g_malloc0_n but I see that's not actually used
in the rest of the code (newer glib?).
> +
> + for (i = 0; i < vbasedev->num_regions; i++) {
> + vdev->regions[i] = g_malloc0(sizeof(VFIORegion));
An intermediate VFIORegion *ptr here would have saved a bunch of typing
later on ;-)
> + reg_info.index = i;
> + ret = ioctl(vbasedev->fd, VFIO_DEVICE_GET_REGION_INFO, ®_info);
> + if (ret) {
> + error_report("vfio: Error getting region %d info: %m", i);
> + goto error;
> + }
> + vdev->regions[i]->flags = reg_info.flags;
> + vdev->regions[i]->size = reg_info.size;
> + vdev->regions[i]->fd_offset = reg_info.offset;
> + vdev->regions[i]->nr = i;
> + vdev->regions[i]->vbasedev = vbasedev;
> +
> + trace_vfio_platform_populate_regions(vdev->regions[i]->nr,
> + (unsigned long)vdev->regions[i]->flags,
> + (unsigned long)vdev->regions[i]->size,
> + vdev->regions[i]->vbasedev->fd,
> + (unsigned long)vdev->regions[i]->fd_offset);
> + }
> +
> + return 0;
> +error:
> + for (i = 0; i < vbasedev->num_regions; i++) {
> + g_free(vdev->regions[i]);
> + }
> + g_free(vdev->regions);
> + return ret;
> +}
> +
> +/* specialized functions ofr VFIO Platform devices */
> +static VFIODeviceOps vfio_platform_ops = {
> + .vfio_compute_needs_reset = vfio_platform_compute_needs_reset,
> + .vfio_hot_reset_multi = vfio_platform_hot_reset_multi,
> + .vfio_populate_device = vfio_populate_device,
> +};
> +
> +/**
> + * vfio_base_device_init - implements some of the VFIO mechanics
> + * @vbasedev: the VFIO device
> + *
> + * retrieves the group the device belongs to and get the device fd
> + * returns the VFIO device fd
> + * precondition: the device name must be initialized
> + */
> +static int vfio_base_device_init(VFIODevice *vbasedev)
> +{
> + VFIOGroup *group;
> + VFIODevice *vbasedev_iter;
> + char path[PATH_MAX], iommu_group_path[PATH_MAX], *group_name;
> + ssize_t len;
> + struct stat st;
> + int groupid;
> + int ret;
> +
> + /* name must be set prior to the call */
> + if (!vbasedev->name) {
> + return -EINVAL;
> + }
> +
> + /* Check that the host device exists */
> + snprintf(path, sizeof(path), "/sys/bus/platform/devices/%s/",
> + vbasedev->name);
> +
> + if (stat(path, &st) < 0) {
> + error_report("vfio: error: no such host device: %s", path);
> + return -errno;
> + }
> +
> + strncat(path, "iommu_group", sizeof(path) - strlen(path) - 1);
Consider g_strlcat which has nicer max length semantics.
> + len = readlink(path, iommu_group_path, sizeof(path));
> + if (len <= 0 || len >= sizeof(path)) {
readlink should never report more than sizeof(path) although that will
indicate a ENAMETOOLONG.
> + error_report("vfio: error no iommu_group for device");
> + return len < 0 ? -errno : ENAMETOOLONG;
> + }
> +
> + iommu_group_path[len] = 0;
> + group_name = basename(iommu_group_path);
> +
> + if (sscanf(group_name, "%d", &groupid) != 1) {
> + error_report("vfio: error reading %s: %m", path);
> + return -errno;
> + }
> +
> + trace_vfio_platform_base_device_init(vbasedev->name, groupid);
> +
> + group = vfio_get_group(groupid, &address_space_memory);
> + if (!group) {
> + error_report("vfio: failed to get group %d", groupid);
> + return -ENOENT;
> + }
> +
> + snprintf(path, sizeof(path), "%s", vbasedev->name);
> +
> + QLIST_FOREACH(vbasedev_iter, &group->device_list, next) {
> + if (strcmp(vbasedev_iter->name, vbasedev->name) == 0) {
> + error_report("vfio: error: device %s is already attached", path);
> + vfio_put_group(group);
> + return -EBUSY;
> + }
> + }
> + ret = vfio_get_device(group, path, vbasedev);
> + if (ret) {
> + error_report("vfio: failed to get device %s", path);
> + vfio_put_group(group);
> + }
> + return ret;
> +}
> +
> +/**
> + * vfio_map_region - initialize the 2 mr (mmapped on ops) for a
> + * given index
> + * @vdev: the VFIO platform device
> + * @nr: the index of the region
> + *
> + * init the top memory region and the mmapped memroy region beneath
> + * VFIOPlatformDevice is used since VFIODevice is not a QOM Object
> + * and could not be passed to memory region functions
> +*/
> +static void vfio_map_region(VFIOPlatformDevice *vdev, int nr)
> +{
> + VFIORegion *region = vdev->regions[nr];
> + unsigned size = region->size;
> + char name[64];
> +
> + if (!size) {
> + return;
> + }
> +
> + snprintf(name, sizeof(name), "VFIO %s region %d",
> + vdev->vbasedev.name, nr);
> +
> + /* A "slow" read/write mapping underlies all regions */
> + memory_region_init_io(®ion->mem, OBJECT(vdev), &vfio_region_ops,
> + region, name, size);
> +
> + strncat(name, " mmap", sizeof(name) - strlen(name) - 1);
again consider g_strlcat
> +
> + if (vfio_mmap_region(OBJECT(vdev), region, ®ion->mem,
> + ®ion->mmap_mem, ®ion->mmap, size, 0, name)) {
> + error_report("%s unsupported. Performance may be slow", name);
> + }
> +}
> +
> +/**
> + * vfio_platform_realize - the device realize function
> + * @dev: device state pointer
> + * @errp: error
> + *
> + * initialize the device, its memory regions and IRQ structures
> + * IRQ are started separately
> + */
> +static void vfio_platform_realize(DeviceState *dev, Error **errp)
> +{
> + VFIOPlatformDevice *vdev = VFIO_PLATFORM_DEVICE(dev);
> + SysBusDevice *sbdev = SYS_BUS_DEVICE(dev);
> + VFIODevice *vbasedev = &vdev->vbasedev;
> + int i, ret;
> +
> + vbasedev->type = VFIO_DEVICE_TYPE_PLATFORM;
> + vbasedev->ops = &vfio_platform_ops;
> +
> + trace_vfio_platform_realize(vbasedev->name, vdev->compat);
> +
> + ret = vfio_base_device_init(vbasedev);
> + if (ret) {
> + error_setg(errp, "vfio: vfio_base_device_init failed for %s",
> + vbasedev->name);
> + return;
> + }
> +
> + for (i = 0; i < vbasedev->num_regions; i++) {
> + vfio_map_region(vdev, i);
> + sysbus_init_mmio(sbdev, &vdev->regions[i]->mem);
> + }
> +}
> +
> +static const VMStateDescription vfio_platform_vmstate = {
> + .name = TYPE_VFIO_PLATFORM,
> + .unmigratable = 1,
> +};
> +
> +static Property vfio_platform_dev_properties[] = {
> + DEFINE_PROP_STRING("host", VFIOPlatformDevice, vbasedev.name),
> + DEFINE_PROP_END_OF_LIST(),
> +};
> +
> +static void vfio_platform_class_init(ObjectClass *klass, void *data)
> +{
> + DeviceClass *dc = DEVICE_CLASS(klass);
> +
> + dc->realize = vfio_platform_realize;
> + dc->props = vfio_platform_dev_properties;
> + dc->vmsd = &vfio_platform_vmstate;
> + dc->desc = "VFIO-based platform device assignment";
> + set_bit(DEVICE_CATEGORY_MISC, dc->categories);
> +}
> +
> +static const TypeInfo vfio_platform_dev_info = {
> + .name = TYPE_VFIO_PLATFORM,
> + .parent = TYPE_SYS_BUS_DEVICE,
> + .instance_size = sizeof(VFIOPlatformDevice),
> + .class_init = vfio_platform_class_init,
> + .class_size = sizeof(VFIOPlatformDeviceClass),
> + .abstract = true,
> +};
> +
> +static void register_vfio_platform_dev_type(void)
> +{
> + type_register_static(&vfio_platform_dev_info);
> +}
> +
> +type_init(register_vfio_platform_dev_type)
> diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
> index 5f3679b..2d1d8b3 100644
> --- a/include/hw/vfio/vfio-common.h
> +++ b/include/hw/vfio/vfio-common.h
> @@ -43,6 +43,7 @@
>
> enum {
> VFIO_DEVICE_TYPE_PCI = 0,
> + VFIO_DEVICE_TYPE_PLATFORM = 1,
> };
>
> typedef struct VFIORegion {
> diff --git a/include/hw/vfio/vfio-platform.h b/include/hw/vfio/vfio-platform.h
> new file mode 100644
> index 0000000..338f0c6
> --- /dev/null
> +++ b/include/hw/vfio/vfio-platform.h
> @@ -0,0 +1,44 @@
> +/*
> + * vfio based device assignment support - platform devices
> + *
> + * Copyright Linaro Limited, 2014
> + *
> + * Authors:
> + * Kim Phillips <address@hidden>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2. See
> + * the COPYING file in the top-level directory.
> + *
> + * Based on vfio based PCI device assignment support:
> + * Copyright Red Hat, Inc. 2012
> + */
> +
> +#ifndef HW_VFIO_VFIO_PLATFORM_H
> +#define HW_VFIO_VFIO_PLATFORM_H
> +
> +#include "hw/sysbus.h"
> +#include "hw/vfio/vfio-common.h"
> +
> +#define TYPE_VFIO_PLATFORM "vfio-platform"
> +
> +typedef struct VFIOPlatformDevice {
> + SysBusDevice sbdev;
> + VFIODevice vbasedev; /* not a QOM object */
> + VFIORegion **regions;
> + char *compat; /* compatibility string */
> +} VFIOPlatformDevice;
> +
> +typedef struct VFIOPlatformDeviceClass {
> + /*< private >*/
> + SysBusDeviceClass parent_class;
> + /*< public >*/
> +} VFIOPlatformDeviceClass;
> +
> +#define VFIO_PLATFORM_DEVICE(obj) \
> + OBJECT_CHECK(VFIOPlatformDevice, (obj), TYPE_VFIO_PLATFORM)
> +#define VFIO_PLATFORM_DEVICE_CLASS(klass) \
> + OBJECT_CLASS_CHECK(VFIOPlatformDeviceClass, (klass), TYPE_VFIO_PLATFORM)
> +#define VFIO_PLATFORM_DEVICE_GET_CLASS(obj) \
> + OBJECT_GET_CLASS(VFIOPlatformDeviceClass, (obj), TYPE_VFIO_PLATFORM)
> +
> +#endif /*HW_VFIO_VFIO_PLATFORM_H*/
> diff --git a/trace-events b/trace-events
> index f87b077..d3685c9 100644
> --- a/trace-events
> +++ b/trace-events
> @@ -1556,6 +1556,18 @@ vfio_put_group(int fd) "close group->fd=%d"
> vfio_get_device(const char * name, unsigned int flags, unsigned int
> num_regions, unsigned int num_irqs) "Device %s flags: %u, regions: %u, irqs:
> %u"
> vfio_put_base_device(int fd) "close vdev->fd=%d"
>
> +# hw/vfio/platform.c
> +vfio_platform_eoi(int pin, int fd) "EOI IRQ pin %d (fd=%d)"
> +vfio_platform_mmap_set_enabled(bool enabled) "fast path = %d"
> +vfio_platform_intp_mmap_enable(int pin) "IRQ #%d still active, stay in slow
> path"
> +vfio_platform_intp_interrupt(int pin, int fd) "Handle IRQ #%d (fd = %d)"
> +vfio_platform_populate_interrupts(int pin, int count, int flags) "- IRQ
> index %d: count %d, flags=0x%x"
> +vfio_platform_populate_regions(int region_index, unsigned long flag,
> unsigned long size, int fd, unsigned long offset) "- region %d flags = 0x%lx,
> size = 0x%lx, fd= %d, offset = 0x%lx"
> +vfio_platform_base_device_init(char *name, int groupid) "%s belongs to group
> #%d"
> +vfio_platform_realize(char *name, char *compat) "vfio device %s, compat = %s"
> +vfio_intp_interrupt_set_pending(int index) "irq %d is set PENDING"
> +vfio_platform_eoi_handle_pending(int index) "handle PENDING IRQ %d"
> +
> #hw/acpi/memory_hotplug.c
> mhp_acpi_invalid_slot_selected(uint32_t slot) "0x%"PRIx32
> mhp_acpi_read_addr_lo(uint32_t slot, uint32_t addr) "slot[0x%"PRIx32"] addr
> lo: 0x%"PRIx32
--
Alex Bennée
- [Qemu-devel] [PATCH v10 0/7] KVM platform device passthrough, Eric Auger, 2015/02/12
- [Qemu-devel] [PATCH v10 1/7] linux-headers: update VFIO header for VFIO platform drivers, Eric Auger, 2015/02/12
- [Qemu-devel] [PATCH v10 2/7] hw/vfio/platform: vfio-platform skeleton, Eric Auger, 2015/02/12
- Re: [Qemu-devel] [PATCH v10 2/7] hw/vfio/platform: vfio-platform skeleton,
Alex Bennée <=
- [Qemu-devel] [PATCH v10 3/7] hw/vfio/platform: add irq assignment, Eric Auger, 2015/02/12
- [Qemu-devel] [PATCH v10 5/7] hw/vfio: calxeda xgmac device, Eric Auger, 2015/02/12
- [Qemu-devel] [PATCH v10 4/7] hw/vfio/platform: add capability to start IRQ propagation, Eric Auger, 2015/02/12
- [Qemu-devel] [PATCH v10 7/7] hw/vfio/platform: add irqfd support, Eric Auger, 2015/02/12
- [Qemu-devel] [PATCH v10 6/7] hw/arm/sysbus-fdt: enable vfio-calxeda-xgmac dynamic instantiation, Eric Auger, 2015/02/12