The following changes since commit 813bac3d8d70d85cb7835f7945eb9eed84c2d8d0:

Merge tag '2023q3-bsd-user-pull-request' of https://gitlab.com/bsdimp/qemu into staging (2023-08-29 08:58:00 -0400)

for you to fetch changes up to 87ec6f55af38e29be5b2b65a8acf84da73e06d06:

aio-posix: zero out io_uring sqe user_data (2023-08-30 07:39:59 -0400)

Andrey Drobyshev (3):

block: add subcluster_size field to BlockDriverInfo

block/io: align requests to subcluster_size

tests/qemu-iotests/197: add testcase for CoR with subclusters

Fabiano Rosas (1):

block-migration: Ensure we don't crash during migration cleanup

Stefan Hajnoczi (1):

aio-posix: zero out io_uring sqe user_data

include/block/block-common.h | 5 ++++

include/block/block-io.h | 8 +++---

block.c | 7 +++++

block/io.c | 50 ++++++++++++++++++------------------

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

block/qcow2.c | 1 +

migration/block.c | 11 ++++++--

util/fdmon-io_uring.c | 2 ++

tests/qemu-iotests/197 | 29 +++++++++++++++++++++

tests/qemu-iotests/197.out | 24 +++++++++++++++++

10 files changed, 110 insertions(+), 35 deletions(-)

2.41.0

From: Fabiano Rosas <farosas@suse.de>

We can fail the blk_insert_bs() at init_blk_migration(), leaving the

BlkMigDevState without a dirty_bitmap and BlockDriverState. Account

for the possibly missing elements when doing cleanup.

Fix the following crashes:

Thread 1 "qemu-system-x86" received signal SIGSEGV, Segmentation fault.

0x0000555555ec83ef in bdrv_release_dirty_bitmap (bitmap=0x0) at ../block/dirty-bitmap.c:359

359 BlockDriverState *bs = bitmap->bs;

#0 0x0000555555ec83ef in bdrv_release_dirty_bitmap (bitmap=0x0) at ../block/dirty-bitmap.c:359

#1 0x0000555555bba331 in unset_dirty_tracking () at ../migration/block.c:371

#2 0x0000555555bbad98 in block_migration_cleanup_bmds () at ../migration/block.c:681

Thread 1 "qemu-system-x86" received signal SIGSEGV, Segmentation fault.

0x0000555555e971ff in bdrv_op_unblock (bs=0x0, op=BLOCK_OP_TYPE_BACKUP_SOURCE, reason=0x0) at ../block.c:7073

7073 QLIST_FOREACH_SAFE(blocker, &bs->op_blockers[op], list, next) {

#0 0x0000555555e971ff in bdrv_op_unblock (bs=0x0, op=BLOCK_OP_TYPE_BACKUP_SOURCE, reason=0x0) at ../block.c:7073

#1 0x0000555555e9734a in bdrv_op_unblock_all (bs=0x0, reason=0x0) at ../block.c:7095

#2 0x0000555555bbae13 in block_migration_cleanup_bmds () at ../migration/block.c:690

Signed-off-by: Fabiano Rosas <farosas@suse.de>

Message-id: 20230731203338.27581-1-farosas@suse.de

migration/block.c | 11 +++++++++--

1 file changed, 9 insertions(+), 2 deletions(-)

@@ -XXX,XX +XXX,XX @@ static void unset_dirty_tracking(void)

BlkMigDevState *bmds;

QSIMPLEQ_FOREACH(bmds, &block_mig_state.bmds_list, entry) {

- bdrv_release_dirty_bitmap(bmds->dirty_bitmap);

+ if (bmds->dirty_bitmap) {

+ bdrv_release_dirty_bitmap(bmds->dirty_bitmap);

+ }

+ BlockDriverState *bs;

AioContext *ctx;

unset_dirty_tracking();

while ((bmds = QSIMPLEQ_FIRST(&block_mig_state.bmds_list)) != NULL) {

QSIMPLEQ_REMOVE_HEAD(&block_mig_state.bmds_list, entry);

- bdrv_op_unblock_all(blk_bs(bmds->blk), bmds->blocker);

+

+ bs = blk_bs(bmds->blk);

+ if (bs) {

+ bdrv_op_unblock_all(bs, bmds->blocker);

+ }

error_free(bmds->blocker);

/* Save ctx, because bmds->blk can disappear during blk_unref. */

2.41.0

From: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>

This is going to be used in the subsequent commit as requests alignment

(in particular, during copy-on-read). This value only makes sense for

the formats which support subclusters (currently QCOW2 only). If this

field isn't set by driver's own bdrv_get_info() implementation, we

simply set it equal to the cluster size thus treating each cluster as

having a single subcluster.

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

Reviewed-by: Denis V. Lunev <den@openvz.org>

Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Message-ID: <20230711172553.234055-2-andrey.drobyshev@virtuozzo.com>

---

include/block/block-common.h | 5 +++++

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

block/qcow2.c | 1 +

3 files changed, 13 insertions(+)

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

--- a/include/block/block-common.h

+++ b/include/block/block-common.h

@@ -XXX,XX +XXX,XX @@ typedef struct BlockZoneWps {

typedef struct BlockDriverInfo {

/* in bytes, 0 if irrelevant */

int cluster_size;

+ /*

+ * A fraction of cluster_size, if supported (currently QCOW2 only); if

+ * disabled or unsupported, set equal to cluster_size.

+ */

+ int subcluster_size;

/* offset at which the VM state can be saved (0 if not possible) */

int64_t vm_state_offset;

bool is_dirty;

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

index XXXXXXX..XXXXXXX 100644

--- a/block.c

+++ b/block.c

@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)

memset(bdi, 0, sizeof(*bdi));

ret = drv->bdrv_co_get_info(bs, bdi);

+ if (bdi->subcluster_size == 0) {

+ /*

+ * If the driver left this unset, subclusters are not supported.

+ * Then it is safe to treat each cluster as having only one subcluster.

+ */

+ bdi->subcluster_size = bdi->cluster_size;

+ }