Re: [Qemu-devel] [RFC v4 21/27] qmp: let migrate-incoming allow out-of-band

[Dr. David Alan Gilbert]

* Peter Xu (address@hidden) wrote:
> So it can get rid of being run on main thread.
> 
> Signed-off-by: Peter Xu <address@hidden>

Last time I asked if you were sure that we didn't do locking,
and you explained that we end up just setting up a callback
that happens in the mainloop, and this shouldn't take a lock.
I confirmed this by:

  running with -incoming defer
  breakpointing in hmp_migrate_incoming
  doing   migrate_incoming tcp:0:4444
  once I hit that breakpointing adding two more breakpoints:
     a) qemu_mutex_lock_iothread
     b) the end of hmp's handle_hmp_command

  and indeed it hit the end of handle_hmp_command without
having hit the qemu_mutex_lock_iothread; so initially that
looks ok.

But then I added a break on pthread_mutex_lock, and I've got
this set caused by qemu_start_incoming_migration sending a
MIGRATION_STATUS_SETUP event:

#1  0x0000555555ba6eba in qemu_mutex_lock (address@hidden <monitor_lock>)
    at /home/dgilbert/git/qemu/util/qemu-thread-posix.c:65
#2  0x00005555557f01c1 in monitor_qapi_event_queue (event=QAPI_EVENT_MIGRATION, 
qdict=0x555557d93c00, errp=<optimized out>) at 
/home/dgilbert/git/qemu/monitor.c:442

440         trace_monitor_protocol_event_queue(event, qdict, evconf->rate);
441     
442         qemu_mutex_lock(&monitor_lock);
443     

#3  0x0000555555b92722 in qapi_event_send_migration (address@hidden, 
errp=0x555556859320 <error_abort>) at qapi-event.c:661
#4  0x0000555555a6159f in qemu_start_incoming_migration (uri=0x555557693f30 
"tcp:0:4444", errp=0x7fffffffc700)
    at /home/dgilbert/git/qemu/migration/migration.c:253
#5  0x0000555555a641c5 in qmp_migrate_incoming (uri=0x555557693f30 
"tcp:0:4444", errp=0x7fffffffc730)
    at /home/dgilbert/git/qemu/migration/migration.c:1321

is there anything which protects us there?

Dave
    
> ---
>  qapi/migration.json | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/qapi/migration.json b/qapi/migration.json
> index bbc4671ded..95098072dd 100644
> --- a/qapi/migration.json
> +++ b/qapi/migration.json
> @@ -1063,7 +1063,8 @@
>  # <- { "return": {} }
>  #
>  ##
> -{ 'command': 'migrate-incoming', 'data': {'uri': 'str' } }
> +{ 'command': 'migrate-incoming', 'data': {'uri': 'str' },
> +  'allow-oob': true }
>  
>  ##
>  # @xen-save-devices-state:
> -- 
> 2.13.6
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK