[qemu-xen master] vfio: Fix vfio-kvm group registration

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view

[qemu-xen master] vfio: Fix vfio-kvm group registration

commit d6f1448277ac228dcc60346204d88363c94a1e3c
Author:     Alex Williamson <[hidden email]>
AuthorDate: Wed Dec 13 10:19:32 2017 -0700
Commit:     Michael Roth <[hidden email]>
CommitDate: Tue Jan 9 11:09:36 2018 -0600

    vfio: Fix vfio-kvm group registration
    Commit 8c37faa475f3 ("vfio-pci, ppc64/spapr: Reorder group-to-container
    attaching") moved registration of groups with the vfio-kvm device from
    vfio_get_group() to vfio_connect_container(), but it missed the case
    where a group is attached to an existing container and takes an early
    exit.  Perhaps this is a less common case on ppc64/spapr, but on x86
    (without viommu) all groups are connected to the same container and
    thus only the first group gets registered with the vfio-kvm device.
    This becomes a problem if we then hot-unplug the devices associated
    with that first group and we end up with KVM being misinformed about
    any vfio connections that might remain.  Fix by including the call to
    vfio_kvm_device_add_group() in this early exit path.
    Fixes: 8c37faa475f3 ("vfio-pci, ppc64/spapr: Reorder group-to-container attaching")
    Cc: [hidden email] # qemu-2.10+
    Reviewed-by: Alexey Kardashevskiy <[hidden email]>
    Reviewed-by: Peter Xu <[hidden email]>
    Tested-by: Peter Xu <[hidden email]>
    Reviewed-by: Eric Auger <[hidden email]>
    Tested-by: Eric Auger <[hidden email]>
    Signed-off-by: Alex Williamson <[hidden email]>
    (cherry picked from commit 2016986aedb6ea2839662eb5f60630f3e231bd1a)
    Signed-off-by: Michael Roth <[hidden email]>
 hw/vfio/common.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 7b2924c..7007878 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -968,6 +968,7 @@ static int vfio_connect_container(VFIOGroup *group, AddressSpace *as,
         if (!ioctl(group->fd, VFIO_GROUP_SET_CONTAINER, &container->fd)) {
             group->container = container;
             QLIST_INSERT_HEAD(&container->group_list, group, container_next);
+            vfio_kvm_device_add_group(group);
             return 0;
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

Xen-changelog mailing list
[hidden email]