[Qemu-commits] [qemu/qemu] 45461a: virtio-iommu: Fix the partial copy of probe request

[Richard Henderson]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 45461aace83d961e933b27519b81d17b4c690514
      
https://github.com/qemu/qemu/commit/45461aace83d961e933b27519b81d17b4c690514
  Author: Zhenzhong Duan <zhenzhong.duan@intel.com>
  Date:   2022-06-27 (Mon, 27 Jun 2022)

  Changed paths:
    M hw/virtio/virtio-iommu.c

  Log Message:
  -----------
  virtio-iommu: Fix the partial copy of probe request

The structure of probe request doesn't include the tail, this leads
to a few field missed to be copied. Currently this isn't an issue as
those missed field belong to reserved field, just in case reserved
field will be used in the future.

Changed 4th parameter of virtio_iommu_iov_to_req() to receive size
of device-readable part.

Fixes: 1733eebb9e75b ("virtio-iommu: Implement RESV_MEM probe request")
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Message-Id: <20220623023152.3473231-1-zhenzhong.duan@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>


  Commit: 71e3d004824724fe55cd1c4dba34477361a38319
      
https://github.com/qemu/qemu/commit/71e3d004824724fe55cd1c4dba34477361a38319
  Author: Jagannathan Raman <jag.raman@oracle.com>
  Date:   2022-06-27 (Mon, 27 Jun 2022)

  Changed paths:
    M hw/pci/msi.c

  Log Message:
  -----------
  msi: fix MSI vector limit check in msi_set_mask()

MSI supports a maximum of PCI_MSI_VECTORS_MAX vectors - from 0 to
PCI_MSI_VECTORS_MAX - 1.

msi_set_mask() was previously using PCI_MSI_VECTORS_MAX as the upper
limit for MSI vectors. Fix the upper limit to PCI_MSI_VECTORS_MAX - 1.

Fixes: Coverity CID 1490141
Fixes: 08cf3dc61199 vfio-user: handle device interrupts

Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Message-Id: <20220623153844.7367-1-jag.raman@oracle.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 60dc3c5be9ce67f4195c432b22a88d8af6429d80
      
https://github.com/qemu/qemu/commit/60dc3c5be9ce67f4195c432b22a88d8af6429d80
  Author: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
  Date:   2022-06-27 (Mon, 27 Jun 2022)

  Changed paths:
    M hw/virtio/vhost-backend.c
    M hw/virtio/vhost-user.c
    M include/hw/virtio/vhost-backend.h

  Log Message:
  -----------
  vhost: add method vhost_set_vring_err

Kernel and user vhost may report virtqueue errors via eventfd.
This is only reliable way to get notification about protocol error.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Message-Id: <20220623161325.18813-2-vsementsov@yandex-team.ru>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Roman Kagan <rvkagan@yandex-team.ru>


  Commit: ae50ae0b91bb5bebb0d074afaecba027d8da16a1
      
https://github.com/qemu/qemu/commit/ae50ae0b91bb5bebb0d074afaecba027d8da16a1
  Author: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
  Date:   2022-06-27 (Mon, 27 Jun 2022)

  Changed paths:
    M hw/virtio/vhost.c
    M include/hw/virtio/vhost.h

  Log Message:
  -----------
  vhost: setup error eventfd and dump errors

Vhost has error notifications, let's log them like other errors.
For each virt-queue setup eventfd for vring error notifications.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
[vsementsov: rename patch, change commit message  and dump error like
             other errors in the file]
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-Id: <20220623161325.18813-3-vsementsov@yandex-team.ru>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Roman Kagan <rvkagan@yandex-team.ru>


  Commit: d355566bd958e24e7e384da6ea89a9fc88d7bfed
      
https://github.com/qemu/qemu/commit/d355566bd958e24e7e384da6ea89a9fc88d7bfed
  Author: Zhenzhong Duan <zhenzhong.duan@intel.com>
  Date:   2022-06-27 (Mon, 27 Jun 2022)

  Changed paths:
    M hw/virtio/virtio-iommu.c

  Log Message:
  -----------
  virtio-iommu: Fix migration regression

We also need to switch to the right address space on dest side
after loading the device status. DMA to wrong address space is
destructive.

Fixes: 3facd774962fd ("virtio-iommu: Add bypass mode support to assigned 
device")
Suggested-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Message-Id: <20220624093740.3525267-1-zhenzhong.duan@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>


  Commit: ea0622060073b7bedda4a54312eeb6189983d1e3
      
https://github.com/qemu/qemu/commit/ea0622060073b7bedda4a54312eeb6189983d1e3
  Author: Kevin Wolf <kwolf@redhat.com>
  Date:   2022-06-27 (Mon, 27 Jun 2022)

  Changed paths:
    M docs/interop/vhost-user.rst

  Log Message:
  -----------
  docs/vhost-user: Fix mismerge

This reverts commit 76b1b64370007234279ea4cc8b09c98cbd2523de.

The commit only duplicated some text that had already been merged in
commit 31009d13cc5.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20220627134500.94842-2-kwolf@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>


  Commit: 69a5daec06f423843ce1bb9be5fb049314996f78
      
https://github.com/qemu/qemu/commit/69a5daec06f423843ce1bb9be5fb049314996f78
  Author: Kevin Wolf <kwolf@redhat.com>
  Date:   2022-06-27 (Mon, 27 Jun 2022)

  Changed paths:
    M subprojects/libvhost-user/libvhost-user.c

  Log Message:
  -----------
  libvhost-user: Fix VHOST_USER_GET_MAX_MEM_SLOTS reply

With REPLY_NEEDED, libvhost-user sends both the acutal result and an
additional ACK reply for VHOST_USER_GET_MAX_MEM_SLOTS. This is
incorrect, the spec mandates that it behave the same with and without
REPLY_NEEDED because it always sends a reply.

Fixes: 6fb2e173d20c9bbb5466183d33a3ad7dcd0375fa
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20220627134500.94842-3-kwolf@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>


  Commit: 7f27d20ded2f480f3e66d03f90ea71507b834276
      
https://github.com/qemu/qemu/commit/7f27d20ded2f480f3e66d03f90ea71507b834276
  Author: Kevin Wolf <kwolf@redhat.com>
  Date:   2022-06-27 (Mon, 27 Jun 2022)

  Changed paths:
    M subprojects/libvhost-user/libvhost-user.c

  Log Message:
  -----------
  libvhost-user: Fix VHOST_USER_ADD_MEM_REG reply

With REPLY_NEEDED, libvhost-user sends both the acutal result and an
additional ACK reply for VHOST_USER_ADD_MEM_REG. This is incorrect, the
spec mandates that it behave the same with and without REPLY_NEEDED
because it always sends a reply.

Fixes: ec94c8e621de96c50c2d381c8c9ec94f5beec7c1
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20220627134500.94842-4-kwolf@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>


  Commit: 2fcd005ff0529efa0580165ab45a94b4195834a2
      
https://github.com/qemu/qemu/commit/2fcd005ff0529efa0580165ab45a94b4195834a2
  Author: David Hildenbrand <david@redhat.com>
  Date:   2022-06-27 (Mon, 27 Jun 2022)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: Collect memory device files in "Memory devices"

Xiao Guangrong doesn't have enough time to actively review or contribute
to our NVDIMM implementation. Let's dissolve the "NVDIMM" section, moving
relevant ACPI parts to "ACPI/SMBIOS" and moving memory device stuff into a
new "Memory devices" section. Make that new section cover other memory
device stuff as well.

We can now drop the "hw/mem/*" rule from "ACPI/SMBIOS". Note that
hw/acpi/nvdimm.c is already covered by "ACPI/SMBIOS".

The following files in hw/mem don't fall into the TYPE_MEMPORY_DEVICE
category:
* hw/mem/cxl_type3.c is CXL specific and belongs to "Compute Express Link"
* hw/mem/sparse-mem.c is already covered by "Device Fuzzing"
* hw/mem/npcm7xx_mc.c is already covered by "Nuvoton NPCM7xx"

Thanks Xiao for your work on NVDIMM!

Cc: Ben Widawsky <ben.widawsky@intel.com>
Cc: Jonathan Cameron <jonathan.cameron@huawei.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Ani Sinha <ani@anisinha.ca>
Cc: Xiao Guangrong <xiaoguangrong.eric@gmail.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Julia Suvorova <jusual@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20220617123151.103033-1-david@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>


  Commit: 26ed501b9958cd319b75231ace8f883cd9331e9d
      
https://github.com/qemu/qemu/commit/26ed501b9958cd319b75231ace8f883cd9331e9d
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-06-27 (Mon, 27 Jun 2022)

  Changed paths:
    M contrib/vhost-user-blk/meson.build
    M contrib/vhost-user-blk/vhost-user-blk.c
    M meson.build

  Log Message:
  -----------
  contrib/vhost-user-blk: fix 32 bit build and enable

We were not building the vhost-user-blk server due to 32 bit
compilation problems. The problem was due to format string types so
fix that and then enable the build. Tweak the rule to follow the same
rules as other vhost-user daemons.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220321153037.3622127-12-alex.bennee@linaro.org>
Message-Id: <20220524154056.2896913-2-alex.bennee@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>


  Commit: 2055c2a454b4265a7aa360212a75d4731f98429a
      
https://github.com/qemu/qemu/commit/2055c2a454b4265a7aa360212a75d4731f98429a
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-06-27 (Mon, 27 Jun 2022)

  Changed paths:
    M include/hw/virtio/vhost.h

  Log Message:
  -----------
  include/hw/virtio: document vhost_get_features

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220524154056.2896913-4-alex.bennee@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 81cf38f3ff3c7db8fcd2f46df9a294fdf6f4a910
      
https://github.com/qemu/qemu/commit/81cf38f3ff3c7db8fcd2f46df9a294fdf6f4a910
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2022-06-27 (Mon, 27 Jun 2022)

  Changed paths:
    M include/hw/virtio/vhost.h

  Log Message:
  -----------
  include/hw/virtio: document vhost_ack_features

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220524154056.2896913-5-alex.bennee@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 2a8835cb45371a1f05c9c5899741d66685290f28
      
https://github.com/qemu/qemu/commit/2a8835cb45371a1f05c9c5899741d66685290f28
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2022-06-28 (Tue, 28 Jun 2022)

  Changed paths:
    M MAINTAINERS
    M contrib/vhost-user-blk/meson.build
    M contrib/vhost-user-blk/vhost-user-blk.c
    M docs/interop/vhost-user.rst
    M hw/pci/msi.c
    M hw/virtio/vhost-backend.c
    M hw/virtio/vhost-user.c
    M hw/virtio/vhost.c
    M hw/virtio/virtio-iommu.c
    M include/hw/virtio/vhost-backend.h
    M include/hw/virtio/vhost.h
    M meson.build
    M subprojects/libvhost-user/libvhost-user.c

  Log Message:
  -----------
  Merge tag 'for_upstream' of git://git.kernel.org/pub/scm/virt/kvm/mst/qemu 
into staging

virtio: fixes

fixes all over the place

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# -----BEGIN PGP SIGNATURE-----
#
# iQFDBAABCAAtFiEEXQn9CHHI+FuUyooNKB8NuNKNVGkFAmK6NQoPHG1zdEByZWRo
# YXQuY29tAAoJECgfDbjSjVRp/sQIAJGiYliUHElJapM/4KSsXKWCFtk9B8wJuUie
# yeMKOdD6QSk9tk/HkYSCnMB7G6Fe+MtoE+sPm/6l5nOFqvqVVJw9vOKteWHSpQ0E
# 9CgbR7s7K1MoLG9J613iB2OtAfhPrWEvSOJ6mvTAxGgxhCQw6UzC88cYfBHJ/efn
# GAhVlriSfSCRANmivjY+g4h4JFWWSMTH6m9u4wKBJF8GRkNgN+C50Z+bp8aE7wRT
# KiMoaaYUDOjxzD+8nGYggg/t+UIM7jG2t8M5BMbC0NMP+ovVZeesWK6ZOzoda2tI
# ZONV0dLikLCicyOvfMH6YDqzGtchCDmS0hpfuorhlzsntm42RBM=
# =T+gr
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 28 Jun 2022 04:24:02 AM +0530
# gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg:                issuer "mst@redhat.com"
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [undefined]
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* tag 'for_upstream' of git://git.kernel.org/pub/scm/virt/kvm/mst/qemu:
  include/hw/virtio: document vhost_ack_features
  include/hw/virtio: document vhost_get_features
  contrib/vhost-user-blk: fix 32 bit build and enable
  MAINTAINERS: Collect memory device files in "Memory devices"
  libvhost-user: Fix VHOST_USER_ADD_MEM_REG reply
  libvhost-user: Fix VHOST_USER_GET_MAX_MEM_SLOTS reply
  docs/vhost-user: Fix mismerge
  virtio-iommu: Fix migration regression
  vhost: setup error eventfd and dump errors
  vhost: add method vhost_set_vring_err
  msi: fix MSI vector limit check in msi_set_mask()
  virtio-iommu: Fix the partial copy of probe request

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/ad4c7f529a27...2a8835cb4537