The following changes since commit 411ad78115ebeb3411cf4b7622784b93dfabe259:

Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2017-12-15-1' into staging (2017-12-17 15:27:41 +0000)

git://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 585426c518958aa768564596091474be786aae51:

qemu-iotests: add 203 savevm with IOThreads test (2017-12-18 13:12:53 +0000)

----------------------------------------------------------------

Mao Zhongyi (4):

hw/block/nvme: Convert to realize

hw/block: Fix the return type

hw/block: Use errp directly rather than local_err

dev-storage: Fix the unusual function name

Mark Kanda (2):

virtio-blk: make queue size configurable

virtio-blk: reject configs with logical block size > physical block

size

Paolo Bonzini (1):

block: avoid recursive AioContext acquire in bdrv_inactivate_all()

Stefan Hajnoczi (16):

coroutine: simplify co_aio_sleep_ns() prototype

qdev: drop unused #include "sysemu/iothread.h"

blockdev: hold AioContext for bdrv_unref() in

external_snapshot_clean()

block: don't keep AioContext acquired after

external_snapshot_prepare()

block: don't keep AioContext acquired after drive_backup_prepare()

block: don't keep AioContext acquired after blockdev_backup_prepare()

block: don't keep AioContext acquired after

internal_snapshot_prepare()

block: drop unused BlockDirtyBitmapState->aio_context field

iothread: add iothread_by_id() API

blockdev: add x-blockdev-set-iothread testing command

qemu-iotests: add 202 external snapshots IOThread test

docs: mark nested AioContext locking as a legacy API

blockdev: add x-blockdev-set-iothread force boolean

iotests: add VM.add_object()

iothread: fix iothread_stop() race condition

qemu-iotests: add 203 savevm with IOThreads test

docs/devel/multiple-iothreads.txt | 7 +-

qapi/block-core.json | 40 ++++++

hw/block/dataplane/virtio-blk.h | 2 +-

include/hw/block/block.h | 4 +-

include/hw/virtio/virtio-blk.h | 1 +

include/qemu/coroutine.h | 6 +-

include/sysemu/iothread.h | 4 +-

block.c | 14 ++-

block/null.c | 3 +-

block/sheepdog.c | 3 +-

blockdev.c | 259 +++++++++++++++++++++++++++-----------

hw/block/block.c | 15 ++-

hw/block/dataplane/virtio-blk.c | 12 +-

hw/block/fdc.c | 17 +--

hw/block/nvme.c | 23 ++--

hw/block/virtio-blk.c | 35 ++++--

hw/core/qdev-properties-system.c | 1 -

hw/ide/qdev.c | 12 +-

hw/scsi/scsi-disk.c | 13 +-

hw/usb/dev-storage.c | 29 ++---

iothread.c | 27 +++-

util/qemu-coroutine-sleep.c | 4 +-

tests/qemu-iotests/202 | 95 ++++++++++++++

tests/qemu-iotests/202.out | 11 ++

tests/qemu-iotests/203 | 59 +++++++++

tests/qemu-iotests/203.out | 6 +

tests/qemu-iotests/group | 2 +

tests/qemu-iotests/iotests.py | 5 +

28 files changed, 532 insertions(+), 177 deletions(-)

create mode 100755 tests/qemu-iotests/202

create mode 100644 tests/qemu-iotests/202.out

create mode 100755 tests/qemu-iotests/203

create mode 100644 tests/qemu-iotests/203.out

2.14.3

The VM.add_object() method can be used to add IOThreads or memory

backend objects.

Reviewed-by: Eric Blake <eblake@redhat.com>

Message-id: 20171207201320.19284-5-stefanha@redhat.com

tests/qemu-iotests/iotests.py | 5 +++++

1 file changed, 5 insertions(+)

diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py

--- a/tests/qemu-iotests/iotests.py

+++ b/tests/qemu-iotests/iotests.py

@@ -XXX,XX +XXX,XX @@ class VM(qtest.QEMUQtestMachine):

socket_scm_helper=socket_scm_helper)

self._num_drives = 0

+ def add_object(self, opts):

+ self._args.append('-object')

+ self._args.append(opts)

+ return self

+

def add_device(self, opts):

self._args.append('-device')

self._args.append(opts)

2.14.3

Commit 1351d1ec89eabebc9fdff20451a62c413d7accc1 ("qdev: drop iothread

property type") forgot to remove this include.

Message-id: 20171205133954.31006-1-stefanha@redhat.com

hw/core/qdev-properties-system.c | 1 -

diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c

--- a/hw/core/qdev-properties-system.c

+++ b/hw/core/qdev-properties-system.c

@@ -XXX,XX +XXX,XX @@

#include "qapi/visitor.h"

#include "chardev/char-fe.h"

#include "sysemu/tpm_backend.h"

-#include "sysemu/iothread.h"

static void get_pointer(Object *obj, Visitor *v, Property *prop,

char *(*print)(void *ptr),

2.14.3

When a node is already associated with a BlockBackend the

x-blockdev-set-iothread command refuses to set the IOThread. This is to

prevent accidentally changing the IOThread when the nodes are in use.

When the nodes are created with -drive they automatically get a

BlockBackend. In that case we know nothing is using them yet and it's

safe to set the IOThread. Add a force boolean to override the check.

Reviewed-by: Eric Blake <eblake@redhat.com>

Message-id: 20171207201320.19284-4-stefanha@redhat.com

qapi/block-core.json | 6 +++++-

blockdev.c | 11 ++++++-----

2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json

--- a/qapi/block-core.json

+++ b/qapi/block-core.json

@@ -XXX,XX +XXX,XX @@

#

# @iothread: the name of the IOThread object or null for the main loop

#

+# @force: true if the node and its children should be moved when a BlockBackend

+# is already attached

+#

# Note: this command is experimental and intended for test cases that need

# control over IOThreads only.

#

@@ -XXX,XX +XXX,XX @@

##

{ 'command': 'x-blockdev-set-iothread',

'data' : { 'node-name': 'str',

- 'iothread': 'StrOrNull' } }

+ 'iothread': 'StrOrNull',

+ '*force': 'bool' } }

diff --git a/blockdev.c b/blockdev.c

index XXXXXXX..XXXXXXX 100644

--- a/blockdev.c

+++ b/blockdev.c

@@ -XXX,XX +XXX,XX @@ BlockJobInfoList *qmp_query_block_jobs(Error **errp)

}

void qmp_x_blockdev_set_iothread(const char *node_name, StrOrNull *iothread,

- Error **errp)

+ bool has_force, bool force, Error **errp)

{

AioContext *old_context;

AioContext *new_context;

@@ -XXX,XX +XXX,XX @@ void qmp_x_blockdev_set_iothread(const char *node_name, StrOrNull *iothread,

return;

}

- /* If we want to allow more extreme test scenarios this guard could be

- * removed. For now it protects against accidents. */

- if (bdrv_has_blk(bs)) {

- error_setg(errp, "Node %s is in use", node_name);

+ /* Protects against accidents. */

+ if (!(has_force && force) && bdrv_has_blk(bs)) {

+ error_setg(errp, "Node %s is associated with a BlockBackend and could "

+ "be in use (use force=true to override this check)",

+ node_name);

return;

}

2.14.3

See the patch for why nested AioContext locking is no longer allowed.

Reviewed-by: Eric Blake <eblake@redhat.com>

Message-id: 20171207201320.19284-3-stefanha@redhat.com

docs/devel/multiple-iothreads.txt | 7 ++++---

1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/devel/multiple-iothreads.txt b/docs/devel/multiple-iothreads.txt

--- a/docs/devel/multiple-iothreads.txt

+++ b/docs/devel/multiple-iothreads.txt

-Copyright (c) 2014 Red Hat Inc.

+Copyright (c) 2014-2017 Red Hat Inc.

This work is licensed under the terms of the GNU GPL, version 2 or later. See

the COPYING file in the top-level directory.

@@ -XXX,XX +XXX,XX @@ aio_context_acquire()/aio_context_release() for mutual exclusion. Once the

context is acquired no other thread can access it or run event loop iterations

in this AioContext.

-aio_context_acquire()/aio_context_release() calls may be nested. This

-means you can call them if you're not sure whether #2 applies.

+Legacy code sometimes nests aio_context_acquire()/aio_context_release() calls.

+Do not use nesting anymore, it is incompatible with the BDRV_POLL_WHILE() macro

+used in the block layer and can lead to hangs.

There is currently no lock ordering rule if a thread needs to acquire multiple

AioContexts simultaneously. Therefore, it is only safe for code holding the

2.14.3

bdrv_unref() requires the AioContext lock because bdrv_flush() uses

BDRV_POLL_WHILE(), which assumes the AioContext is currently held. If

BDRV_POLL_WHILE() runs without AioContext held the

pthread_mutex_unlock() call in aio_context_release() fails.

This patch moves bdrv_unref() into the AioContext locked region to solve

the following pthread_mutex_unlock() failure:

#0 0x00007f566181969b in raise () at /lib64/libc.so.6

#1 0x00007f566181b3b1 in abort () at /lib64/libc.so.6

#2 0x00005592cd590458 in error_exit (err=<optimized out>, msg=msg@entry=0x5592cdaf6d60 <__func__.23977> "qemu_mutex_unlock") at util/qemu-thread-posix.c:36

#3 0x00005592cd96e738 in qemu_mutex_unlock (mutex=mutex@entry=0x5592ce9505e0) at util/qemu-thread-posix.c:96

#4 0x00005592cd969b69 in aio_context_release (ctx=ctx@entry=0x5592ce950580) at util/async.c:507

#5 0x00005592cd8ead78 in bdrv_flush (bs=bs@entry=0x5592cfa87210) at block/io.c:2478

#6 0x00005592cd89df30 in bdrv_close (bs=0x5592cfa87210) at block.c:3207

#7 0x00005592cd89df30 in bdrv_delete (bs=0x5592cfa87210) at block.c:3395

#8 0x00005592cd89df30 in bdrv_unref (bs=0x5592cfa87210) at block.c:4418

#9 0x00005592cd6b7f86 in qmp_transaction (dev_list=<optimized out>, has_props=<optimized out>, props=<optimized out>, errp=errp@entry=0x7ffe4a1fc9d8) at blockdev.c:2308

Reviewed-by: Kevin Wolf <kwolf@redhat.com>

Reviewed-by: Eric Blake <eblake@redhat.com>

Message-id: 20171206144550.22295-2-stefanha@redhat.com

blockdev.c | 2 +-

diff --git a/blockdev.c b/blockdev.c

index XXXXXXX..XXXXXXX 100644

--- a/blockdev.c

+++ b/blockdev.c

@@ -XXX,XX +XXX,XX @@ static void external_snapshot_clean(BlkActionState *common)

DO_UPCAST(ExternalSnapshotState, common, common);

if (state->aio_context) {

bdrv_drained_end(state->old_bs);

- aio_context_release(state->aio_context);

bdrv_unref(state->new_bs);

+ aio_context_release(state->aio_context);

}

2.14.3