[Qemu-commits] [qemu/qemu] c39885: iotests: fix wait_until_completed()

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: c3988519c4fc3e458fbac4f7814dd775ef4a68d7
      
https://github.com/qemu/qemu/commit/c3988519c4fc3e458fbac4f7814dd775ef4a68d7
  Author: Peter Xu <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  iotests: fix wait_until_completed()

If there are more than one events, wait_until_completed() might return
the 2nd event even if the 1st event is JOB_COMPLETED, since the for loop
will continue to run even if completed is set to True.

It never happened before, but it can be triggered when OOB is enabled
due to the RESUME startup message. Fix that up.

Signed-off-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: 15544349277f988ea22d7037d41488de819bc92a
      
https://github.com/qemu/qemu/commit/15544349277f988ea22d7037d41488de819bc92a
  Author: Peter Xu <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M iothread.c

  Log Message:
  -----------
  iothread: workaround glib bug which hangs qmp-test

Free the AIO context earlier than the GMainContext (if we have) to
workaround a glib2 bug that GSource context pointer is not cleared even
if the context has already been destroyed (while it should).

The patch itself only changed the order to destroy the objects, no
functional change at all. Without this workaround, we can encounter
qmp-test hang with oob (and possibly any other use case when iothread is
used with GMainContexts):

  #0  0x00007f35ffe45334 in __lll_lock_wait () from /lib64/libpthread.so.0
  #1  0x00007f35ffe405d8 in _L_lock_854 () from /lib64/libpthread.so.0
  #2  0x00007f35ffe404a7 in pthread_mutex_lock () from /lib64/libpthread.so.0
  #3  0x00007f35fc5b9c9d in g_source_unref_internal (source=0x24f0600, 
context=0x7f35f0000960, have_lock=0) at gmain.c:1685
  #4  0x0000000000aa6672 in aio_context_unref (ctx=0x24f0600) at 
/root/qemu/util/async.c:497
  #5  0x000000000065851c in iothread_instance_finalize (obj=0x24f0380) at 
/root/qemu/iothread.c:129
  #6  0x0000000000962d79 in object_deinit (obj=0x24f0380, type=0x242e960) at 
/root/qemu/qom/object.c:462
  #7  0x0000000000962e0d in object_finalize (data=0x24f0380) at 
/root/qemu/qom/object.c:476
  #8  0x0000000000964146 in object_unref (obj=0x24f0380) at 
/root/qemu/qom/object.c:924
  #9  0x0000000000965880 in object_finalize_child_property (obj=0x24ec640, 
name=0x24efca0 "mon_iothread", opaque=0x24f0380) at /root/qemu/qom/object.c:1436
  #10 0x0000000000962c33 in object_property_del_child (obj=0x24ec640, 
child=0x24f0380, errp=0x0) at /root/qemu/qom/object.c:436
  #11 0x0000000000962d26 in object_unparent (obj=0x24f0380) at 
/root/qemu/qom/object.c:455
  #12 0x0000000000658f00 in iothread_destroy (iothread=0x24f0380) at 
/root/qemu/iothread.c:365
  #13 0x00000000004c67a8 in monitor_cleanup () at /root/qemu/monitor.c:4663
  #14 0x0000000000669e27 in main (argc=16, argv=0x7ffc8b1ae2f8, 
envp=0x7ffc8b1ae380) at /root/qemu/vl.c:4749

The glib2 bug is fixed in commit 26056558b ("gmain: allow
g_source_get_context() on destroyed sources", 2012-07-30), so the first
good version is glib2 2.33.10. But we still support building with
glib as old as 2.28, so we need the workaround.

Let's make sure we destroy the GSources first before its owner context
until we drop support for glib older than 2.33.10.

Signed-off-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: 951702f39c7e31530ce4ea65b11fe25ea1ea9c37
      
https://github.com/qemu/qemu/commit/951702f39c7e31530ce4ea65b11fe25ea1ea9c37
  Author: Peter Xu <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M monitor.c

  Log Message:
  -----------
  monitor: bind dispatch bh to iohandler context

Eric Auger reported the problem days ago that OOB broke ARM when running
with libvirt:

http://lists.gnu.org/archive/html/qemu-devel/2018-03/msg06231.html

The problem was that the monitor dispatcher bottom half was bound to
qemu_aio_context now, which could be polled unexpectedly in block code.
We should keep the dispatchers run in iohandler_ctx just like what we
did before the Out-Of-Band series (chardev uses qio, and qio binds
everything with iohandler_ctx).

If without this change, QMP dispatcher might be run even before reaching
main loop in block IO path, for example, in a stack like (the ARM case,
"cont" command handler run even during machine init phase):
   #0  qmp_cont ()
  #1  0x00000000006bd210 in qmp_marshal_cont ()
  #2  0x0000000000ac05c4 in do_qmp_dispatch ()
  #3  0x0000000000ac07a0 in qmp_dispatch ()
  #4  0x0000000000472d60 in monitor_qmp_dispatch_one ()
  #5  0x000000000047302c in monitor_qmp_bh_dispatcher ()
  #6  0x0000000000acf374 in aio_bh_call ()
  #7  0x0000000000acf428 in aio_bh_poll ()
  #8  0x0000000000ad5110 in aio_poll ()
  #9  0x0000000000a08ab8 in blk_prw ()
  #10 0x0000000000a091c4 in blk_pread ()
  #11 0x0000000000734f94 in pflash_cfi01_realize ()
  #12 0x000000000075a3a4 in device_set_realized ()
  #13 0x00000000009a26cc in property_set_bool ()
  #14 0x00000000009a0a40 in object_property_set ()
  #15 0x00000000009a3a08 in object_property_set_qobject ()
  #16 0x00000000009a0c8c in object_property_set_bool ()
  #17 0x0000000000758f94 in qdev_init_nofail ()
  #18 0x000000000058e190 in create_one_flash ()
  #19 0x000000000058e2f4 in create_flash ()
  #20 0x00000000005902f0 in machvirt_init ()
  #21 0x00000000007635cc in machine_run_board_init ()
  #22 0x00000000006b135c in main ()

Actually the problem is more severe than that.  After we switched to the
qemu AIO handler it means the monitor dispatcher code can even be called
with nested aio_poll(), then it can be an explicit aio_poll() inside
another main loop aio_poll() which could be racy too; breaking code
like TPM and 9p that use nested event loops.

Switch to use the iohandler_ctx for monitor dispatchers.

My sincere thanks to Eric Auger who offered great help during both
debugging and verifying the problem.  The ARM test was carried out by
applying this patch upon QEMU 2.12.0-rc0 and problem is gone after the
patch.

A quick test of mine shows that after this patch applied we can pass all
raw iotests even with OOB on by default.

CC: Eric Blake <address@hidden>
CC: Markus Armbruster <address@hidden>
CC: Stefan Hajnoczi <address@hidden>
CC: Fam Zheng <address@hidden>
Reported-by: Eric Auger <address@hidden>
Tested-by: Eric Auger <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: 26d6a7c87b05017ffabffb5e16837a0fccf67e90
      
https://github.com/qemu/qemu/commit/26d6a7c87b05017ffabffb5e16837a0fccf67e90
  Author: Peter Maydell <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M iothread.c
    M monitor.c
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/ericb/tags/pull-qapi-2018-04-10' into 
staging

qapi patches for 2018-04-10

- Peter Xu: iotests: fix wait_until_completed()
- Peter Xu: iothread: workaround glib bug which hangs qmp-test
- Peter Xu: monitor: bind dispatch bh to iohandler context

# gpg: Signature made Tue 10 Apr 2018 14:15:09 BST
# gpg:                using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <address@hidden>"
# gpg:                 aka "Eric Blake (Free Software Programmer) 
<address@hidden>"
# gpg:                 aka "[jpeg image of size 6874]"
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-qapi-2018-04-10:
  monitor: bind dispatch bh to iohandler context
  iothread: workaround glib bug which hangs qmp-test
  iotests: fix wait_until_completed()

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


Compare: https://github.com/qemu/qemu/compare/69550301ecb3...26d6a7c87b05