[Qemu-commits] [qemu/qemu] a7b274: net: Move the code to collect available NIC models...

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: a7b27415ee82a7dd22f2ec13b2c6739a36667917
      
https://github.com/qemu/qemu/commit/a7b27415ee82a7dd22f2ec13b2c6739a36667917
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-02-14 (Tue, 14 Feb 2023)

  Changed paths:
    M hw/pci/pci.c
    M include/net/net.h
    M net/net.c

  Log Message:
  -----------
  net: Move the code to collect available NIC models to a separate function

The code that collects the available NIC models is not really specific
to PCI anymore and will be required in the next patch, too, so let's
move this into a new separate function in net.c instead.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>


  Commit: eaeac56b073200b99c9405269e319952086b1bbb
      
https://github.com/qemu/qemu/commit/eaeac56b073200b99c9405269e319952086b1bbb
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-02-14 (Tue, 14 Feb 2023)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: Restore printing of the help text with "-nic help"

Running QEMU with "-nic help" used to work in QEMU 5.2 and earlier versions
(it showed the available netdev backends), but this feature got broken during
some refactoring in version 6.0. Let's restore the old behavior, and while
we're at it, let's also print the available NIC models here now since this
option can be used to configure both, netdev backend and model in one go.

Fixes: ad6f932fe8 ("net: do not exit on "netdev_add help" monitor command")
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>


  Commit: d3101d8352d8166862f6427f35adfc2b2f754bc7
      
https://github.com/qemu/qemu/commit/d3101d8352d8166862f6427f35adfc2b2f754bc7
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2023-02-14 (Tue, 14 Feb 2023)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: Replace "Supported NIC models" with "Available NIC models"

Just because a NIC model is compiled into the QEMU binary does not
necessary mean that it can be used with each and every machine.
So let's rather talk about "available" models instead of "supported"
models, just to avoid confusion.

Reviewed-by: Claudio Fontana <cfontana@suse.de>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>


  Commit: a6d1b8f695f96ff742c16656eb0841d399086614
      
https://github.com/qemu/qemu/commit/a6d1b8f695f96ff742c16656eb0841d399086614
  Author: Qiang Liu <cyruscyliu@gmail.com>
  Date:   2023-02-14 (Tue, 14 Feb 2023)

  Changed paths:
    M hw/net/lan9118.c

  Log Message:
  -----------
  hw/net/lan9118: log [read|write]b when mode_16bit is enabled rather than abort

This patch replaces hw_error to guest error log for [read|write]b
accesses when mode_16bit is enabled. This avoids aborting qemu.

Fixes: 1248f8d4cbc3 ("hw/lan9118: Add basic 16-bit mode support.")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1433
Reported-by: Qiang Liu <cyruscyliu@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Qiang Liu <cyruscyliu@gmail.com>
Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>


  Commit: 70d9e42f0b27ae508f35caa7df5ee50683e0fd21
      
https://github.com/qemu/qemu/commit/70d9e42f0b27ae508f35caa7df5ee50683e0fd21
  Author: Fiona Ebner <f.ebner@proxmox.com>
  Date:   2023-02-14 (Tue, 14 Feb 2023)

  Changed paths:
    M hw/net/vmxnet3.c

  Log Message:
  -----------
  hw/net/vmxnet3: allow VMXNET3_MAX_MTU itself as a value

Currently, VMXNET3_MAX_MTU itself (being 9000) is not considered a
valid value for the MTU, but a guest running ESXi 7.0 might try to
set it and fail the assert [0].

In the Linux kernel, dev->max_mtu itself is a valid value for the MTU
and for the vmxnet3 driver it's 9000, so a guest running Linux will
also fail the assert when trying to set an MTU of 9000.

VMXNET3_MAX_MTU and s->mtu don't seem to be used in relation to buffer
allocations/accesses, so allowing the upper limit itself as a value
should be fine.

[0]: https://forum.proxmox.com/threads/114011/

Fixes: d05dcd94ae ("net: vmxnet3: validate configuration values during activate 
(CVE-2021-20203)")
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>


  Commit: 1c04536b817df90d3f32c652d1fd1ce5f0647182
      
https://github.com/qemu/qemu/commit/1c04536b817df90d3f32c652d1fd1ce5f0647182
  Author: Christian Svensson <blue@cmd.nu>
  Date:   2023-02-14 (Tue, 14 Feb 2023)

  Changed paths:
    M net/l2tpv3.c

  Log Message:
  -----------
  net: Increase L2TPv3 buffer to fit jumboframes

Increase the allocated buffer size to fit larger packets.
Given that jumboframes can commonly be up to 9000 bytes the closest suitable
value seems to be 16 KiB.

Tested by running qemu towards a Linux L2TPv3 endpoint and pushing
jumboframe traffic through the interfaces.

Signed-off-by: Christian Svensson <blue@cmd.nu>
Signed-off-by: Jason Wang <jasowang@redhat.com>


  Commit: b6eedb29afc8588de62cbd801ec5676fcca4931a
      
https://github.com/qemu/qemu/commit/b6eedb29afc8588de62cbd801ec5676fcca4931a
  Author: Joelle van Dyne <j@getutm.app>
  Date:   2023-02-14 (Tue, 14 Feb 2023)

  Changed paths:
    M net/vmnet-common.m
    M net/vmnet_int.h

  Log Message:
  -----------
  vmnet: stop recieving events when VM is stopped

When the VM is stopped using the HMP command "stop", soon the handler will
stop reading from the vmnet interface. This causes a flood of
`VMNET_INTERFACE_PACKETS_AVAILABLE` events to arrive and puts the host CPU
at 100%. We fix this by removing the event handler from vmnet when the VM
is no longer in a running state and restore it when we return to a running
state.

Signed-off-by: Joelle van Dyne <j@getutm.app>
Signed-off-by: Jason Wang <jasowang@redhat.com>


  Commit: b95eca03343374383f0a525634b5903a52d1e6e5
      
https://github.com/qemu/qemu/commit/b95eca03343374383f0a525634b5903a52d1e6e5
  Author: Qiang Liu <cyruscyliu@gmail.com>
  Date:   2023-02-14 (Tue, 14 Feb 2023)

  Changed paths:
    M hw/net/can/xlnx-zynqmp-can.c

  Log Message:
  -----------
  hw/net/can/xlnx-zynqmp-can: fix assertion failures in transfer_fifo()

Check fifos before poping data from and pushing data into it.

Fixes: 98e5d7a2b726 ("hw/net/can: Introduce Xilinx ZynqMP CAN controller")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1425
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1427
Reported-by: Qiang Liu <cyruscyliu@gmail.com>
Signed-off-by: Qiang Liu <cyruscyliu@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>


  Commit: b95c0d4440950fba6dbef0f781962911fa42abdb
      
https://github.com/qemu/qemu/commit/b95c0d4440950fba6dbef0f781962911fa42abdb
  Author: Laurent Vivier <lvivier@redhat.com>
  Date:   2023-02-14 (Tue, 14 Feb 2023)

  Changed paths:
    M net/stream.c
    M qapi/net.json
    M qemu-options.hx
    M tests/qtest/netdev-socket.c

  Log Message:
  -----------
  net: stream: add a new option to automatically reconnect

In stream mode, if the server shuts down there is currently
no way to reconnect the client to a new server without removing
the NIC device and the netdev backend (or to reboot).

This patch introduces a reconnect option that specifies a delay
to try to reconnect with the same parameters.

Add a new test in qtest to test the reconnect option and the
connect/disconnect events.

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>


  Commit: e4b953a26da11d214f91516cb9b0542eab5afaa0
      
https://github.com/qemu/qemu/commit/e4b953a26da11d214f91516cb9b0542eab5afaa0
  Author: Eugenio Pérez <eperezma@redhat.com>
  Date:   2023-02-14 (Tue, 14 Feb 2023)

  Changed paths:
    M net/vhost-vdpa.c

  Log Message:
  -----------
  vdpa: fix VHOST_BACKEND_F_IOTLB_ASID flag check

VHOST_BACKEND_F_IOTLB_ASID is the feature bit, not the bitmask. Since
the device under test also provided VHOST_BACKEND_F_IOTLB_MSG_V2 and
VHOST_BACKEND_F_IOTLB_BATCH, this went unnoticed.

Fixes: c1a1008685 ("vdpa: always start CVQ in SVQ mode if possible")
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>


  Commit: 6b69eccfd777408c5a5461e3d6bca58c177a6fc8
      
https://github.com/qemu/qemu/commit/6b69eccfd777408c5a5461e3d6bca58c177a6fc8
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2023-02-14 (Tue, 14 Feb 2023)

  Changed paths:
    M hw/net/can/xlnx-zynqmp-can.c
    M hw/net/lan9118.c
    M hw/net/vmxnet3.c
    M hw/pci/pci.c
    M include/net/net.h
    M net/l2tpv3.c
    M net/net.c
    M net/stream.c
    M net/vhost-vdpa.c
    M net/vmnet-common.m
    M net/vmnet_int.h
    M qapi/net.json
    M qemu-options.hx
    M tests/qtest/netdev-socket.c

  Log Message:
  -----------
  Merge tag 'net-pull-request' of https://github.com/jasowang/qemu into staging

# -----BEGIN PGP SIGNATURE-----
# Version: GnuPG v1
#
# iQEcBAABAgAGBQJj6yRCAAoJEO8Ells5jWIRsggIAKyhqAySaqS0ntk85fjsZIp4
# LRYS6bdTtFRT0Cyqagm9j/tXiBqhYfECzvYKxRg3qwZBOWqeKyJ9MR2JVKXDNhOw
# Rfv0KhzEgLpWIYyV1auKsX9uWfepDGs6M/CL//NAMHS8wjV9uxpaiyE5L0nT5yfP
# DXkLfIPFGou0VP4EnOhlUJHEaOrkdtuTFKGm+9A80bJN2KZ9zcfoZ5S+TwQsPR98
# jPb8XJHKIHOJ+58W6h1lyusDpMBjv3sgB1s9La3OuTCSYglJjlvrMAvEuWs89qmG
# zqlNhRruPkUV7h+lo/O/l8JPvivA0m0aqRnkClFH/fZOB/JNTAarnniAAa0C6uI=
# =8xDP
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 14 Feb 2023 06:03:46 GMT
# gpg:                using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) 
<jasowang@redhat.com>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* tag 'net-pull-request' of https://github.com/jasowang/qemu:
  vdpa: fix VHOST_BACKEND_F_IOTLB_ASID flag check
  net: stream: add a new option to automatically reconnect
  hw/net/can/xlnx-zynqmp-can: fix assertion failures in transfer_fifo()
  vmnet: stop recieving events when VM is stopped
  net: Increase L2TPv3 buffer to fit jumboframes
  hw/net/vmxnet3: allow VMXNET3_MAX_MTU itself as a value
  hw/net/lan9118: log [read|write]b when mode_16bit is enabled rather than abort
  net: Replace "Supported NIC models" with "Available NIC models"
  net: Restore printing of the help text with "-nic help"
  net: Move the code to collect available NIC models to a separate function

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/f670b3eec7f5...6b69eccfd777