Commit 6dcea614 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20160311.0' into staging 



VFIO updates 2016-03-11

 - Allow devices to be specified via sysfs path (Alex Williamson)
 - vfio region helpers and generalization for future device specific regions
   (Alex Williamson)
 - Automatic ROM device ID and checksum fixup (Alex Williamson)
 - Split VGA setup to allow enabling VGA from quirks (Alex Williamson)
 - Remove fixed string limit for ROM MemoryRegion name (Neo Jia)
 - MAINTAINERS update (Thomas Huth)

# gpg: Signature made Fri 11 Mar 2016 15:55:31 GMT using RSA key ID 3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
# gpg:                 aka "Alex Williamson <alex@shazbot.org>"
# gpg:                 aka "Alex Williamson <alwillia@redhat.com>"
# gpg:                 aka "Alex Williamson <alex.l.williamson@gmail.com>"

* remotes/awilliam/tags/vfio-update-20160311.0:
  MAINTAINERS: Add entry for the include/hw/vfio/ folder
  vfio/pci: replace fixed string limit by g_strdup_printf
  vfio/pci: Split out VGA setup
  vfio/pci: Fixup PCI option ROMs
  vfio/pci: Convert all MemoryRegion to dynamic alloc and consistent functions
  vfio: Generalize region support
  vfio: Wrap VFIO_DEVICE_GET_REGION_INFO
  vfio: Add sysfsdev property for pci & platform

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0dcee622 99b88c6d

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -866,6 +866,7 @@ VFIO 
M: Alex Williamson <alex.williamson@redhat.com>

S: Supported

F: hw/vfio/*

F: include/hw/vfio/



vhost

M: Michael S. Tsirkin <mst@redhat.com>

hw/arm/sysbus-fdt.c

+2 −2
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static int add_calxeda_midway_xgmac_fdt_node(SysBusDevice *sbdev, void *opaque) 
        mmio_base = platform_bus_get_mmio_addr(pbus, sbdev, i);

        reg_attr[2 * i] = cpu_to_be32(mmio_base);

        reg_attr[2 * i + 1] = cpu_to_be32(

                                memory_region_size(&vdev->regions[i]->mem));

                                memory_region_size(vdev->regions[i]->mem));

    }

    qemu_fdt_setprop(fdt, nodename, "reg", reg_attr,

                     vbasedev->num_regions * 2 * sizeof(uint32_t));
@@ -374,7 +374,7 @@ static int add_amd_xgbe_fdt_node(SysBusDevice *sbdev, void *opaque) 
        mmio_base = platform_bus_get_mmio_addr(pbus, sbdev, i);

        reg_attr[2 * i] = cpu_to_be32(mmio_base);

        reg_attr[2 * i + 1] = cpu_to_be32(

                                memory_region_size(&vdev->regions[i]->mem));

                                memory_region_size(vdev->regions[i]->mem));

    }

    qemu_fdt_setprop(guest_fdt, nodename, "reg", reg_attr,

                     vbasedev->num_regions * 2 * sizeof(uint32_t));

hw/vfio/common.c

+162 −28
Original line number Diff line number Diff line
@@ -493,48 +493,164 @@ static void vfio_listener_release(VFIOContainer *container) 
    memory_listener_unregister(&container->listener);

}



int vfio_mmap_region(Object *obj, VFIORegion *region,

                     MemoryRegion *mem, MemoryRegion *submem,

                     void **map, size_t size, off_t offset,

                     const char *name)

int vfio_region_setup(Object *obj, VFIODevice *vbasedev, VFIORegion *region,

                      int index, const char *name)

{

    int ret = 0;

    VFIODevice *vbasedev = region->vbasedev;



    if (!vbasedev->no_mmap && size && region->flags &

        VFIO_REGION_INFO_FLAG_MMAP) {

        int prot = 0;

    struct vfio_region_info *info;

    int ret;



        if (region->flags & VFIO_REGION_INFO_FLAG_READ) {

            prot |= PROT_READ;

    ret = vfio_get_region_info(vbasedev, index, &info);

    if (ret) {

        return ret;

    }



        if (region->flags & VFIO_REGION_INFO_FLAG_WRITE) {

            prot |= PROT_WRITE;

    region->vbasedev = vbasedev;

    region->flags = info->flags;

    region->size = info->size;

    region->fd_offset = info->offset;

    region->nr = index;



    if (region->size) {

        region->mem = g_new0(MemoryRegion, 1);

        memory_region_init_io(region->mem, obj, &vfio_region_ops,

                              region, name, region->size);



        if (!vbasedev->no_mmap &&

            region->flags & VFIO_REGION_INFO_FLAG_MMAP &&

            !(region->size & ~qemu_real_host_page_mask)) {



            region->nr_mmaps = 1;

            region->mmaps = g_new0(VFIOMmap, region->nr_mmaps);



            region->mmaps[0].offset = 0;

            region->mmaps[0].size = region->size;

        }

    }



        *map = mmap(NULL, size, prot, MAP_SHARED,

                    vbasedev->fd,

                    region->fd_offset + offset);

        if (*map == MAP_FAILED) {

            *map = NULL;

            ret = -errno;

            goto empty_region;

    g_free(info);



    trace_vfio_region_setup(vbasedev->name, index, name,

                            region->flags, region->fd_offset, region->size);

    return 0;

}



        memory_region_init_ram_ptr(submem, obj, name, size, *map);

        memory_region_set_skip_dump(submem);

    } else {

empty_region:

        /* Create a zero sized sub-region to make cleanup easy. */

        memory_region_init(submem, obj, name, 0);

int vfio_region_mmap(VFIORegion *region)

{

    int i, prot = 0;

    char *name;



    if (!region->mem) {

        return 0;

    }



    memory_region_add_subregion(mem, offset, submem);

    prot |= region->flags & VFIO_REGION_INFO_FLAG_READ ? PROT_READ : 0;

    prot |= region->flags & VFIO_REGION_INFO_FLAG_WRITE ? PROT_WRITE : 0;



    for (i = 0; i < region->nr_mmaps; i++) {

        region->mmaps[i].mmap = mmap(NULL, region->mmaps[i].size, prot,

                                     MAP_SHARED, region->vbasedev->fd,

                                     region->fd_offset +

                                     region->mmaps[i].offset);

        if (region->mmaps[i].mmap == MAP_FAILED) {

            int ret = -errno;



            trace_vfio_region_mmap_fault(memory_region_name(region->mem), i,

                                         region->fd_offset +

                                         region->mmaps[i].offset,

                                         region->fd_offset +

                                         region->mmaps[i].offset +

                                         region->mmaps[i].size - 1, ret);



            region->mmaps[i].mmap = NULL;



            for (i--; i >= 0; i--) {

                memory_region_del_subregion(region->mem, &region->mmaps[i].mem);

                munmap(region->mmaps[i].mmap, region->mmaps[i].size);

                object_unparent(OBJECT(&region->mmaps[i].mem));

                region->mmaps[i].mmap = NULL;

            }



            return ret;

        }



        name = g_strdup_printf("%s mmaps[%d]",

                               memory_region_name(region->mem), i);

        memory_region_init_ram_ptr(&region->mmaps[i].mem,

                                   memory_region_owner(region->mem),

                                   name, region->mmaps[i].size,

                                   region->mmaps[i].mmap);

        g_free(name);

        memory_region_set_skip_dump(&region->mmaps[i].mem);

        memory_region_add_subregion(region->mem, region->mmaps[i].offset,

                                    &region->mmaps[i].mem);



        trace_vfio_region_mmap(memory_region_name(&region->mmaps[i].mem),

                               region->mmaps[i].offset,

                               region->mmaps[i].offset +

                               region->mmaps[i].size - 1);

    }



    return 0;

}



void vfio_region_exit(VFIORegion *region)

{

    int i;



    if (!region->mem) {

        return;

    }



    for (i = 0; i < region->nr_mmaps; i++) {

        if (region->mmaps[i].mmap) {

            memory_region_del_subregion(region->mem, &region->mmaps[i].mem);

        }

    }



    trace_vfio_region_exit(region->vbasedev->name, region->nr);

}



void vfio_region_finalize(VFIORegion *region)

{

    int i;



    if (!region->mem) {

        return;

    }



    for (i = 0; i < region->nr_mmaps; i++) {

        if (region->mmaps[i].mmap) {

            munmap(region->mmaps[i].mmap, region->mmaps[i].size);

            object_unparent(OBJECT(&region->mmaps[i].mem));

        }

    }



    object_unparent(OBJECT(region->mem));



    g_free(region->mem);

    g_free(region->mmaps);



    trace_vfio_region_finalize(region->vbasedev->name, region->nr);

}



void vfio_region_mmaps_set_enabled(VFIORegion *region, bool enabled)

{

    int i;



    if (!region->mem) {

        return;

    }



    for (i = 0; i < region->nr_mmaps; i++) {

        if (region->mmaps[i].mmap) {

            memory_region_set_enabled(&region->mmaps[i].mem, enabled);

        }

    }



    trace_vfio_region_mmaps_set_enabled(memory_region_name(region->mem),

                                        enabled);

}



void vfio_reset_handler(void *opaque)

{

    VFIOGroup *group;
@@ -959,6 +1075,24 @@ void vfio_put_base_device(VFIODevice *vbasedev) 
    close(vbasedev->fd);

}



int vfio_get_region_info(VFIODevice *vbasedev, int index,

                         struct vfio_region_info **info)

{

    size_t argsz = sizeof(struct vfio_region_info);



    *info = g_malloc0(argsz);



    (*info)->index = index;

    (*info)->argsz = argsz;



    if (ioctl(vbasedev->fd, VFIO_DEVICE_GET_REGION_INFO, *info)) {

        g_free(*info);

        return -errno;

    }



    return 0;

}



static int vfio_container_do_ioctl(AddressSpace *as, int32_t groupid,

                                   int req, void *param)

{

hw/vfio/pci-quirks.c

+31 −31
Original line number Diff line number Diff line
@@ -290,10 +290,10 @@ static void vfio_vga_probe_ati_3c3_quirk(VFIOPCIDevice *vdev) 


    memory_region_init_io(quirk->mem, OBJECT(vdev), &vfio_ati_3c3_quirk, vdev,

                          "vfio-ati-3c3-quirk", 1);

    memory_region_add_subregion(&vdev->vga.region[QEMU_PCI_VGA_IO_HI].mem,

    memory_region_add_subregion(&vdev->vga->region[QEMU_PCI_VGA_IO_HI].mem,

                                3 /* offset 3 bytes from 0x3c0 */, quirk->mem);



    QLIST_INSERT_HEAD(&vdev->vga.region[QEMU_PCI_VGA_IO_HI].quirks,

    QLIST_INSERT_HEAD(&vdev->vga->region[QEMU_PCI_VGA_IO_HI].quirks,

                      quirk, next);



    trace_vfio_quirk_ati_3c3_probe(vdev->vbasedev.name);
@@ -337,14 +337,14 @@ static void vfio_probe_ati_bar4_quirk(VFIOPCIDevice *vdev, int nr) 
    memory_region_init_io(window->addr_mem, OBJECT(vdev),

                          &vfio_generic_window_address_quirk, window,

                          "vfio-ati-bar4-window-address-quirk", 4);

    memory_region_add_subregion_overlap(&vdev->bars[nr].region.mem,

    memory_region_add_subregion_overlap(vdev->bars[nr].region.mem,

                                        window->address_offset,

                                        window->addr_mem, 1);



    memory_region_init_io(window->data_mem, OBJECT(vdev),

                          &vfio_generic_window_data_quirk, window,

                          "vfio-ati-bar4-window-data-quirk", 4);

    memory_region_add_subregion_overlap(&vdev->bars[nr].region.mem,

    memory_region_add_subregion_overlap(vdev->bars[nr].region.mem,

                                        window->data_offset,

                                        window->data_mem, 1);
@@ -378,7 +378,7 @@ static void vfio_probe_ati_bar2_quirk(VFIOPCIDevice *vdev, int nr) 
    memory_region_init_io(mirror->mem, OBJECT(vdev),

                          &vfio_generic_mirror_quirk, mirror,

                          "vfio-ati-bar2-4000-quirk", PCI_CONFIG_SPACE_SIZE);

    memory_region_add_subregion_overlap(&vdev->bars[nr].region.mem,

    memory_region_add_subregion_overlap(vdev->bars[nr].region.mem,

                                        mirror->offset, mirror->mem, 1);



    QLIST_INSERT_HEAD(&vdev->bars[nr].quirks, quirk, next);
@@ -428,7 +428,7 @@ static uint64_t vfio_nvidia_3d4_quirk_read(void *opaque, 


    quirk->state = NONE;



    return vfio_vga_read(&vdev->vga.region[QEMU_PCI_VGA_IO_HI],

    return vfio_vga_read(&vdev->vga->region[QEMU_PCI_VGA_IO_HI],

                         addr + 0x14, size);

}
@@ -465,7 +465,7 @@ static void vfio_nvidia_3d4_quirk_write(void *opaque, hwaddr addr, 
        break;

    }



    vfio_vga_write(&vdev->vga.region[QEMU_PCI_VGA_IO_HI],

    vfio_vga_write(&vdev->vga->region[QEMU_PCI_VGA_IO_HI],

                   addr + 0x14, data, size);

}
@@ -481,7 +481,7 @@ static uint64_t vfio_nvidia_3d0_quirk_read(void *opaque, 
    VFIONvidia3d0Quirk *quirk = opaque;

    VFIOPCIDevice *vdev = quirk->vdev;

    VFIONvidia3d0State old_state = quirk->state;

    uint64_t data = vfio_vga_read(&vdev->vga.region[QEMU_PCI_VGA_IO_HI],

    uint64_t data = vfio_vga_read(&vdev->vga->region[QEMU_PCI_VGA_IO_HI],

                                  addr + 0x10, size);



    quirk->state = NONE;
@@ -523,7 +523,7 @@ static void vfio_nvidia_3d0_quirk_write(void *opaque, hwaddr addr, 
        }

    }



    vfio_vga_write(&vdev->vga.region[QEMU_PCI_VGA_IO_HI],

    vfio_vga_write(&vdev->vga->region[QEMU_PCI_VGA_IO_HI],

                   addr + 0x10, data, size);

}
@@ -551,15 +551,15 @@ static void vfio_vga_probe_nvidia_3d0_quirk(VFIOPCIDevice *vdev) 


    memory_region_init_io(&quirk->mem[0], OBJECT(vdev), &vfio_nvidia_3d4_quirk,

                          data, "vfio-nvidia-3d4-quirk", 2);

    memory_region_add_subregion(&vdev->vga.region[QEMU_PCI_VGA_IO_HI].mem,

    memory_region_add_subregion(&vdev->vga->region[QEMU_PCI_VGA_IO_HI].mem,

                                0x14 /* 0x3c0 + 0x14 */, &quirk->mem[0]);



    memory_region_init_io(&quirk->mem[1], OBJECT(vdev), &vfio_nvidia_3d0_quirk,

                          data, "vfio-nvidia-3d0-quirk", 2);

    memory_region_add_subregion(&vdev->vga.region[QEMU_PCI_VGA_IO_HI].mem,

    memory_region_add_subregion(&vdev->vga->region[QEMU_PCI_VGA_IO_HI].mem,

                                0x10 /* 0x3c0 + 0x10 */, &quirk->mem[1]);



    QLIST_INSERT_HEAD(&vdev->vga.region[QEMU_PCI_VGA_IO_HI].quirks,

    QLIST_INSERT_HEAD(&vdev->vga->region[QEMU_PCI_VGA_IO_HI].quirks,

                      quirk, next);



    trace_vfio_quirk_nvidia_3d0_probe(vdev->vbasedev.name);
@@ -683,7 +683,7 @@ static void vfio_probe_nvidia_bar5_quirk(VFIOPCIDevice *vdev, int nr) 
    memory_region_init_io(window->addr_mem, OBJECT(vdev),

                          &vfio_generic_window_address_quirk, window,

                          "vfio-nvidia-bar5-window-address-quirk", 4);

    memory_region_add_subregion_overlap(&vdev->bars[nr].region.mem,

    memory_region_add_subregion_overlap(vdev->bars[nr].region.mem,

                                        window->address_offset,

                                        window->addr_mem, 1);

    memory_region_set_enabled(window->addr_mem, false);
@@ -691,7 +691,7 @@ static void vfio_probe_nvidia_bar5_quirk(VFIOPCIDevice *vdev, int nr) 
    memory_region_init_io(window->data_mem, OBJECT(vdev),

                          &vfio_generic_window_data_quirk, window,

                          "vfio-nvidia-bar5-window-data-quirk", 4);

    memory_region_add_subregion_overlap(&vdev->bars[nr].region.mem,

    memory_region_add_subregion_overlap(vdev->bars[nr].region.mem,

                                        window->data_offset,

                                        window->data_mem, 1);

    memory_region_set_enabled(window->data_mem, false);
@@ -699,13 +699,13 @@ static void vfio_probe_nvidia_bar5_quirk(VFIOPCIDevice *vdev, int nr) 
    memory_region_init_io(&quirk->mem[2], OBJECT(vdev),

                          &vfio_nvidia_bar5_quirk_master, bar5,

                          "vfio-nvidia-bar5-master-quirk", 4);

    memory_region_add_subregion_overlap(&vdev->bars[nr].region.mem,

    memory_region_add_subregion_overlap(vdev->bars[nr].region.mem,

                                        0, &quirk->mem[2], 1);



    memory_region_init_io(&quirk->mem[3], OBJECT(vdev),

                          &vfio_nvidia_bar5_quirk_enable, bar5,

                          "vfio-nvidia-bar5-enable-quirk", 4);

    memory_region_add_subregion_overlap(&vdev->bars[nr].region.mem,

    memory_region_add_subregion_overlap(vdev->bars[nr].region.mem,

                                        4, &quirk->mem[3], 1);



    QLIST_INSERT_HEAD(&vdev->bars[nr].quirks, quirk, next);
@@ -767,7 +767,7 @@ static void vfio_probe_nvidia_bar0_quirk(VFIOPCIDevice *vdev, int nr) 
                          &vfio_nvidia_mirror_quirk, mirror,

                          "vfio-nvidia-bar0-88000-mirror-quirk",

                          vdev->config_size);

    memory_region_add_subregion_overlap(&vdev->bars[nr].region.mem,

    memory_region_add_subregion_overlap(vdev->bars[nr].region.mem,

                                        mirror->offset, mirror->mem, 1);



    QLIST_INSERT_HEAD(&vdev->bars[nr].quirks, quirk, next);
@@ -786,7 +786,7 @@ static void vfio_probe_nvidia_bar0_quirk(VFIOPCIDevice *vdev, int nr) 
                              &vfio_nvidia_mirror_quirk, mirror,

                              "vfio-nvidia-bar0-1800-mirror-quirk",

                              PCI_CONFIG_SPACE_SIZE);

        memory_region_add_subregion_overlap(&vdev->bars[nr].region.mem,

        memory_region_add_subregion_overlap(vdev->bars[nr].region.mem,

                                            mirror->offset, mirror->mem, 1);



        QLIST_INSERT_HEAD(&vdev->bars[nr].quirks, quirk, next);
@@ -947,13 +947,13 @@ static void vfio_probe_rtl8168_bar2_quirk(VFIOPCIDevice *vdev, int nr) 
    memory_region_init_io(&quirk->mem[0], OBJECT(vdev),

                          &vfio_rtl_address_quirk, rtl,

                          "vfio-rtl8168-window-address-quirk", 4);

    memory_region_add_subregion_overlap(&vdev->bars[nr].region.mem,

    memory_region_add_subregion_overlap(vdev->bars[nr].region.mem,

                                        0x74, &quirk->mem[0], 1);



    memory_region_init_io(&quirk->mem[1], OBJECT(vdev),

                          &vfio_rtl_data_quirk, rtl,

                          "vfio-rtl8168-window-data-quirk", 4);

    memory_region_add_subregion_overlap(&vdev->bars[nr].region.mem,

    memory_region_add_subregion_overlap(vdev->bars[nr].region.mem,

                                        0x70, &quirk->mem[1], 1);



    QLIST_INSERT_HEAD(&vdev->bars[nr].quirks, quirk, next);
@@ -970,28 +970,28 @@ void vfio_vga_quirk_setup(VFIOPCIDevice *vdev) 
    vfio_vga_probe_nvidia_3d0_quirk(vdev);

}



void vfio_vga_quirk_teardown(VFIOPCIDevice *vdev)

void vfio_vga_quirk_exit(VFIOPCIDevice *vdev)

{

    VFIOQuirk *quirk;

    int i, j;



    for (i = 0; i < ARRAY_SIZE(vdev->vga.region); i++) {

        QLIST_FOREACH(quirk, &vdev->vga.region[i].quirks, next) {

    for (i = 0; i < ARRAY_SIZE(vdev->vga->region); i++) {

        QLIST_FOREACH(quirk, &vdev->vga->region[i].quirks, next) {

            for (j = 0; j < quirk->nr_mem; j++) {

                memory_region_del_subregion(&vdev->vga.region[i].mem,

                memory_region_del_subregion(&vdev->vga->region[i].mem,

                                            &quirk->mem[j]);

            }

        }

    }

}



void vfio_vga_quirk_free(VFIOPCIDevice *vdev)

void vfio_vga_quirk_finalize(VFIOPCIDevice *vdev)

{

    int i, j;



    for (i = 0; i < ARRAY_SIZE(vdev->vga.region); i++) {

        while (!QLIST_EMPTY(&vdev->vga.region[i].quirks)) {

            VFIOQuirk *quirk = QLIST_FIRST(&vdev->vga.region[i].quirks);

    for (i = 0; i < ARRAY_SIZE(vdev->vga->region); i++) {

        while (!QLIST_EMPTY(&vdev->vga->region[i].quirks)) {

            VFIOQuirk *quirk = QLIST_FIRST(&vdev->vga->region[i].quirks);

            QLIST_REMOVE(quirk, next);

            for (j = 0; j < quirk->nr_mem; j++) {

                object_unparent(OBJECT(&quirk->mem[j]));
@@ -1012,7 +1012,7 @@ void vfio_bar_quirk_setup(VFIOPCIDevice *vdev, int nr) 
    vfio_probe_rtl8168_bar2_quirk(vdev, nr);

}



void vfio_bar_quirk_teardown(VFIOPCIDevice *vdev, int nr)

void vfio_bar_quirk_exit(VFIOPCIDevice *vdev, int nr)

{

    VFIOBAR *bar = &vdev->bars[nr];

    VFIOQuirk *quirk;
@@ -1020,12 +1020,12 @@ void vfio_bar_quirk_teardown(VFIOPCIDevice *vdev, int nr) 


    QLIST_FOREACH(quirk, &bar->quirks, next) {

        for (i = 0; i < quirk->nr_mem; i++) {

            memory_region_del_subregion(&bar->region.mem, &quirk->mem[i]);

            memory_region_del_subregion(bar->region.mem, &quirk->mem[i]);

        }

    }

}



void vfio_bar_quirk_free(VFIOPCIDevice *vdev, int nr)

void vfio_bar_quirk_finalize(VFIOPCIDevice *vdev, int nr)

{

    VFIOBAR *bar = &vdev->bars[nr];

    int i;

hw/vfio/pci.c

+270 −258

File changed.

Preview size limit exceeded, changes collapsed.