Commit 29741be3 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20170710.0' into staging 



VFIO fixes 2017-07-10

 - Don't iterate over non-realized devices (Alex Williamson)
 - Add PCIe capability version fixup (Alex Williamson)

# gpg: Signature made Mon 10 Jul 2017 20:06:11 BST
# gpg:                using RSA key 0x239B9B6E3BB08B22
# 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>"
# Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B  8A90 239B 9B6E 3BB0 8B22

* remotes/awilliam/tags/vfio-updates-20170710.0:
  vfio/pci: Fixup v0 PCIe capabilities
  vfio: Test realized when using VFIOGroup.device_list iterator

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b5ed2e11 47985727

hw/vfio/common.c

+4 −2
Original line number Diff line number Diff line
@@ -858,13 +858,15 @@ void vfio_reset_handler(void *opaque) 


    QLIST_FOREACH(group, &vfio_group_list, next) {

        QLIST_FOREACH(vbasedev, &group->device_list, next) {

            if (vbasedev->dev->realized) {

                vbasedev->ops->vfio_compute_needs_reset(vbasedev);

            }

        }

    }



    QLIST_FOREACH(group, &vfio_group_list, next) {

        QLIST_FOREACH(vbasedev, &group->device_list, next) {

            if (vbasedev->needs_reset) {

            if (vbasedev->dev->realized && vbasedev->needs_reset) {

                vbasedev->ops->vfio_hot_reset_multi(vbasedev);

            }

        }

hw/vfio/pci.c

+17 −2
Original line number Diff line number Diff line
@@ -1743,6 +1743,18 @@ static int vfio_setup_pcie_cap(VFIOPCIDevice *vdev, int pos, uint8_t size, 
                               PCI_EXP_LNKCAP_MLW | PCI_EXP_LNKCAP_SLS);

    }



    /*

     * Intel 82599 SR-IOV VFs report an invalid PCIe capability version 0

     * (Niantic errate #35) causing Windows to error with a Code 10 for the

     * device on Q35.  Fixup any such devices to report version 1.  If we

     * were to remove the capability entirely the guest would lose extended

     * config space.

     */

    if ((flags & PCI_EXP_FLAGS_VERS) == 0) {

        vfio_add_emulated_word(vdev, pos + PCI_CAP_FLAGS,

                               1, PCI_EXP_FLAGS_VERS);

    }



    pos = pci_add_capability(&vdev->pdev, PCI_CAP_ID_EXP, pos, size,

                             errp);

    if (pos < 0) {
@@ -2116,7 +2128,8 @@ static int vfio_pci_hot_reset(VFIOPCIDevice *vdev, bool single) 


        /* Prep dependent devices for reset and clear our marker. */

        QLIST_FOREACH(vbasedev_iter, &group->device_list, next) {

            if (vbasedev_iter->type != VFIO_DEVICE_TYPE_PCI) {

            if (!vbasedev_iter->dev->realized ||

                vbasedev_iter->type != VFIO_DEVICE_TYPE_PCI) {

                continue;

            }

            tmp = container_of(vbasedev_iter, VFIOPCIDevice, vbasedev);
@@ -2197,7 +2210,8 @@ out: 
        }



        QLIST_FOREACH(vbasedev_iter, &group->device_list, next) {

            if (vbasedev_iter->type != VFIO_DEVICE_TYPE_PCI) {

            if (!vbasedev_iter->dev->realized ||

                vbasedev_iter->type != VFIO_DEVICE_TYPE_PCI) {

                continue;

            }

            tmp = container_of(vbasedev_iter, VFIOPCIDevice, vbasedev);
@@ -2647,6 +2661,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp) 
    vdev->vbasedev.name = g_strdup(basename(vdev->vbasedev.sysfsdev));

    vdev->vbasedev.ops = &vfio_pci_ops;

    vdev->vbasedev.type = VFIO_DEVICE_TYPE_PCI;

    vdev->vbasedev.dev = &vdev->pdev.qdev;



    tmp = g_strdup_printf("%s/iommu_group", vdev->vbasedev.sysfsdev);

    len = readlink(tmp, group_path, sizeof(group_path));

hw/vfio/platform.c

+1 −0
Original line number Diff line number Diff line
@@ -640,6 +640,7 @@ static void vfio_platform_realize(DeviceState *dev, Error **errp) 
    int i, ret;



    vbasedev->type = VFIO_DEVICE_TYPE_PLATFORM;

    vbasedev->dev = dev;

    vbasedev->ops = &vfio_platform_ops;



    trace_vfio_platform_realize(vbasedev->sysfsdev ?

include/hw/vfio/vfio-common.h

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ typedef struct VFIODevice { 
    struct VFIOGroup *group;

    char *sysfsdev;

    char *name;

    DeviceState *dev;

    int fd;

    int type;

    bool reset_works;