The following changes since commit 028f2361d0c2d28d6f918fe618f389228ac22b60:

Merge tag 'pull-target-arm-20220609' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2022-06-09 06:47:03 -0700)

for you to fetch changes up to 7f9a8b3342ff00d3398fdc08264948762d748edb:

nbd: Drop dead code spotted by Coverity (2022-06-09 18:07:17 +0200)

Block layer patches

- Add vduse-blk export

- Dirty bitmaps: Fix and improve bitmap merge

- gluster: correctly set max_pdiscard

- rbd: report a better error when namespace does not exist

- aio_wait_kick: add missing memory barrier

- Code cleanups

Emanuele Giuseppe Esposito (1):

aio_wait_kick: add missing memory barrier

Eric Blake (1):

nbd: Drop dead code spotted by Coverity

Fabian Ebner (1):

block/gluster: correctly set max_pdiscard

Stefan Hajnoczi (3):

block: drop unused bdrv_co_drain() API

block: get rid of blk->guest_block_size

qsd: document vduse-blk exports

Stefano Garzarella (1):

block/rbd: report a better error when namespace does not exist

Vladimir Sementsov-Ogievskiy (3):

block: block_dirty_bitmap_merge(): fix error path

block: improve block_dirty_bitmap_merge(): don't allocate extra bitmap

block: simplify handling of try to merge different sized bitmaps

From: Vladimir Sementsov-Ogievskiy <vsementsov@openvz.org>

At the end we ignore failure of bdrv_merge_dirty_bitmap() and report

success. And still set errp. That's wrong.

Signed-off-by: Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru>

Reviewed-by: Nikita Lapshin <nikita.lapshin@virtuozzo.com>

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

Message-Id: <20220517111206.23585-2-v.sementsov-og@mail.ru>

block/monitor/bitmap-qmp-cmds.c | 5 ++++-

diff --git a/block/monitor/bitmap-qmp-cmds.c b/block/monitor/bitmap-qmp-cmds.c

--- a/block/monitor/bitmap-qmp-cmds.c

+++ b/block/monitor/bitmap-qmp-cmds.c

@@ -XXX,XX +XXX,XX @@ BdrvDirtyBitmap *block_dirty_bitmap_merge(const char *node, const char *target,

}

/* Merge into dst; dst is unchanged on failure. */

- bdrv_merge_dirty_bitmap(dst, anon, backup, errp);

+ if (!bdrv_merge_dirty_bitmap(dst, anon, backup, errp)) {

+ dst = NULL;

+ goto out;

+ }

out:

bdrv_release_dirty_bitmap(anon);

2.35.3

From: Vladimir Sementsov-Ogievskiy <vsementsov@openvz.org>

We don't need extra bitmap. All we need is to backup the original

bitmap when we do first merge. So, drop extra temporary bitmap and work

directly with target and backup.

Still to keep old semantics, that on failure target is unchanged and

user don't need to restore, we need a local_backup variable and do

restore ourselves on failure path.

Signed-off-by: Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru>

Message-Id: <20220517111206.23585-3-v.sementsov-og@mail.ru>

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

block/monitor/bitmap-qmp-cmds.c | 41 +++++++++++++++++----------------

1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/block/monitor/bitmap-qmp-cmds.c b/block/monitor/bitmap-qmp-cmds.c

--- a/block/monitor/bitmap-qmp-cmds.c

+++ b/block/monitor/bitmap-qmp-cmds.c

@@ -XXX,XX +XXX,XX @@ BdrvDirtyBitmap *block_dirty_bitmap_merge(const char *node, const char *target,

HBitmap **backup, Error **errp)

{

BlockDriverState *bs;

- BdrvDirtyBitmap *dst, *src, *anon;

+ BdrvDirtyBitmap *dst, *src;

BlockDirtyBitmapOrStrList *lst;

+ HBitmap *local_backup = NULL;

GLOBAL_STATE_CODE();

@@ -XXX,XX +XXX,XX @@ BdrvDirtyBitmap *block_dirty_bitmap_merge(const char *node, const char *target,

return NULL;

- anon = bdrv_create_dirty_bitmap(bs, bdrv_dirty_bitmap_granularity(dst),

- NULL, errp);

- if (!anon) {

- return NULL;

for (lst = bms; lst; lst = lst->next) {

switch (lst->value->type) {

const char *name, *node;

@@ -XXX,XX +XXX,XX @@ BdrvDirtyBitmap *block_dirty_bitmap_merge(const char *node, const char *target,

src = bdrv_find_dirty_bitmap(bs, name);

if (!src) {

error_setg(errp, "Dirty bitmap '%s' not found", name);

- dst = NULL;

- goto out;

+ goto fail;

}

break;

case QTYPE_QDICT:

@@ -XXX,XX +XXX,XX @@ BdrvDirtyBitmap *block_dirty_bitmap_merge(const char *node, const char *target,

name = lst->value->u.external.name;

src = block_dirty_bitmap_lookup(node, name, NULL, errp);

if (!src) {

- dst = NULL;

- goto out;

+ goto fail;

}

break;

default:

abort();

}

- if (!bdrv_merge_dirty_bitmap(anon, src, NULL, errp)) {

- dst = NULL;

- goto out;

+ /* We do backup only for first merge operation */

+ if (!bdrv_merge_dirty_bitmap(dst, src,

+ local_backup ? NULL : &local_backup,

+ errp))

+ {

+ goto fail;

}

}

- /* Merge into dst; dst is unchanged on failure. */

- if (!bdrv_merge_dirty_bitmap(dst, anon, backup, errp)) {

- dst = NULL;

- goto out;

+ if (backup) {

+ *backup = local_backup;

+ } else {

+ hbitmap_free(local_backup);

}

- out:

- bdrv_release_dirty_bitmap(anon);

return dst;

+

+fail:

+ if (local_backup) {

+ bdrv_restore_dirty_bitmap(dst, local_backup);

+ }

+

+ return NULL;

}

void qmp_block_dirty_bitmap_merge(const char *node, const char *target,

2.35.3

From: Vladimir Sementsov-Ogievskiy <vsementsov@openvz.org>

We have too much logic to simply check that bitmaps are of the same

size. Let's just define that hbitmap_merge() and

bdrv_dirty_bitmap_merge_internal() require their argument bitmaps be of

same size, this simplifies things.

Let's look through the callers:

For backup_init_bcs_bitmap() we already assert that merge can't fail.

In bdrv_reclaim_dirty_bitmap_locked() we gracefully handle the error

that can't happen: successor always has same size as its parent, drop

this logic.

In bdrv_merge_dirty_bitmap() we already has assertion and separate

check. Make the check explicit and improve error message.

Signed-off-by: Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru>

Reviewed-by: Nikita Lapshin <nikita.lapshin@virtuozzo.com>

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

Message-Id: <20220517111206.23585-4-v.sementsov-og@mail.ru>

include/block/block_int-io.h | 2 +-

include/qemu/hbitmap.h | 15 ++-------------

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

block/dirty-bitmap.c | 26 +++++++++++---------------

util/hbitmap.c | 25 +++++++------------------

5 files changed, 23 insertions(+), 51 deletions(-)

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ bool blk_dev_is_tray_open(BlockBackend *blk);

void bdrv_set_dirty(BlockDriverState *bs, int64_t offset, int64_t bytes);

void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap **out);

-bool bdrv_dirty_bitmap_merge_internal(BdrvDirtyBitmap *dest,

+void bdrv_dirty_bitmap_merge_internal(BdrvDirtyBitmap *dest,

const BdrvDirtyBitmap *src,

HBitmap **backup, bool lock);

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

index XXXXXXX..XXXXXXX 100644

--- a/include/qemu/hbitmap.h

+++ b/include/qemu/hbitmap.h

@@ -XXX,XX +XXX,XX @@ void hbitmap_truncate(HBitmap *hb, uint64_t size);

*

* Store result of merging @a and @b into @result.

* @result is allowed to be equal to @a or @b.

- *

- * Return true if the merge was successful,

- * false if it was not attempted.

- */

-bool hbitmap_merge(const HBitmap *a, const HBitmap *b, HBitmap *result);

-

-/**

- * hbitmap_can_merge:

- *

- * hbitmap_can_merge(a, b) && hbitmap_can_merge(a, result) is sufficient and

- * necessary for hbitmap_merge will not fail.

- *

+ * All bitmaps must have same size.

*/

-bool hbitmap_can_merge(const HBitmap *a, const HBitmap *b);

+void hbitmap_merge(const HBitmap *a, const HBitmap *b, HBitmap *result);

/**

* hbitmap_empty:

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 @@ out:

static void backup_init_bcs_bitmap(BackupBlockJob *job)

{

- bool ret;

uint64_t estimate;

BdrvDirtyBitmap *bcs_bitmap = block_copy_dirty_bitmap(job->bcs);

if (job->sync_mode == MIRROR_SYNC_MODE_BITMAP) {

bdrv_clear_dirty_bitmap(bcs_bitmap, NULL);

- ret = bdrv_dirty_bitmap_merge_internal(bcs_bitmap, job->sync_bitmap,

- NULL, true);

- assert(ret);

+ bdrv_dirty_bitmap_merge_internal(bcs_bitmap, job->sync_bitmap, NULL,

+ true);

} else if (job->sync_mode == MIRROR_SYNC_MODE_TOP) {

/*

* We can't hog the coroutine to initialize this thoroughly.

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

index XXXXXXX..XXXXXXX 100644

--- a/block/dirty-bitmap.c

+++ b/block/dirty-bitmap.c

@@ -XXX,XX +XXX,XX @@ BdrvDirtyBitmap *bdrv_reclaim_dirty_bitmap_locked(BdrvDirtyBitmap *parent,

return NULL;

}

- if (!hbitmap_merge(parent->bitmap, successor->bitmap, parent->bitmap)) {

- error_setg(errp, "Merging of parent and successor bitmap failed");

- return NULL;

- }

+ hbitmap_merge(parent->bitmap, successor->bitmap, parent->bitmap);

parent->disabled = successor->disabled;

parent->busy = false;

@@ -XXX,XX +XXX,XX @@ bool bdrv_merge_dirty_bitmap(BdrvDirtyBitmap *dest, const BdrvDirtyBitmap *src,

- if (!hbitmap_can_merge(dest->bitmap, src->bitmap)) {

- error_setg(errp, "Bitmaps are incompatible and can't be merged");

+ if (bdrv_dirty_bitmap_size(src) != bdrv_dirty_bitmap_size(dest)) {

+ error_setg(errp, "Bitmaps are of different sizes (destination size is %"

+ PRId64 ", source size is %" PRId64 ") and can't be merged",

+ bdrv_dirty_bitmap_size(dest), bdrv_dirty_bitmap_size(src));

- ret = bdrv_dirty_bitmap_merge_internal(dest, src, backup, false);

- assert(ret);

+ bdrv_dirty_bitmap_merge_internal(dest, src, backup, false);

+ ret = true;

out:

bdrv_dirty_bitmaps_unlock(dest->bs);

@@ -XXX,XX +XXX,XX @@ out:

/**

* bdrv_dirty_bitmap_merge_internal: merge src into dest.

* Does NOT check bitmap permissions; not suitable for use as public API.

+ * @dest, @src and @backup (if not NULL) must have same size.

*

* @backup: If provided, make a copy of dest here prior to merge.

* @lock: If true, lock and unlock bitmaps on the way in/out.

- * returns true if the merge succeeded; false if unattempted.

*/

-bool bdrv_dirty_bitmap_merge_internal(BdrvDirtyBitmap *dest,

+void bdrv_dirty_bitmap_merge_internal(BdrvDirtyBitmap *dest,

const BdrvDirtyBitmap *src,

HBitmap **backup,

bool lock)

{

- bool ret;

IO_CODE();

assert(!bdrv_dirty_bitmap_readonly(dest));

@@ -XXX,XX +XXX,XX @@ bool bdrv_dirty_bitmap_merge_internal(BdrvDirtyBitmap *dest,

if (backup) {

*backup = dest->bitmap;

dest->bitmap = hbitmap_alloc(dest->size, hbitmap_granularity(*backup));

- ret = hbitmap_merge(*backup, src->bitmap, dest->bitmap);

+ hbitmap_merge(*backup, src->bitmap, dest->bitmap);

} else {

- ret = hbitmap_merge(dest->bitmap, src->bitmap, dest->bitmap);

+ hbitmap_merge(dest->bitmap, src->bitmap, dest->bitmap);

}

if (lock) {

@@ -XXX,XX +XXX,XX @@ bool bdrv_dirty_bitmap_merge_internal(BdrvDirtyBitmap *dest,

bdrv_dirty_bitmaps_unlock(src->bs);

}

}

-

- return ret;

}

diff --git a/util/hbitmap.c b/util/hbitmap.c

index XXXXXXX..XXXXXXX 100644

--- a/util/hbitmap.c

+++ b/util/hbitmap.c

@@ -XXX,XX +XXX,XX @@ void hbitmap_truncate(HBitmap *hb, uint64_t size)

}

}

-bool hbitmap_can_merge(const HBitmap *a, const HBitmap *b)

-{

- return (a->orig_size == b->orig_size);

-}

-

/**

* hbitmap_sparse_merge: performs dst = dst | src

* works with differing granularities.

@@ -XXX,XX +XXX,XX @@ static void hbitmap_sparse_merge(HBitmap *dst, const HBitmap *src)

* Given HBitmaps A and B, let R := A (BITOR) B.

* Bitmaps A and B will not be modified,

* except when bitmap R is an alias of A or B.

- *

- * @return true if the merge was successful,

- * false if it was not attempted.

+ * Bitmaps must have same size.

*/

-bool hbitmap_merge(const HBitmap *a, const HBitmap *b, HBitmap *result)

+void hbitmap_merge(const HBitmap *a, const HBitmap *b, HBitmap *result)

{

int i;

uint64_t j;

- if (!hbitmap_can_merge(a, b) || !hbitmap_can_merge(a, result)) {

- return false;

- assert(hbitmap_can_merge(b, result));

+ assert(a->orig_size == result->orig_size);

+ assert(b->orig_size == result->orig_size);

if ((!hbitmap_count(a) && result == b) ||

(!hbitmap_count(b) && result == a)) {

- return true;

+ return;

}

if (!hbitmap_count(a) && !hbitmap_count(b)) {

hbitmap_reset_all(result);

- return true;

+ return;

}

if (a->granularity != b->granularity) {

@@ -XXX,XX +XXX,XX @@ bool hbitmap_merge(const HBitmap *a, const HBitmap *b, HBitmap *result)

if (b != result) {

hbitmap_sparse_merge(result, b);

}

- return true;

+ return;

}

/* This merge is O(size), as BITS_PER_LONG and HBITMAP_LEVELS are constant.

@@ -XXX,XX +XXX,XX @@ bool hbitmap_merge(const HBitmap *a, const HBitmap *b, HBitmap *result)

/* Recompute the dirty count */

result->count = hb_count_between(result, 0, result->size - 1);

-

- return true;

}

char *hbitmap_sha256(const HBitmap *bitmap, Error **errp)

2.35.3