[Qemu-commits] [qemu/qemu] 4a3f03: virtio-net: enable ioeventfd even if vhost=off

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 4a3f03ba8dbf53fce36d0c1dd5d0cc0f340fe5f3
      
https://github.com/qemu/qemu/commit/4a3f03ba8dbf53fce36d0c1dd5d0cc0f340fe5f3
  Author: Paolo Bonzini <address@hidden>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

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

  Log Message:
  -----------
  virtio-net: enable ioeventfd even if vhost=off

virtio-net-pci does not enable ioeventfd for historical reasons (and
nobody ever checked whether it should be revisited).  Note that other
backends do enable ioeventfd for virtio-net.

However, it has a major effect on performance.  On Windows, throughput is
_multiplied_ by 2 or 3 on TCP_STREAM (on small packets it is "only" a 30%
improvement) and a little less so on TCP_MAERTS albeit still very much
statistically significant.  Latency also has a single digit improvement.

This is not visible when using vhost, which forces ioeventfd=on, but it
is substantial without vhost.  In addition, also on Windows and with the
RHEL 7.3 kernel, APICv seems to slow down virtio-net performance a bit,
but the penalty with this patch goes from -25% to -7%.

Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 332fa82d0963409fa14997a02639289afa226596
      
https://github.com/qemu/qemu/commit/332fa82d0963409fa14997a02639289afa226596
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M hw/virtio/virtio.c

  Log Message:
  -----------
  Revert "virtio: turn vq->notification into a nested counter"

This reverts commit aff8fd18f1786fc5af259a9bc0077727222f51ca.

Both virtio-net and virtio-crypto do not balance
virtio_queue_set_notification() enable and disable calls.  This makes
the notifications_disabled counter unreliable and Doug Goldstein
reported the following assertion failure:

  #3  0x00007ffff44d1c62 in __GI___assert_fail (
      address@hidden "vq->notification_disabled > 0",
      address@hidden "/home/doug/work/qemu/hw/virtio/virtio.c",
      address@hidden,
      address@hidden <__PRETTY_FUNCTION__.43707>
      "virtio_queue_set_notification") at assert.c:101
  #4  0x00005555557f25d6 in virtio_queue_set_notification (vq=0x55555666aa90,
      address@hidden) at /home/doug/work/qemu/hw/virtio/virtio.c:215
  #5  0x00005555557dc311 in virtio_net_has_buffers (q=<optimized out>,
      q=<optimized out>, bufsize=102)
      at /home/doug/work/qemu/hw/net/virtio-net.c:1008
  #6  virtio_net_receive (nc=<optimized out>, buf=0x555557386b88 "", size=102)
      at /home/doug/work/qemu/hw/net/virtio-net.c:1148
  #7  0x00005555559cad33 in nc_sendv_compat (flags=<optimized out>, iovcnt=1,
      iov=0x7fffead746d0, nc=0x55555788b340) at net/net.c:705
  #8  qemu_deliver_packet_iov (sender=<optimized out>, flags=<optimized out>,
      iov=0x7fffead746d0, iovcnt=1, opaque=0x55555788b340) at net/net.c:732
  #9  0x00005555559cd929 in qemu_net_queue_deliver (size=<optimized out>,
      data=<optimized out>, flags=<optimized out>, sender=<optimized out>,
      queue=0x55555788b550) at net/queue.c:164
  #10 qemu_net_queue_flush (queue=0x55555788b550) at net/queue.c:261

This patch is safe to revert since it's just an optimization for
virtqueue polling.  The next patch will improve the situation again
without resorting to nesting.

Reported-by: Doug Goldstein <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Tested-by: Richard Henderson <address@hidden>
Tested-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 1448c133e19372359d9de68626c06088ba79a34b
      
https://github.com/qemu/qemu/commit/1448c133e19372359d9de68626c06088ba79a34b
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M hw/virtio/virtio.c

  Log Message:
  -----------
  virtio: disable notifications again after poll succeeded

While AioContext is in polling mode virtqueue notifications are not
necessary.  Some device virtqueue handlers enable notifications.  Make
sure they stay disabled to avoid unnecessary vmexits.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Tested-by: Richard Henderson <address@hidden>
Tested-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: c471ad0e9bd46ca5f5c9c796e727230e043a091d
      
https://github.com/qemu/qemu/commit/c471ad0e9bd46ca5f5c9c796e727230e043a091d
  Author: Jason Wang <address@hidden>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M hw/net/vhost_net.c
    M hw/virtio/vhost-backend.c
    M hw/virtio/vhost.c
    M include/hw/virtio/vhost-backend.h
    M include/hw/virtio/vhost.h
    M net/tap.c

  Log Message:
  -----------
  vhost_net: device IOTLB support

This patches implements Device IOTLB support for vhost kernel. This is
done through:

1) switch to use dma helpers when map/unmap vrings from vhost codes
2) introduce a set of VhostOps to:
   - setting up device IOTLB request callback
   - processing device IOTLB request
   - processing device IOTLB invalidation
2) kernel support for Device IOTLB API:

- allow vhost-net to query the IOMMU IOTLB entry through eventfd
- enable the ability for qemu to update a specified mapping of vhost
- through ioctl.
- enable the ability to invalidate a specified range of iova for the
  device IOTLB of vhost through ioctl. In x86/intel_iommu case this is
  triggered through iommu memory region notifier from device IOTLB
  invalidation descriptor processing routine.

With all the above, kernel vhost_net can co-operate with userspace
IOMMU. For vhost-user, the support could be easily done on top by
implementing the VhostOps.

Cc: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: baf2d5bfbac015b27f4db74feab235e167df0c84
      
https://github.com/qemu/qemu/commit/baf2d5bfbac015b27f4db74feab235e167df0c84
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M docs/specs/fw_cfg.txt
    M hw/arm/virt-acpi-build.c
    M hw/core/loader.c
    M hw/i386/acpi-build.c
    M hw/lm32/lm32_hwsetup.h
    M hw/nvram/fw_cfg.c
    M include/hw/loader.h
    M include/hw/nvram/fw_cfg.h

  Log Message:
  -----------
  fw-cfg: support writeable blobs

Useful to send guest data back to QEMU.

Changes from Laszlo Ersek <address@hidden>:
- rebase the patch from Michael Tsirkin's original postings at [1] and [2]
  to the following patches:
  - loader: Allow a custom AddressSpace when loading ROMs
  - loader: Add AddressSpace loading support to uImages
  - loader: fix handling of custom address spaces when adding ROM blobs
- reject such writes immediately that would exceed the end of the array,
  rather than performing a partial write before setting the error bit: see
  the (len != dma.length) condition
- document the write interface

[1] http://lists.nongnu.org/archive/html/qemu-devel/2016-02/msg04968.html
[2] http://lists.nongnu.org/archive/html/qemu-devel/2016-03/msg02735.html

Cc: "Gabriel L. Somlo" <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
Cc: Igor Mammedov <address@hidden>
Cc: Michael Walle <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Cc: Peter Maydell <address@hidden>
Cc: Shannon Zhao <address@hidden>
Cc: address@hidden
Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Acked-by: Gabriel Somlo <address@hidden>
Tested-by: Gabriel Somlo <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>


  Commit: e12f3a13e2e134fe9b8d3d1a160a8e54de1e8fa7
      
https://github.com/qemu/qemu/commit/e12f3a13e2e134fe9b8d3d1a160a8e54de1e8fa7
  Author: Laszlo Ersek <address@hidden>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M docs/specs/fw_cfg.txt
    M hw/nvram/fw_cfg.c
    M include/hw/nvram/fw_cfg_keys.h

  Log Message:
  -----------
  fw-cfg: turn FW_CFG_FILE_SLOTS into a device property

We'd like to raise the value of FW_CFG_FILE_SLOTS. Doing it naively could
lead to problems with backward migration: a more recent QEMU (running an
older machine type) would allow the guest, in fw_cfg_select(), to select a
high key value that is unavailable in the same machine type implemented by
the older (target) QEMU. On the target host, fw_cfg_data_read() for
example could dereference nonexistent entries.

As first step, size the FWCfgState.entries[*] and FWCfgState.entry_order
arrays dynamically. All three array sizes will be influenced by the new
field FWCfgState.file_slots (and matching device property).

Make the following changes:

- Replace the FW_CFG_FILE_SLOTS macro with FW_CFG_FILE_SLOTS_MIN (minimum
  count of fw_cfg file slots) in the header file. The value remains 0x10.

- Replace all uses of FW_CFG_FILE_SLOTS with a helper function called
  fw_cfg_file_slots(), returning the new property.

- Eliminate the macro FW_CFG_MAX_ENTRY, and replace all its uses with a
  helper function called fw_cfg_max_entry().

- In the MMIO- and IO-mapped realize functions both, allocate all three
  arrays dynamically, based on the new property.

- The new property defaults to FW_CFG_FILE_SLOTS_MIN. This is going to be
  customized in the following patches.

Cc: "Gabriel L. Somlo" <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
Cc: Igor Mammedov <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Acked-by: Gabriel Somlo <address@hidden>
Tested-by: Gabriel Somlo <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>


  Commit: d580bd4b73f0462962fa952777e7ec8f41bb73bd
      
https://github.com/qemu/qemu/commit/d580bd4b73f0462962fa952777e7ec8f41bb73bd
  Author: Eduardo Habkost <address@hidden>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  pc: Add 2.9 machine-types

Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Laszlo Ersek <address@hidden>
Cc: Igor Mammedov <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Acked-by: Gabriel Somlo <address@hidden>
Tested-by: Gabriel Somlo <address@hidden>
Cc: Gabriel Somlo <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>


  Commit: a5b3ebfd23bc70fa68461dff1d7145ff65e07150
      
https://github.com/qemu/qemu/commit/a5b3ebfd23bc70fa68461dff1d7145ff65e07150
  Author: Laszlo Ersek <address@hidden>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M docs/specs/fw_cfg.txt
    M hw/nvram/fw_cfg.c
    M include/hw/compat.h

  Log Message:
  -----------
  fw-cfg: bump "x-file-slots" to 0x20 for 2.9+ machine types

More precisely, the "x-file-slots" count is bumped for all machine types
that:
(a) use fw_cfg, and
(b) are not versioned (hence migration is not expected to work for them
    across QEMU releases anyway), or have version 2.9.

This affects machine types implemented in the following source files:

- "hw/arm/virt.c". The "virt-*" machine type is versioned, and the <= 2.8
  versions already depend on HW_COMPAT_2_8 (see commit e353aac51b944).
  Therefore adding the "x-file-slots" compat values to HW_COMPAT_2_8
  suffices.

- "hw/i386/pc.c". The "pc-i440fx-*" (including "pc-*") and "pc-q35-*"
  machine types are versioned. Modifying HW_COMPAT_2_8 is sufficient here
  too (see commit "pc: Add 2.9 machine-types"). The "isapc" machtype is
  not versioned. The "xenfv" machine type, which uses fw_cfg for direct
  kernel booting, is also not versioned.

- "hw/ppc/mac_newworld.c". The "mac99" machine type is not versioned.

- "hw/ppc/mac_oldworld.c". The "g3beige" machine type is not versioned.

- "hw/sparc/sun4m.c". None of the 9 machine types defined in this file
  appear versioned.

- "hw/sparc64/sun4u.c". None of the 3 machine types defined in this file
  appear versioned.

Cc: "Gabriel L. Somlo" <address@hidden>
Cc: "Michael S. Tsirkin" <address@hidden>
Cc: Alexander Graf <address@hidden>
Cc: Anthony Perard <address@hidden>
Cc: Artyom Tarasenko <address@hidden>
Cc: David Gibson <address@hidden>
Cc: Eduardo Habkost <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
Cc: Igor Mammedov <address@hidden>
Cc: Mark Cave-Ayland <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Cc: Peter Maydell <address@hidden>
Cc: Stefano Stabellini <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Acked-by: Gabriel Somlo <address@hidden>
Tested-by: Gabriel Somlo <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>


  Commit: 1aea7a5b7e604598066dda8919339dab83fd8089
      
https://github.com/qemu/qemu/commit/1aea7a5b7e604598066dda8919339dab83fd8089
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

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

  Log Message:
  -----------
  virtio: drop an obsolete comment

virtio core has code to revert queue number
to maximum on reset. Drop TODO to add that.

Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>


  Commit: 5878b13642ddf8da44186ef93ac91319ff53668b
      
https://github.com/qemu/qemu/commit/5878b13642ddf8da44186ef93ac91319ff53668b
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    A include/standard-headers/linux/virtio_mmio.h

  Log Message:
  -----------
  virtio_mmio: add standard header file

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 7e71da7f124fc47a2f2bc1fbfb32f0e8ee3e7d44
      
https://github.com/qemu/qemu/commit/7e71da7f124fc47a2f2bc1fbfb32f0e8ee3e7d44
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

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

  Log Message:
  -----------
  virtio-mmio: switch to linux headers

Switch to virtio_mmio.h from Linux - will make it
easier to implement virtio 1.

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 0084248348c2e17b018f11e4a159bd2d68b0edc3
      
https://github.com/qemu/qemu/commit/0084248348c2e17b018f11e4a159bd2d68b0edc3
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M include/standard-headers/linux/pci_regs.h

  Log Message:
  -----------
  pci_regs: update to latest linux

this drops a duplicate definition of
PCI_EXT_CAP_ATS_SIZEOF

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: f43c0076054c3d340e5e9b69f7c46582aef9ae0c
      
https://github.com/qemu/qemu/commit/f43c0076054c3d340e5e9b69f7c46582aef9ae0c
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M include/standard-headers/linux/virtio_crypto.h

  Log Message:
  -----------
  virtio_crypto: header update

Update header from latest linux driver.  Session creation structs gain
padding to make them same size. Formatting cleanups.

Signed-off-by: Michael S. Tsirkin <address@hidden>
Tested-by: Gonglei <address@hidden>
Reviewed-by: Gonglei <address@hidden>


  Commit: ed219c40a376d5e0a09f8af0c4264e6f85e3cbde
      
https://github.com/qemu/qemu/commit/ed219c40a376d5e0a09f8af0c4264e6f85e3cbde
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M scripts/update-linux-headers.sh

  Log Message:
  -----------
  update-linux-headers.sh: support __bitwise

In 4.10, Linux is switching from __bitwise__ to use __bitwise
exclusively. Update our script accordingly.

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 9568700563151a5ce68fd7e61a38b72fbba7273d
      
https://github.com/qemu/qemu/commit/9568700563151a5ce68fd7e61a38b72fbba7273d
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M linux-headers/linux/vhost.h

  Log Message:
  -----------
  vhost: drop VHOST_F_DEVICE_IOTLB

Upstream does not have it, uses VIRTIO_F_IOMMU_PLATFORM
to signal support instead.

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 6bdc21c050a2a7b92cbbd0b2a1f8934e9b5f896f
      
https://github.com/qemu/qemu/commit/6bdc21c050a2a7b92cbbd0b2a1f8934e9b5f896f
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M hw/virtio/virtio.c

  Log Message:
  -----------
  virtio: fix up max size checks

Coverity reports that ARRAY_SIZE(elem->out_sg) (and all the others too)
is wrong because elem->out_sg is a pointer.

However, the check is not in the right place and the max_size argument
of virtqueue_map_iovec can be removed.  The check on in_num/out_num
should be moved to qemu_get_virtqueue_element instead, before the call
to virtqueue_alloc_element.

Cc: address@hidden
Reported-by: Paolo Bonzini <address@hidden>
Fixes: 3724650db07057333879484c8bc7d900b5c1bf8e ("virtio: introduce 
virtqueue_alloc_element")
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>


  Commit: 2943b53f682f54548e7ddcf2ebb6c6d12d8dc821
      
https://github.com/qemu/qemu/commit/2943b53f682f54548e7ddcf2ebb6c6d12d8dc821
  Author: Jason Wang <address@hidden>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

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

  Log Message:
  -----------
  virtio: force VIRTIO_F_IOMMU_PLATFORM

We allow vhost to clear VIRITO_F_IOMMU_PLATFORM which is wrong since
VIRTIO_F_IOMMU_PLATFORM is mandatory for security. Fixing this by
enforce it after vdc->get_features().

Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 4383fa7c8019193676e76de466375babc3a89c83
      
https://github.com/qemu/qemu/commit/4383fa7c8019193676e76de466375babc3a89c83
  Author: Peter Maydell <address@hidden>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M docs/specs/fw_cfg.txt
    M hw/arm/virt-acpi-build.c
    M hw/core/loader.c
    M hw/i386/acpi-build.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/lm32/lm32_hwsetup.h
    M hw/net/vhost_net.c
    M hw/nvram/fw_cfg.c
    M hw/virtio/vhost-backend.c
    M hw/virtio/vhost.c
    M hw/virtio/virtio-bus.c
    M hw/virtio/virtio-mmio.c
    M hw/virtio/virtio-pci.c
    M hw/virtio/virtio.c
    M include/hw/compat.h
    M include/hw/i386/pc.h
    M include/hw/loader.h
    M include/hw/nvram/fw_cfg.h
    M include/hw/nvram/fw_cfg_keys.h
    M include/hw/virtio/vhost-backend.h
    M include/hw/virtio/vhost.h
    M include/standard-headers/linux/pci_regs.h
    M include/standard-headers/linux/virtio_crypto.h
    A include/standard-headers/linux/virtio_mmio.h
    M linux-headers/linux/vhost.h
    M net/tap.c
    M scripts/update-linux-headers.sh

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

virtio, vhost, pc: fixes, features

writeable fw cfg blobs which will be used for guest to host
communication
fixes and cleanups all over the place

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Thu 19 Jan 2017 21:08:04 GMT
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"
# 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

* remotes/mst/tags/for_upstream:
  virtio: force VIRTIO_F_IOMMU_PLATFORM
  virtio: fix up max size checks
  vhost: drop VHOST_F_DEVICE_IOTLB
  update-linux-headers.sh: support __bitwise
  virtio_crypto: header update
  pci_regs: update to latest linux
  virtio-mmio: switch to linux headers
  virtio_mmio: add standard header file
  virtio: drop an obsolete comment
  fw-cfg: bump "x-file-slots" to 0x20 for 2.9+ machine types
  pc: Add 2.9 machine-types
  fw-cfg: turn FW_CFG_FILE_SLOTS into a device property
  fw-cfg: support writeable blobs
  vhost_net: device IOTLB support
  virtio: disable notifications again after poll succeeded
  Revert "virtio: turn vq->notification into a nested counter"
  virtio-net: enable ioeventfd even if vhost=off

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


Compare: https://github.com/qemu/qemu/compare/6ffefe7ff785...4383fa7c8019