mbox

[PULL,0/2] More fixes for QEMU 4.1.0-rc2

Message ID 20190722161657.8188-1-pbonzini@redhat.com
State New
Headers show

Pull-request

git://github.com/bonzini/qemu.git tags/for-upstream

Message

Paolo Bonzini July 22, 2019, 4:16 p.m. UTC
The following changes since commit 23da9e297b4120ca9702cabec91599a44255fe96:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190722' into staging (2019-07-22 15:16:48 +0100)

are available in the Git repository at:

  git://github.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to 20b25d239ab7a94bb8bff3d0f13a9527ee75cf10:

  i386/kvm: Do not sync nested state during runtime (2019-07-22 18:16:05 +0200)

----------------------------------------------------------------
Two more bugfix patches that came in over the weekend.

----------------------------------------------------------------
Jan Kiszka (1):
      i386/kvm: Do not sync nested state during runtime

Zhengui li (1):
      virtio-scsi: fixed virtio_scsi_ctx_check failed when detaching scsi disk

 hw/scsi/virtio-scsi.c |  6 ++++--
 target/i386/kvm.c     | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

Comments

Philippe Mathieu-Daudé July 22, 2019, 5:14 p.m. UTC | #1
On 7/22/19 6:16 PM, Paolo Bonzini wrote:
> The following changes since commit 23da9e297b4120ca9702cabec91599a44255fe96:
> 
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190722' into staging (2019-07-22 15:16:48 +0100)
> 
> are available in the Git repository at:
> 
>   git://github.com/bonzini/qemu.git tags/for-upstream
> 
> for you to fetch changes up to 20b25d239ab7a94bb8bff3d0f13a9527ee75cf10:
> 
>   i386/kvm: Do not sync nested state during runtime (2019-07-22 18:16:05 +0200)
> 
> ----------------------------------------------------------------
> Two more bugfix patches that came in over the weekend.
> 
> ----------------------------------------------------------------
> Jan Kiszka (1):
>       i386/kvm: Do not sync nested state during runtime
> 
> Zhengui li (1):
>       virtio-scsi: fixed virtio_scsi_ctx_check failed when detaching scsi disk
> 
>  hw/scsi/virtio-scsi.c |  6 ++++--
>  target/i386/kvm.c     | 10 +++++-----
>  2 files changed, 9 insertions(+), 7 deletions(-)
> 

Replying to cover for Peter, not sure it is worthwhile another pull
request (if Paolo has the time for...), but some parenthesis got
mojibaked in patch #1.
Peter Maydell July 22, 2019, 5:42 p.m. UTC | #2
On Mon, 22 Jul 2019 at 17:17, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit 23da9e297b4120ca9702cabec91599a44255fe96:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190722' into staging (2019-07-22 15:16:48 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 20b25d239ab7a94bb8bff3d0f13a9527ee75cf10:
>
>   i386/kvm: Do not sync nested state during runtime (2019-07-22 18:16:05 +0200)
>
> ----------------------------------------------------------------
> Two more bugfix patches that came in over the weekend.
>
> ----------------------------------------------------------------
> Jan Kiszka (1):
>       i386/kvm: Do not sync nested state during runtime
>
> Zhengui li (1):
>       virtio-scsi: fixed virtio_scsi_ctx_check failed when detaching scsi disk

Hi; this fails "make check" (all hosts):

MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_BINARY=arm-softmmu/qemu-system-arm QTEST_QEMU_IMG=qemu-img
tests/qos-test -m=quick -k --tap < /dev/null | ./scripts/tap-driver.pl
--test-name="qos-test"
PASS 1 qos-test /arm/imx25-pdk/imx.i2c/i2c-bus/ds1338/ds1338-tests/tx-rx
PASS 2 qos-test /arm/imx25-pdk/imx.i2c/i2c-bus/pca9552/pca9552-tests/tx-rx
PASS 3 qos-test /arm/imx25-pdk/imx.i2c/i2c-bus/pca9552/pca9552-tests/rx-autoinc
[...]
PASS 35 qos-test
/arm/virt/virtio-mmio/virtio-bus/virtio-net-device/virtio-net/virtio-net-tests/large_tx/uint_max
PASS 36 qos-test
/arm/virt/virtio-mmio/virtio-bus/virtio-net-device/virtio-net/virtio-net-tests/large_tx/net_bufsize
PASS 37 qos-test
/arm/virt/virtio-mmio/virtio-bus/virtio-rng-device/virtio/virtio-tests/nop
Broken pipe
/home/linux1/qemu/tests/libqtest.c:145: kill_qemu() detected QEMU
death from signal 11 (Segmentation fault) (core dumped)
Aborted (core dumped)
ERROR - too few tests run (expected 44, got 37)
/home/linux1/qemu/tests/Makefile.include:899: recipe for target
'check-qtest-arm' failed

Segfault seems to be on the test
/arm/virt/virtio-mmio/virtio-bus/virtio-scsi-device/virtio-scsi/virtio-scsi-tests/hotplug

Here's a backtrace (on an s390 box, which happened to be the
easiest to investigate on):

Thread 1 "qemu-system-arm" received signal SIGSEGV, Segmentation fault.
0x000000010043feda in aio_disable_external (ctx=0x0) at
/home/linux1/qemu/include/block/aio.h:493
493         atomic_inc(&ctx->external_disable_cnt);
(gdb) bt
#0  0x000000010043feda in aio_disable_external (ctx=0x0) at
/home/linux1/qemu/include/block/aio.h:493
#1  virtio_scsi_hotunplug (hotplug_dev=0x101b19040, dev=0x101c00c00,
errp=0x3ffffffe798)
    at /home/linux1/qemu/hw/scsi/virtio-scsi.c:844
#2  0x000000010053a874 in qdev_unplug (dev=0x101c00c00,
errp=0x3ffffffe848) at /home/linux1/qemu/qdev-monitor.c:831
#3  0x0000000100746c3a in qmp_marshal_device_del (args=<optimized
out>, ret=<optimized out>, errp=0x3ffffffe918)
    at qapi/qapi-commands-qdev.c:99
#4  0x0000000100847f98 in do_qmp_dispatch (errp=0x3ffffffe910,
allow_oob=false, request=0x3ffdc004b00,
    cmds=<optimized out>) at /home/linux1/qemu/qapi/qmp-dispatch.c:131
#5  qmp_dispatch (cmds=<optimized out>, request=0x3ffdc004b00,
allow_oob=<optimized out>)
    at /home/linux1/qemu/qapi/qmp-dispatch.c:174
#6  0x00000001007176a8 in monitor_qmp_dispatch
(mon=mon@entry=0x10123eef0, req=<optimized out>)
    at /home/linux1/qemu/monitor/qmp.c:120
#7  0x0000000100717e92 in monitor_qmp_bh_dispatcher (data=<optimized
out>) at /home/linux1/qemu/monitor/qmp.c:209
#8  0x0000000100894a60 in aio_bh_call (bh=0x10115ec20) at
/home/linux1/qemu/util/async.c:89
#9  aio_bh_poll (ctx=<optimized out>) at /home/linux1/qemu/util/async.c:117
#10 0x0000000100898970 in aio_dispatch (ctx=0x10115e090) at
/home/linux1/qemu/util/aio-posix.c:459
#11 0x00000001008948f0 in aio_ctx_dispatch (source=<optimized out>,
callback=<optimized out>, user_data=<optimized out>)
    at /home/linux1/qemu/util/async.c:260
#12 0x000003fffcb5051e in g_main_context_dispatch () from
/lib/s390x-linux-gnu/libglib-2.0.so.0
#13 0x000000010089778a in glib_pollfds_poll () at
/home/linux1/qemu/util/main-loop.c:218
#14 os_host_main_loop_wait (timeout=<optimized out>) at
/home/linux1/qemu/util/main-loop.c:241
#15 main_loop_wait (nonblocking=<optimized out>) at
/home/linux1/qemu/util/main-loop.c:517
#16 0x000000010053f182 in main_loop () at /home/linux1/qemu/vl.c:1791



You might as well fix the commit message mojibake Philippe pointed
out when you do the respin...

thanks
-- PMM