[Qemu-commits] [qemu/qemu] c2cb51: hw/net/e1000e: advance desc_offset in case of null...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: c2cb511634012344e3d0fe49a037a33b12d8a98a
      
https://github.com/qemu/qemu/commit/c2cb511634012344e3d0fe49a037a33b12d8a98a
  Author: Prasad J Pandit <pjp@fedoraproject.org>
  Date:   2020-11-24 (Tue, 24 Nov 2020)

  Changed paths:
    M hw/net/e1000e_core.c

  Log Message:
  -----------
  hw/net/e1000e: advance desc_offset in case of null descriptor

While receiving packets via e1000e_write_packet_to_guest() routine,
'desc_offset' is advanced only when RX descriptor is processed. And
RX descriptor is not processed if it has NULL buffer address.
This may lead to an infinite loop condition. Increament 'desc_offset'
to process next descriptor in the ring to avoid infinite loop.

Reported-by: Cheol-woo Myung <330cjfdn@gmail.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>


  Commit: ad6f932fe8d1fc7f37ec17c7520aec68d3ee3706
      
https://github.com/qemu/qemu/commit/ad6f932fe8d1fc7f37ec17c7520aec68d3ee3706
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-11-24 (Tue, 24 Nov 2020)

  Changed paths:
    M include/net/net.h
    M monitor/hmp-cmds.c
    M net/net.c

  Log Message:
  -----------
  net: do not exit on "netdev_add help" monitor command

"netdev_add help" is causing QEMU to exit because the code that
invokes show_netdevs is shared between CLI and HMP processing.
Move the check to the callers so that exit(0) remains only
in the CLI flow.

"netdev_add help" is not fixed by this patch; that is left for
later work.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>


  Commit: d2abc563e4ba4057b9cb5c04dd203b8c3a949115
      
https://github.com/qemu/qemu/commit/d2abc563e4ba4057b9cb5c04dd203b8c3a949115
  Author: Yuri Benditovich <yuri.benditovich@daynix.com>
  Date:   2020-11-24 (Tue, 24 Nov 2020)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: purge queued rx packets on queue deletion

https://bugzilla.redhat.com/show_bug.cgi?id=1829272
When deleting queue pair, purge pending RX packets if any.
Example of problematic flow:
1. Bring up q35 VM with tap (vhost off) and virtio-net or e1000e
2. Run ping flood to the VM NIC ( 1 ms interval)
3. Hot unplug the NIC device (device_del)
   During unplug process one or more packets come, the NIC
   can't receive, tap disables read_poll
4. Hot plug the device (device_add) with the same netdev
The tap stays with read_poll disabled and does not receive
any packets anymore (tap_send never triggered)

Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>


  Commit: f012bec8909820390936f1cf68b3e73a2d4ac966
      
https://github.com/qemu/qemu/commit/f012bec8909820390936f1cf68b3e73a2d4ac966
  Author: yuanjungong <ruc_gongyuanjun@163.com>
  Date:   2020-11-24 (Tue, 24 Nov 2020)

  Changed paths:
    M net/tap.c

  Log Message:
  -----------
  tap: fix a memory leak

Close fd before returning.

Buglink: https://bugs.launchpad.net/qemu/+bug/1904486

Signed-off-by: yuanjungong <ruc_gongyuanjun@163.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>


  Commit: 9925990d01a92564af55f6f69d0f5f59b47609b1
      
https://github.com/qemu/qemu/commit/9925990d01a92564af55f6f69d0f5f59b47609b1
  Author: Keqian Zhu <zhukeqian1@huawei.com>
  Date:   2020-11-24 (Tue, 24 Nov 2020)

  Changed paths:
    M net/tap.c

  Log Message:
  -----------
  net: Use correct default-path macro for downscript

Fixes: 63c4db4c2e6d (net: relocate paths to helpers and scripts)
Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>


  Commit: d536d9578ec3ac5029a70b8126cb84bb6f2124a4
      
https://github.com/qemu/qemu/commit/d536d9578ec3ac5029a70b8126cb84bb6f2124a4
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-11-24 (Tue, 24 Nov 2020)

  Changed paths:
    M hw/net/e1000e_core.c
    M include/net/net.h
    M monitor/hmp-cmds.c
    M net/net.c
    M net/tap.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into 
staging

# gpg: Signature made Tue 24 Nov 2020 02:41:01 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

* remotes/jasowang/tags/net-pull-request:
  net: Use correct default-path macro for downscript
  tap: fix a memory leak
  net: purge queued rx packets on queue deletion
  net: do not exit on "netdev_add help" monitor command
  hw/net/e1000e: advance desc_offset in case of null descriptor

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


Compare: https://github.com/qemu/qemu/compare/23895cbd82be...d536d9578ec3