The following changes since commit dd2db39d78431ab5a0b78777afaab3d61e94533e:

Merge remote-tracking branch 'remotes/ehabkost-gl/tags/x86-next-pull-request' into staging (2021-06-01 21:23:26 +0100)

for you to fetch changes up to b317006a3f1f04191a7981cef83417cb2477213b:

docs/secure-coding-practices: Describe how to use 'null-co' block driver (2021-06-02 14:29:14 +0200)

Block layer patches

- NBD server: Fix crashes related to switching between AioContexts

- file-posix: Workaround for discard/write_zeroes on buggy filesystems

- Follow-up fixes for the reopen vs. permission changes

- quorum: Fix error handling for flush

- block-copy: Refactor copy_range handling

- docs: Describe how to use 'null-co' block driver

Lukas Straub (1):

block/quorum: Provide .bdrv_co_flush instead of .bdrv_co_flush_to_disk

Philippe Mathieu-Daudé (1):

docs/secure-coding-practices: Describe how to use 'null-co' block driver

Sergio Lopez (2):

block-backend: add drained_poll

nbd/server: Use drained block ops to quiesce the server

Thomas Huth (2):

block/file-posix: Fix problem with fallocate(PUNCH_HOLE) on GPFS

block/file-posix: Try other fallbacks after invalid FALLOC_FL_ZERO_RANGE

Vladimir Sementsov-Ogievskiy (14):

qemu-io-cmds: assert that we don't have .perm requested in no-blk case

block/vvfat: child_vvfat_qcow: add .get_parent_aio_context, fix crash

block/vvfat: fix vvfat_child_perm crash

block: consistently use bdrv_is_read_only()

block: drop BlockDriverState::read_only

block: drop BlockBackendRootState::read_only

block: document child argument of bdrv_attach_child_common()

block-backend: improve blk_root_get_parent_desc()

block: improve bdrv_child_get_parent_desc()

block/vvfat: inherit child_vvfat_qcow from child_of_bds

block: simplify bdrv_child_user_desc()

block: improve permission conflict error message

block-copy: fix block_copy_task_entry() progress update

block-copy: refactor copy_range handling

docs/devel/secure-coding-practices.rst | 9 ++++

include/block/block.h | 1 +

include/block/block_int.h | 2 -

include/sysemu/block-backend.h | 4 ++

block.c | 82 ++++++++++++++++++++--------------

block/block-backend.c | 26 +++++------

block/block-copy.c | 80 ++++++++++++++++++++++-----------

block/commit.c | 2 +-

block/file-posix.c | 29 ++++++++----

block/io.c | 4 +-

block/qapi.c | 2 +-

block/qcow2-snapshot.c | 2 +-

block/qcow2.c | 5 +--

block/quorum.c | 2 +-

block/snapshot.c | 2 +-

block/vhdx-log.c | 2 +-

block/vvfat.c | 14 +++---

blockdev.c | 3 +-

nbd/server.c | 82 +++++++++++++++++++++++++---------

qemu-io-cmds.c | 14 +++++-

tests/unit/test-block-iothread.c | 6 ---

tests/qemu-iotests/283.out | 2 +-

tests/qemu-iotests/307.out | 2 +-

tests/qemu-iotests/tests/qsd-jobs.out | 2 +-

24 files changed, 241 insertions(+), 138 deletions(-)

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

It's better to use accessor function instead of bs->read_only directly.

In some places use bdrv_is_writable() instead of

checking both BDRV_O_RDWR set and BDRV_O_INACTIVE not set.

In bdrv_open_common() it's a bit strange to add one more variable, but

we are going to drop bs->read_only in the next patch, so new ro local

variable substitutes it here.

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

Message-Id: <20210527154056.70294-2-vsementsov@virtuozzo.com>

block.c | 11 +++++++----

block/block-backend.c | 2 +-

block/commit.c | 2 +-

block/io.c | 4 ++--

block/qapi.c | 2 +-

block/qcow2-snapshot.c | 2 +-

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

block/snapshot.c | 2 +-

block/vhdx-log.c | 2 +-

9 files changed, 17 insertions(+), 15 deletions(-)

@@ -XXX,XX +XXX,XX @@ bdrv_co_write_req_prepare(BdrvChild *child, int64_t offset, int64_t bytes,

bdrv_check_request(offset, bytes, &error_abort);

- if (bs->read_only) {

+ if (bdrv_is_read_only(bs)) {

return -EPERM;

@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,

if (new_bytes) {

bdrv_make_request_serialising(&req, 1);

}

- if (bs->read_only) {

+ if (bdrv_is_read_only(bs)) {

error_setg(errp, "Image is read-only");

ret = -EACCES;

goto out;

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

--- a/block/qapi.c

+++ b/block/qapi.c

@@ -XXX,XX +XXX,XX @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,

info = g_malloc0(sizeof(*info));

info->file = g_strdup(bs->filename);

- info->ro = bs->read_only;

+ info->ro = bdrv_is_read_only(bs);

info->drv = g_strdup(bs->drv->format_name);

info->encrypted = bs->encrypted;

diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c

index XXXXXXX..XXXXXXX 100644

--- a/block/qcow2-snapshot.c

+++ b/block/qcow2-snapshot.c

@@ -XXX,XX +XXX,XX @@ int qcow2_snapshot_load_tmp(BlockDriverState *bs,

int new_l1_bytes;

int ret;

- assert(bs->read_only);

+ assert(bdrv_is_read_only(bs));

/* Search the snapshot */

snapshot_index = find_snapshot_by_id_and_name(bs, snapshot_id, name);

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

index XXXXXXX..XXXXXXX 100644

--- a/block/qcow2.c

+++ b/block/qcow2.c

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,

/* Clear unknown autoclear feature bits */

update_header |= s->autoclear_features & ~QCOW2_AUTOCLEAR_MASK;

- update_header =

- update_header && !bs->read_only && !(flags & BDRV_O_INACTIVE);

+ update_header = update_header && bdrv_is_writable(bs);

if (update_header) {

s->autoclear_features &= QCOW2_AUTOCLEAR_MASK;

}

@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,

bs->supported_truncate_flags = BDRV_REQ_ZERO_WRITE;

/* Repair image if dirty */

- if (!(flags & (BDRV_O_CHECK | BDRV_O_INACTIVE)) && !bs->read_only &&

+ if (!(flags & BDRV_O_CHECK) && bdrv_is_writable(bs) &&

(s->incompatible_features & QCOW2_INCOMPAT_DIRTY)) {

BdrvCheckResult result = {0};

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

index XXXXXXX..XXXXXXX 100644

--- a/block/snapshot.c

+++ b/block/snapshot.c

@@ -XXX,XX +XXX,XX @@ int bdrv_snapshot_load_tmp(BlockDriverState *bs,

error_setg(errp, "snapshot_id and name are both NULL");

return -EINVAL;

}

- if (!bs->read_only) {

+ if (!bdrv_is_read_only(bs)) {

error_setg(errp, "Device is not readonly");

return -EINVAL;

}

diff --git a/block/vhdx-log.c b/block/vhdx-log.c

index XXXXXXX..XXXXXXX 100644

--- a/block/vhdx-log.c

+++ b/block/vhdx-log.c

@@ -XXX,XX +XXX,XX @@ int vhdx_parse_log(BlockDriverState *bs, BDRVVHDXState *s, bool *flushed,

}

if (logs.valid) {

- if (bs->read_only) {

+ if (bdrv_is_read_only(bs)) {

bdrv_refresh_filename(bs);

ret = -EPERM;

error_setg(errp,

2.30.2

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

This variable is just a cache for !(bs->open_flags & BDRV_O_RDWR),

which we have to synchronize everywhere. Let's just drop it and

consistently use bdrv_is_read_only().

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

Message-Id: <20210527154056.70294-3-vsementsov@virtuozzo.com>

include/block/block_int.h | 1 -

block.c | 7 +------

tests/unit/test-block-iothread.c | 6 ------

3 files changed, 1 insertion(+), 13 deletions(-)

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

--- a/include/block/block_int.h

+++ b/include/block/block_int.h

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

* locking needed during I/O...

*/

int open_flags; /* flags used to open the file, re-used for re-open */

- bool read_only; /* if true, the media is read only */

bool encrypted; /* if true, the media is encrypted */

bool sg; /* if true, the device is a /dev/sg* */

bool probed; /* if true, format was probed rather than specified */

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

index XXXXXXX..XXXXXXX 100644

--- a/block.c

+++ b/block.c

@@ -XXX,XX +XXX,XX @@ void bdrv_parse_filename_strip_prefix(const char *filename, const char *prefix,

* image is inactivated. */

bool bdrv_is_read_only(BlockDriverState *bs)

{

- return bs->read_only;

+ return !(bs->open_flags & BDRV_O_RDWR);

int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only,

@@ -XXX,XX +XXX,XX @@ int bdrv_apply_auto_read_only(BlockDriverState *bs, const char *errmsg,

- bs->read_only = true;

bs->open_flags &= ~BDRV_O_RDWR;

return 0;

@@ -XXX,XX +XXX,XX @@ static int bdrv_open_driver(BlockDriverState *bs, BlockDriver *drv,

bs->drv = drv;

- bs->read_only = !(bs->open_flags & BDRV_O_RDWR);

bs->opaque = g_malloc0(drv->instance_size);

if (drv->bdrv_file_open) {

@@ -XXX,XX +XXX,XX @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,

trace_bdrv_open_common(bs, filename ?: "", bs->open_flags,

drv->format_name);

- bs->read_only = !(bs->open_flags & BDRV_O_RDWR);

-

ro = bdrv_is_read_only(bs);

if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv, ro)) {

@@ -XXX,XX +XXX,XX @@ static void bdrv_reopen_commit(BDRVReopenState *reopen_state)

bs->explicit_options = reopen_state->explicit_options;

bs->options = reopen_state->options;

bs->open_flags = reopen_state->flags;

- bs->read_only = !(reopen_state->flags & BDRV_O_RDWR);

bs->detect_zeroes = reopen_state->detect_zeroes;

if (reopen_state->replace_backing_bs) {

diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c

index XXXXXXX..XXXXXXX 100644

--- a/tests/unit/test-block-iothread.c

+++ b/tests/unit/test-block-iothread.c

@@ -XXX,XX +XXX,XX @@ static void test_sync_op_truncate(BdrvChild *c)

g_assert_cmpint(ret, ==, -EINVAL);

/* Error: Read-only image */

- c->bs->read_only = true;

c->bs->open_flags &= ~BDRV_O_RDWR;

ret = bdrv_truncate(c, 65536, false, PREALLOC_MODE_OFF, 0, NULL);

g_assert_cmpint(ret, ==, -EACCES);

- c->bs->read_only = false;

c->bs->open_flags |= BDRV_O_RDWR;

2.30.2

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

We have different types of parents: block nodes, block backends and

jobs. So, it makes sense to specify type together with name.

While being here also use g_autofree.

iotest 307 output is updated.

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

Reviewed-by: Alberto Garcia <berto@igalia.com>

Message-Id: <20210601075218.79249-3-vsementsov@virtuozzo.com>

block/block-backend.c | 9 ++++-----

tests/qemu-iotests/307.out | 2 +-

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