The following changes since commit 89ea03a7dc83ca36b670ba7f787802791fcb04b1:

Merge remote-tracking branch 'remotes/huth-gitlab/tags/m68k-pull-2019-09-07' into staging (2019-09-09 09:48:34 +0100)

for you to fetch changes up to 65f9f0c2a53b1572043501bb4e99500914e88cc6:

qcow2: Stop overwriting compressed clusters one by one (2019-09-12 11:26:59 +0200)

- qcow2: Allow overwriting multiple compressed clusters at once for

better performance

- nfs: add support for nfs_umount

- file-posix: write_zeroes fixes

- qemu-io, blockdev-create, pr-manager: Fix crashes and memory leaks

- qcow2: Fix the calculation of the maximum L2 cache size

- vpc: Fix return code for vpc_co_create()

- blockjob: Code cleanup

- iotests improvements (e.g. for use with valgrind)

Alberto Garcia (2):

qcow2: Fix the calculation of the maximum L2 cache size

qcow2: Stop overwriting compressed clusters one by one

Andrey Shinkevich (6):

iotests: allow Valgrind checking all QEMU processes

iotests: exclude killed processes from running under Valgrind

iotests: Add casenotrun report to bash tests

iotests: Valgrind fails with nonexistent directory

iotests: extended timeout under Valgrind

iotests: extend sleeping time under Valgrind

Kevin Wolf (2):

file-posix: Fix has_write_zeroes after NO_FALLBACK

qemu-io: Don't leak pattern file in error path

Markus Armbruster (1):

pr-manager: Fix invalid g_free() crash bug

Max Reitz (7):

block/file-posix: Reduce xfsctl() use

iotests: Test reverse sub-cluster qcow2 writes

vpc: Return 0 from vpc_co_create() on success

iotests: Add supported protocols to execute_test()

iotests: Restrict file Python tests to file

iotests: Restrict nbd Python tests to nbd

iotests: Test blockdev-create for vpc

From: Philippe Mathieu-Daudé <philmd@redhat.com>

The 'blockdev-create' QMP command was introduced as experimental

feature in commit b0292b851b8, using the assert() debug call.

It got promoted to 'stable' command in 3fb588a0f2c, but the

assert call was not removed.

Some block drivers are optional, and bdrv_find_format() might

return a NULL value, triggering the assertion.

Stable code is not expected to abort, so return an error instead.

This is easily reproducible when libnfs is not installed:

./configure

[...]

module support no

Block whitelist (rw)

Block whitelist (ro)

libiscsi support yes

libnfs support no

[...]

Start QEMU:

$ qemu-system-x86_64 -S -qmp unix:/tmp/qemu.qmp,server,nowait

Send the 'blockdev-create' with the 'nfs' driver:

$ ( cat << 'EOF'

{'execute': 'qmp_capabilities'}

{'execute': 'blockdev-create', 'arguments': {'job-id': 'x', 'options': {'size': 0, 'driver': 'nfs', 'location': {'path': '/', 'server': {'host': '::1', 'type': 'inet'}}}}, 'id': 'x'}

EOF

) | socat STDIO UNIX:/tmp/qemu.qmp

{"QMP": {"version": {"qemu": {"micro": 50, "minor": 1, "major": 4}, "package": "v4.1.0-733-g89ea03a7dc"}, "capabilities": ["oob"]}}

{"return": {}}

QEMU crashes:

$ gdb qemu-system-x86_64 core

Program received signal SIGSEGV, Segmentation fault.

(gdb) bt

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

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

#2 0x00007ffff50f3769 in _nl_load_domain.cold.0 () at /lib64/libc.so.6

#3 0x00007ffff5101a26 in .annobin_assert.c_end () at /lib64/libc.so.6

#4 0x0000555555d7e1f1 in qmp_blockdev_create (job_id=0x555556baee40 "x", options=0x555557666610, errp=0x7fffffffc770) at block/create.c:69

#5 0x0000555555c96b52 in qmp_marshal_blockdev_create (args=0x7fffdc003830, ret=0x7fffffffc7f8, errp=0x7fffffffc7f0) at qapi/qapi-commands-block-core.c:1314

#6 0x0000555555deb0a0 in do_qmp_dispatch (cmds=0x55555645de70 <qmp_commands>, request=0x7fffdc005c70, allow_oob=false, errp=0x7fffffffc898) at qapi/qmp-dispatch.c:131

#7 0x0000555555deb2a1 in qmp_dispatch (cmds=0x55555645de70 <qmp_commands>, request=0x7fffdc005c70, allow_oob=false) at qapi/qmp-dispatch.c:174

With this patch applied, QEMU returns a QMP error:

{'execute': 'blockdev-create', 'arguments': {'job-id': 'x', 'options': {'size': 0, 'driver': 'nfs', 'location': {'path': '/', 'server': {'host': '::1', 'type': 'inet'}}}}, 'id': 'x'}

{"id": "x", "error": {"class": "GenericError", "desc": "Block driver 'nfs' not found or not supported"}}

Cc: qemu-stable@nongnu.org

Reported-by: Xu Tian <xutian@redhat.com>

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

block/create.c | 6 +++++-

1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/block/create.c b/block/create.c

--- a/block/create.c

+++ b/block/create.c

@@ -XXX,XX +XXX,XX @@ void qmp_blockdev_create(const char *job_id, BlockdevCreateOptions *options,

const char *fmt = BlockdevDriver_str(options->driver);

BlockDriver *drv = bdrv_find_format(fmt);

+ if (!drv) {

+ error_setg(errp, "Block driver '%s' not found or not supported", fmt);

+ return;

+ }

/* If the driver is in the schema, we know that it exists. But it may not

* be whitelisted. */

- assert(drv);

if (bdrv_uses_whitelist() && !bdrv_is_whitelisted(drv, false)) {

error_setg(errp, "Driver is not whitelisted");

return;

2.20.1

From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>

To synchronize the time when QEMU is running longer under the Valgrind,

increase the sleeping time in the test 247.

Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Reviewed-by: John Snow <jsnow@redhat.com>

tests/qemu-iotests/247 | 6 +++++-

1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247

--- a/tests/qemu-iotests/247

+++ b/tests/qemu-iotests/247

@@ -XXX,XX +XXX,XX @@ TEST_IMG="$TEST_IMG.4" _make_test_img $size

{"execute":"block-commit",

"arguments":{"device":"format-4", "top-node": "format-2", "base-node":"format-0", "job-id":"job0"}}

EOF

-sleep 1

+if [ "${VALGRIND_QEMU}" == "y" ]; then

+ sleep 10

+else

+ sleep 1

+fi

echo '{"execute":"quit"}'

) | $QEMU -qmp stdio -nographic -nodefaults \

-blockdev file,node-name=file-0,filename=$TEST_IMG.0,auto-read-only=on \

2.20.1

From: Peter Lieven <pl@kamp.de>

libnfs recently added support for unmounting. Add support

in Qemu too.

Signed-off-by: Peter Lieven <pl@kamp.de>

block/nfs.c | 5 ++++-

1 file changed, 4 insertions(+), 1 deletion(-)

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

/*

* QEMU Block driver for native access to files on NFS shares

*

- * Copyright (c) 2014-2017 Peter Lieven <pl@kamp.de>

+ * Copyright (c) 2014-2019 Peter Lieven <pl@kamp.de>

*

* Permission is hereby granted, free of charge, to any person obtaining a copy

* of this software and associated documentation files (the "Software"), to deal

@@ -XXX,XX +XXX,XX @@ static void nfs_client_close(NFSClient *client)

nfs_close(client->context, client->fh);

client->fh = NULL;

+#ifdef LIBNFS_FEATURE_UMOUNT

+ nfs_umount(client->context);

+#endif

aio_set_fd_handler(client->aio_context, nfs_get_fd(client->context),

false, NULL, NULL, NULL, NULL);

nfs_destroy_context(client->context);

2.20.1

From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>

As the iotests run longer under the Valgrind, the QEMU_COMM_TIMEOUT is

to be increased in the test cases 028, 183 and 192 when running under

the Valgrind.

Suggested-by: Roman Kagan <rkagan@virtuozzo.com>

Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>

Reviewed-by: John Snow <jsnow@redhat.com>

tests/qemu-iotests/028 | 6 +++++-

tests/qemu-iotests/183 | 9 ++++++++-

tests/qemu-iotests/192 | 6 +++++-

3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/028

+++ b/tests/qemu-iotests/028

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

qemu_comm_method="monitor"

_launch_qemu -drive file="${TEST_IMG}",cache=${CACHEMODE},id=disk

h=$QEMU_HANDLE

-QEMU_COMM_TIMEOUT=1

+if [ "${VALGRIND_QEMU}" == "y" ]; then

+ QEMU_COMM_TIMEOUT=7

+else

+ QEMU_COMM_TIMEOUT=1

+fi

# Silence output since it contains the disk image path and QEMU's readline

# character echoing makes it very hard to filter the output. Plus, there

diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/183

+++ b/tests/qemu-iotests/183

@@ -XXX,XX +XXX,XX @@ if echo "$reply" | grep "compiled without old-style" > /dev/null; then

_notrun "migrate -b support not compiled in"

fi

-QEMU_COMM_TIMEOUT=0.1 qemu_cmd_repeat=50 silent=yes \

+timeout_comm=$QEMU_COMM_TIMEOUT

+if [ "${VALGRIND_QEMU}" == "y" ]; then

+ QEMU_COMM_TIMEOUT=4

+else

+ QEMU_COMM_TIMEOUT=0.1

+fi

+qemu_cmd_repeat=50 silent=yes \

_send_qemu_cmd $src "{ 'execute': 'query-migrate' }" '"status": "completed"'

+QEMU_COMM_TIMEOUT=$timeout_comm

_send_qemu_cmd $src "{ 'execute': 'query-status' }" "return"

echo

diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/192

+++ b/tests/qemu-iotests/192

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

qemu_comm_method="monitor"

_launch_qemu -drive $DRIVE_ARG -incoming defer

h=$QEMU_HANDLE

-QEMU_COMM_TIMEOUT=1

+if [ "${VALGRIND_QEMU}" == "y" ]; then

+ QEMU_COMM_TIMEOUT=7

+else

+ QEMU_COMM_TIMEOUT=1

+fi

_send_qemu_cmd $h "nbd_server_start unix:$TEST_DIR/nbd" "(qemu)"

_send_qemu_cmd $h "nbd_server_add -w drive0" "(qemu)"

2.20.1

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

In job_finish_sync job_enter should be enough for a job to make some

progress and draining is a wrong tool for it. So use job_enter directly

here and drop job_drain with all related staff not used more.

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

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Tested-by: John Snow <jsnow@redhat.com>

Reviewed-by: John Snow <jsnow@redhat.com>

include/block/blockjob_int.h | 19 -------------------

include/qemu/job.h | 13 -------------

block/backup.c | 19 +------------------

block/commit.c | 1 -

block/mirror.c | 28 +++-------------------------

block/stream.c | 1 -

blockjob.c | 13 -------------

job.c | 12 +-----------

tests/test-bdrv-drain.c | 3 ---

tests/test-block-iothread.c | 1 -

tests/test-blockjob-txn.c | 1 -

tests/test-blockjob.c | 2 --

12 files changed, 5 insertions(+), 108 deletions(-)

diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h

index XXXXXXX..XXXXXXX 100644

--- a/include/block/blockjob_int.h

+++ b/include/block/blockjob_int.h

@@ -XXX,XX +XXX,XX @@ struct BlockJobDriver {

* besides job->blk to the new AioContext.

*/

void (*attached_aio_context)(BlockJob *job, AioContext *new_context);

-

- /*

- * If the callback is not NULL, it will be invoked when the job has to be

- * synchronously cancelled or completed; it should drain BlockDriverStates

- * as required to ensure progress.

- *

- * Block jobs must use the default implementation for job_driver.drain,

- * which will in turn call this callback after doing generic block job

- * stuff.

- */

- void (*drain)(BlockJob *job);

};

/**

@@ -XXX,XX +XXX,XX @@ void block_job_free(Job *job);

*/

void block_job_user_resume(Job *job);

-/**

- * block_job_drain:

- * Callback to be used for JobDriver.drain in all block jobs. Drains the main

- * block node associated with the block jobs and calls BlockJobDriver.drain for

- * job-specific actions.

- */

-void block_job_drain(Job *job);

-

/**

* block_job_ratelimit_get_delay:

*

diff --git a/include/qemu/job.h b/include/qemu/job.h

index XXXXXXX..XXXXXXX 100644

--- a/include/qemu/job.h

+++ b/include/qemu/job.h

@@ -XXX,XX +XXX,XX @@ struct JobDriver {

*/

void (*complete)(Job *job, Error **errp);

- /*

- * If the callback is not NULL, it will be invoked when the job has to be

- * synchronously cancelled or completed; it should drain any activities

- * as required to ensure progress.

- */

- void (*drain)(Job *job);

-

/**

* If the callback is not NULL, prepare will be invoked when all the jobs

* belonging to the same transaction complete; or upon this job's completion

@@ -XXX,XX +XXX,XX @@ bool job_user_paused(Job *job);

*/

void job_user_resume(Job *job, Error **errp);

-/*

- * Drain any activities as required to ensure progress. This can be called in a

- * loop to synchronously complete a job.

- */

-void job_drain(Job *job);

-

/**

* Get the next element from the list of block jobs after @job, or the

* first one if @job is %NULL.

diff --git a/block/backup.c b/block/backup.c

index XXXXXXX..XXXXXXX 100644

--- a/block/backup.c

+++ b/block/backup.c

@@ -XXX,XX +XXX,XX @@ void backup_do_checkpoint(BlockJob *job, Error **errp)

bdrv_set_dirty_bitmap(backup_job->copy_bitmap, 0, backup_job->len);

-static void backup_drain(BlockJob *job)

-{

- BackupBlockJob *s = container_of(job, BackupBlockJob, common);

-

- /* Need to keep a reference in case blk_drain triggers execution

- * of backup_complete...

- */

- if (s->target) {

- BlockBackend *target = s->target;

- blk_ref(target);

- blk_drain(target);

- blk_unref(target);

- }

-}

-

static BlockErrorAction backup_error_action(BackupBlockJob *job,

bool read, int error)

@@ -XXX,XX +XXX,XX @@ static const BlockJobDriver backup_job_driver = {

.job_type = JOB_TYPE_BACKUP,

.free = block_job_free,

.user_resume = block_job_user_resume,

- .drain = block_job_drain,

.run = backup_run,

.commit = backup_commit,

.abort = backup_abort,

.clean = backup_clean,

- },

- .drain = backup_drain,

+ }

};

static int64_t backup_calculate_cluster_size(BlockDriverState *target,

@@ -XXX,XX +XXX,XX @@ static const BlockJobDriver commit_job_driver = {

.job_type = JOB_TYPE_COMMIT,

.free = block_job_free,

.user_resume = block_job_user_resume,

- .drain = block_job_drain,

.run = commit_run,

.prepare = commit_prepare,

.abort = commit_abort,

@@ -XXX,XX +XXX,XX @@ static int mirror_exit_common(Job *job)

bdrv_ref(mirror_top_bs);

bdrv_ref(target_bs);

- /* Remove target parent that still uses BLK_PERM_WRITE/RESIZE before

+ /*

+ * Remove target parent that still uses BLK_PERM_WRITE/RESIZE before

* inserting target_bs at s->to_replace, where we might not be able to get

* these permissions.

- *

- * Note that blk_unref() alone doesn't necessarily drop permissions because

- * we might be running nested inside mirror_drain(), which takes an extra

- * reference, so use an explicit blk_set_perm() first. */

- blk_set_perm(s->target, 0, BLK_PERM_ALL, &error_abort);

+ */

blk_unref(s->target);

s->target = NULL;

@@ -XXX,XX +XXX,XX @@ static bool mirror_drained_poll(BlockJob *job)

return !!s->in_flight;

}

-static void mirror_drain(BlockJob *job)

-{

- MirrorBlockJob *s = container_of(job, MirrorBlockJob, common);

-

- /* Need to keep a reference in case blk_drain triggers execution

- * of mirror_complete...

- */

- if (s->target) {

- BlockBackend *target = s->target;

- blk_ref(target);

- blk_drain(target);

- blk_unref(target);

- }

-}

-

static const BlockJobDriver mirror_job_driver = {

.job_driver = {

.instance_size = sizeof(MirrorBlockJob),

.job_type = JOB_TYPE_MIRROR,

.free = block_job_free,

.user_resume = block_job_user_resume,

- .drain = block_job_drain,

.run = mirror_run,

.prepare = mirror_prepare,

.abort = mirror_abort,

@@ -XXX,XX +XXX,XX @@ static const BlockJobDriver mirror_job_driver = {

.complete = mirror_complete,

},

.drained_poll = mirror_drained_poll,

- .drain = mirror_drain,

};

static const BlockJobDriver commit_active_job_driver = {

@@ -XXX,XX +XXX,XX @@ static const BlockJobDriver commit_active_job_driver = {

.job_type = JOB_TYPE_COMMIT,

.free = block_job_free,

.user_resume = block_job_user_resume,

- .drain = block_job_drain,

.run = mirror_run,

.prepare = mirror_prepare,

.abort = mirror_abort,

@@ -XXX,XX +XXX,XX @@ static const BlockJobDriver commit_active_job_driver = {

.complete = mirror_complete,

},

.drained_poll = mirror_drained_poll,

- .drain = mirror_drain,

};

static void coroutine_fn

diff --git a/block/stream.c b/block/stream.c

index XXXXXXX..XXXXXXX 100644

--- a/block/stream.c

+++ b/block/stream.c

@@ -XXX,XX +XXX,XX @@ static const BlockJobDriver stream_job_driver = {

.abort = stream_abort,

.clean = stream_clean,

.user_resume = block_job_user_resume,

- .drain = block_job_drain,

},

};

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

index XXXXXXX..XXXXXXX 100644

--- a/blockjob.c

+++ b/blockjob.c

@@ -XXX,XX +XXX,XX @@ void block_job_free(Job *job)

error_free(bjob->blocker);

}

-void block_job_drain(Job *job)

-{

- BlockJob *bjob = container_of(job, BlockJob, job);

- const JobDriver *drv = job->driver;

- BlockJobDriver *bjdrv = container_of(drv, BlockJobDriver, job_driver);

-

- blk_drain(bjob->blk);

- if (bjdrv->drain) {

- bjdrv->drain(bjob);

- }

-}

-