[Qemu-commits] [qemu/qemu] 7de2e8: yank: Unregister function when using TLS migration

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 7de2e8565335c13fb3516cddbe2e40e366cce273
      
https://github.com/qemu/qemu/commit/7de2e8565335c13fb3516cddbe2e40e366cce273
  Author: Leonardo Bras <leobras.c@gmail.com>
  Date:   2021-06-08 (Tue, 08 Jun 2021)

  Changed paths:
    M migration/channel.c
    M migration/multifd.c
    M migration/qemu-file-channel.c

  Log Message:
  -----------
  yank: Unregister function when using TLS migration

After yank feature was introduced in migration, whenever migration
is started using TLS, the following error happens in both source and
destination hosts:

(qemu) qemu-kvm: ../util/yank.c:107: yank_unregister_instance:
Assertion `QLIST_EMPTY(&entry->yankfns)' failed.

This happens because of a missing yank_unregister_function() when using
qio-channel-tls.

Fix this by also allowing TYPE_QIO_CHANNEL_TLS object type to perform
yank_unregister_function() in channel_close() and multifd_load_cleanup().

Also, inside migration_channel_connect() and
migration_channel_process_incoming() move yank_register_function() so
it only runs once on a TLS migration.

Fixes: b5eea99ec2f ("migration: Add yank feature", 2021-01-13)
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1964326
Signed-off-by: Leonardo Bras <leobras.c@gmail.com>
Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Peter Xu <peterx@redhat.com>

--
Changes since v2:
- Dropped all references to ioc->master
- yank_register_function() and yank_unregister_function() now only run
  once in a TLS migration.

Changes since v1:
- Cast p->c to QIOChannelTLS into multifd_load_cleanup()
Message-Id: <20210601054030.1153249-1-leobras.c@gmail.com>

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: 6b8c2eb5c63db2b6b418256bcfecb51e17d72b0f
      
https://github.com/qemu/qemu/commit/6b8c2eb5c63db2b6b418256bcfecb51e17d72b0f
  Author: Li Zhijian <lizhijian@cn.fujitsu.com>
  Date:   2021-06-08 (Tue, 08 Jun 2021)

  Changed paths:
    M migration/rdma.c

  Log Message:
  -----------
  migration/rdma: Fix cm event use after free

Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Message-Id: <20210602023506.3821293-1-lizhijian@cn.fujitsu.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: d80f54ce53167e38623b8aafe8317458a6d7a6cd
      
https://github.com/qemu/qemu/commit/d80f54ce53167e38623b8aafe8317458a6d7a6cd
  Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
  Date:   2021-06-08 (Tue, 08 Jun 2021)

  Changed paths:
    M io/channel-socket.c

  Log Message:
  -----------
  channel-socket: Only set CLOEXEC if we have space for fds

MSG_CMSG_CLOEXEC cleans up received fd's; it's really only for Unix
sockets, but currently we enable it for everything; some socket types
(IP_MPTCP) don't like this.

Only enable it when we're giving the recvmsg room to receive fd's
anyway.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20210421112834.107651-2-dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: 5b6116d32694c7d82d433c8fcd2b6afcf299d0c9
      
https://github.com/qemu/qemu/commit/5b6116d32694c7d82d433c8fcd2b6afcf299d0c9
  Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
  Date:   2021-06-08 (Tue, 08 Jun 2021)

  Changed paths:
    M io/net-listener.c

  Log Message:
  -----------
  io/net-listener: Call the notifier during finalize

Call the notifier during finalize; it's currently only called
if we change it, which is not the intent.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20210421112834.107651-3-dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: 1df6ddb43b48eacf5e1c7f63f48b507716150e6f
      
https://github.com/qemu/qemu/commit/1df6ddb43b48eacf5e1c7f63f48b507716150e6f
  Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
  Date:   2021-06-08 (Tue, 08 Jun 2021)

  Changed paths:
    M migration/migration.c
    M migration/migration.h

  Log Message:
  -----------
  migration: Add cleanup hook for inwards migration

Add a cleanup hook for incoming migration that gets called
at the end as a way for a transport to allow cleanup.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20210421112834.107651-4-dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: a59136f3b126cfbcaa13a44fbdaf8df6e3d1885f
      
https://github.com/qemu/qemu/commit/a59136f3b126cfbcaa13a44fbdaf8df6e3d1885f
  Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
  Date:   2021-06-08 (Tue, 08 Jun 2021)

  Changed paths:
    M migration/multifd.c
    M migration/socket.c

  Log Message:
  -----------
  migration/socket: Close the listener at the end

Delay closing the listener until the cleanup hook at the end; mptcp
needs the listener to stay open while the other paths come in.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20210421112834.107651-5-dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: 8bd1078aebcec5eac196a83ef1a7e74be0ba67b7
      
https://github.com/qemu/qemu/commit/8bd1078aebcec5eac196a83ef1a7e74be0ba67b7
  Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
  Date:   2021-06-08 (Tue, 08 Jun 2021)

  Changed paths:
    M io/dns-resolver.c
    M qapi/sockets.json
    M util/qemu-sockets.c

  Log Message:
  -----------
  sockets: Support multipath TCP

Multipath TCP allows combining multiple interfaces/routes into a single
socket, with very little work for the user/admin.

It's enabled by 'mptcp' on most socket addresses:

   ./qemu-system-x86_64 -nographic -incoming tcp:0:4444,mptcp

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20210421112834.107651-6-dgilbert@redhat.com>
Acked-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: 7afa08cd8fd2e5016658c39f6eb327e92edf0612
      
https://github.com/qemu/qemu/commit/7afa08cd8fd2e5016658c39f6eb327e92edf0612
  Author: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
  Date:   2021-06-08 (Tue, 08 Jun 2021)

  Changed paths:
    M migration/dirtyrate.c
    M migration/dirtyrate.h
    M qapi/migration.json

  Log Message:
  -----------
  migration/dirtyrate: make sample page count configurable

introduce optional sample-pages argument in calc-dirty-rate,
making sample page count per GB configurable so that more
accurate dirtyrate can be calculated.

Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
Message-Id: 
<3103453a3b2796f929269c99a6ad81a9a7f1f405.1623027729.git.huangy81@chinatelecom.cn>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
  Wrapped a couple of long lines


  Commit: a4a571d97866d056787d7a654be5792765be8a60
      
https://github.com/qemu/qemu/commit/a4a571d97866d056787d7a654be5792765be8a60
  Author: Peter Xu <peterx@redhat.com>
  Date:   2021-06-08 (Tue, 08 Jun 2021)

  Changed paths:
    M hmp-commands-info.hx
    M hmp-commands.hx
    M include/monitor/hmp.h
    M migration/dirtyrate.c

  Log Message:
  -----------
  hmp: Add "calc_dirty_rate" and "info dirty_rate" cmds

These two commands are missing when adding the QMP sister commands.
Add them, so developers can play with them easier.

Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
Message-Id: 
<4cc0039fc3ad6145136770cf3b0f056c09a2910b.1623027729.git.huangy81@chinatelecom.cn>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: 7fe7fae8b48e3f9c647fd685e5155ebc8e6fb84d
      
https://github.com/qemu/qemu/commit/7fe7fae8b48e3f9c647fd685e5155ebc8e6fb84d
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-06-09 (Wed, 09 Jun 2021)

  Changed paths:
    M hmp-commands-info.hx
    M hmp-commands.hx
    M include/monitor/hmp.h
    M io/channel-socket.c
    M io/dns-resolver.c
    M io/net-listener.c
    M migration/channel.c
    M migration/dirtyrate.c
    M migration/dirtyrate.h
    M migration/migration.c
    M migration/migration.h
    M migration/multifd.c
    M migration/qemu-file-channel.c
    M migration/rdma.c
    M migration/socket.c
    M qapi/migration.json
    M qapi/sockets.json
    M util/qemu-sockets.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/dgilbert-gitlab/tags/pull-migration-20210609a' into staging

Migration pull for 2021-06-09

Yank crash fix from Leo
RDMA fix from Li
mptcp support from me
dirty-rate changes from Hyman and Peter

(Note I've switched to the gitlab I've been using for virtiofs pulls)

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

# gpg: Signature made Wed 09 Jun 2021 15:40:01 BST
# gpg:                using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" 
[full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert-gitlab/tags/pull-migration-20210609a:
  hmp: Add "calc_dirty_rate" and "info dirty_rate" cmds
  migration/dirtyrate: make sample page count configurable
  sockets: Support multipath TCP
  migration/socket: Close the listener at the end
  migration: Add cleanup hook for inwards migration
  io/net-listener: Call the notifier during finalize
  channel-socket: Only set CLOEXEC if we have space for fds
  migration/rdma: Fix cm event use after free
  yank: Unregister function when using TLS migration

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


Compare: https://github.com/qemu/qemu/compare/a4716fd8d7c8...7fe7fae8b48e