[Qemu-commits] [qemu/qemu] 0e7e4f: slirp: Add explanation for hostfwd parsing failure

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0e7e4fb0a6b8f1043182dcccc91a7b984587d1ae
      
https://github.com/qemu/qemu/commit/0e7e4fb0a6b8f1043182dcccc91a7b984587d1ae
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2017-09-24 (Sun, 24 Sep 2017)

  Changed paths:
    M net/slirp.c

  Log Message:
  -----------
  slirp: Add explanation for hostfwd parsing failure

e.g.
./x86_64-softmmu/qemu-system-x86_64 -nographic -netdev 
'user,id=vnet,hostfwd=:555.0.0.0:0-:22'
qemu-system-x86_64: -netdev user,id=vnet,hostfwd=:555.0.0.0:0-:22: Invalid host 
forwarding rule ':555.0.0.0:0-:22' (Bad host address)

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: e2aad34d73a9bd2b95275598daf05f190a02b899
      
https://github.com/qemu/qemu/commit/e2aad34d73a9bd2b95275598daf05f190a02b899
  Author: Kevin Cernekee <address@hidden>
  Date:   2017-09-24 (Sun, 24 Sep 2017)

  Changed paths:
    M slirp/if.c
    M slirp/slirp.h

  Log Message:
  -----------
  slirp: Fix intermittent send queue hangs on a socket

if_output() originally sent one mbuf per call and used the slirp->next_m
variable to keep track of where it left off.  But nowadays it tries to
send all of the mbufs from the fastq, and one mbuf from each session on
the batchq.  The next_m variable is both redundant and harmful: there is
a case[0] involving delayed packets in which next_m ends up pointing
to &slirp->if_batchq when an active session still exists, and this
blocks all traffic for that session until qemu is restarted.

The test case was created to reproduce a problem that was seen on
long-running Chromium OS VM tests[1] which rapidly create and
destroy ssh connections through hostfwd.

[0] https://pastebin.com/NNy6LreF
[1] https://bugs.chromium.org/p/chromium/issues/detail?id=766323

Signed-off-by: Kevin Cernekee <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: 13146a83951e045c810c37c5c11c2a016ebc0663
      
https://github.com/qemu/qemu/commit/13146a83951e045c810c37c5c11c2a016ebc0663
  Author: Kevin Cernekee <address@hidden>
  Date:   2017-09-24 (Sun, 24 Sep 2017)

  Changed paths:
    M slirp/if.c

  Log Message:
  -----------
  slirp: Add a special case for the NULL socket

NULL sockets are used for NDP, BOOTP, and other critical operations.
If the topmost mbuf in a NULL session is blocked pending resolution,
it may cause problems if it blocks other packets with a NULL socket.
So do not add mbufs with a NULL socket field to the same session.

Signed-off-by: Kevin Cernekee <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>


  Commit: 1e3ee834083227f552179f6e43902cba5a866e6b
      
https://github.com/qemu/qemu/commit/1e3ee834083227f552179f6e43902cba5a866e6b
  Author: Peter Maydell <address@hidden>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M net/slirp.c
    M slirp/if.c
    M slirp/slirp.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into 
staging

slirp updates

# gpg: Signature made Sun 24 Sep 2017 19:07:51 BST
# gpg:                using RSA key 0x9E511E01C737F075
# gpg: Good signature from "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# gpg:                 aka "Samuel Thibault <address@hidden>"
# 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: 900C B024 B679 31D4 0F82  304B D017 8C76 7D06 9EE6
#      Subkey fingerprint: 9A37 3D36 64A8 DC62 DA0A  34FD 9E51 1E01 C737 F075

* remotes/thibault/tags/samuel-thibault:
  slirp: Add a special case for the NULL socket
  slirp: Fix intermittent send queue hangs on a socket
  slirp: Add explanation for hostfwd parsing failure

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


Compare: https://github.com/qemu/qemu/compare/460b6c8e581a...1e3ee8340832