[Qemu-commits] [qemu/qemu] 201698: vfio: Fix vfio-kvm group registration

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 2016986aedb6ea2839662eb5f60630f3e231bd1a
      
https://github.com/qemu/qemu/commit/2016986aedb6ea2839662eb5f60630f3e231bd1a
  Author: Alex Williamson <address@hidden>
  Date:   2017-12-13 (Wed, 13 Dec 2017)

  Changed paths:
    M hw/vfio/common.c

  Log Message:
  -----------
  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: address@hidden # qemu-2.10+
Reviewed-by: Alexey Kardashevskiy <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Tested-by: Peter Xu <address@hidden>
Reviewed-by: Eric Auger <address@hidden>
Tested-by: Eric Auger <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: f7f9c7b23243fef21296d04d03df1477d12c5c19
      
https://github.com/qemu/qemu/commit/f7f9c7b23243fef21296d04d03df1477d12c5c19
  Author: Liu, Yi L <address@hidden>
  Date:   2017-12-13 (Wed, 13 Dec 2017)

  Changed paths:
    M hw/vfio/common.c

  Log Message:
  -----------
  vfio/common: init giommu_list and hostwin_list of vfio container

The init of giommu_list and hostwin_list is missed during container
initialization.

Signed-off-by: Liu, Yi L <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: c6e7958eb76ed267f7254b97f89773874df50e48
      
https://github.com/qemu/qemu/commit/c6e7958eb76ed267f7254b97f89773874df50e48
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2017-12-13 (Wed, 13 Dec 2017)

  Changed paths:
    M hw/vfio/common.c

  Log Message:
  -----------
  vfio/spapr: Allow fallback to SPAPR TCE IOMMU v1

The vfio_iommu_spapr_tce driver advertises kernel's support for
v1 and v2 IOMMU support, however it is not always possible to use
the requested IOMMU type. For example, a pseries host platform does not
support dynamic DMA windows so v2 cannot initialize and QEMU fails to
start.

This adds a fallback to the v1 IOMMU if v2 cannot be used.

Fixes: 318f67ce1371 ("vfio: spapr: Add DMA memory preregistering (SPAPR IOMMU 
v2)")
Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: 2fb9636ebf24e695617bf407bf0a345aa223d1ac
      
https://github.com/qemu/qemu/commit/2fb9636ebf24e695617bf407bf0a345aa223d1ac
  Author: Alexey Kardashevskiy <address@hidden>
  Date:   2017-12-13 (Wed, 13 Dec 2017)

  Changed paths:
    M hw/vfio/pci.h

  Log Message:
  -----------
  vfio-pci: Remove unused fields from VFIOMSIXInfo

When support for multiple mappings per a region were added, this was
left behind, let's finish and remove unused bits.

Fixes: db0da029a185 ("vfio: Generalize region support")
Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>


  Commit: f44cedc9166d89c73287c038311a989fb3c39e03
      
https://github.com/qemu/qemu/commit/f44cedc9166d89c73287c038311a989fb3c39e03
  Author: Peter Maydell <address@hidden>
  Date:   2017-12-14 (Thu, 14 Dec 2017)

  Changed paths:
    M hw/vfio/common.c
    M hw/vfio/pci.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20171213.0' 
into staging

VFIO updates for v2.12

 - Fix bug failing to register all but the first group attached to
   a container with kvm-vfio device (Alex Williamson)

 - Explicit QLIST init (Yi Lui)

 - SPAPR IOMMU v1 fallback (Alexey Kardashevskiy)

 - Remove unused structure fields (Alexey Kardashevskiy)

# gpg: Signature made Wed 13 Dec 2017 18:03:48 GMT
# gpg:                using RSA key 0x239B9B6E3BB08B22
# gpg: Good signature from "Alex Williamson <address@hidden>"
# gpg:                 aka "Alex Williamson <address@hidden>"
# gpg:                 aka "Alex Williamson <address@hidden>"
# gpg:                 aka "Alex Williamson <address@hidden>"
# Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B  8A90 239B 9B6E 3BB0 8B22

* remotes/awilliam/tags/vfio-update-20171213.0:
  vfio-pci: Remove unused fields from VFIOMSIXInfo
  vfio/spapr: Allow fallback to SPAPR TCE IOMMU v1
  vfio/common: init giommu_list and hostwin_list of vfio container
  vfio: Fix vfio-kvm group registration

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/cba4d6d3181f...f44cedc9166d