mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block/copy-before-write: create block_copy bitmap in filter node

Browse Source 
Currently block_copy creates copy_bitmap in source node. But that is in
bad relation with .independent_close=true of copy-before-write filter:
source node may be detached and removed before .bdrv_close() handler
called, which should call block_copy_state_free(), which in turn should
remove copy_bitmap.

That's all not ideal: it would be better if internal bitmap of
block-copy object is not attached to any node. But that is not possible
now.

The simplest solution is just create copy_bitmap in filter node, where
anyway two other bitmaps are created.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
Tested-by: Fiona Ebner <f.ebner@proxmox.com>
Message-Id: <20240313152822.626493-4-vsementsov@yandex-team.ru>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2024-03-13 18:28:20 +03:00
parent 507175197b
commit 006e845b5a
4 changed files with 60 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/block-copy.c
View File

@ -351,6 +351,7 @@ static int64_t block_copy_calculate_cluster_size(BlockDriverState *target,
}
BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
BlockDriverState *copy_bitmap_bs,
const BdrvDirtyBitmap *bitmap,
Error **errp)
{
@ -367,7 +368,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
return NULL;
}
copy_bitmap = bdrv_create_dirty_bitmap(source->bs, cluster_size, NULL,
copy_bitmap = bdrv_create_dirty_bitmap(copy_bitmap_bs, cluster_size, NULL,
errp);
if (!copy_bitmap) {
return NULL;

2
block/copy-before-write.c
View File

@ -468,7 +468,7 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags,
((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
bs->file->bs->supported_zero_flags);
s->bcs = block_copy_state_new(bs->file, s->target, bitmap, errp);
s->bcs = block_copy_state_new(bs->file, s->target, bs, bitmap, errp);
if (!s->bcs) {
error_prepend(errp, "Cannot create block-copy-state: ");
return -EINVAL;

1
include/block/block-copy.h
View File

@ -25,6 +25,7 @@ typedef struct BlockCopyState BlockCopyState;
typedef struct BlockCopyCallState BlockCopyCallState;
BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
BlockDriverState *copy_bitmap_bs,
const BdrvDirtyBitmap *bitmap,
Error **errp);

112
tests/qemu-iotests/257.out
View File

@ -120,16 +120,16 @@ write -P0x67 0x3fe0000 0x20000
"granularity": 65536,
"persistent": false,
"recording": false
}
],
"drive0": [
},
{
"busy": false,
"count": 0,
"granularity": 65536,
"persistent": false,
"recording": false
},
}
],
"drive0": [
{
"busy": false,
"count": 458752,
@ -596,16 +596,16 @@ write -P0x67 0x3fe0000 0x20000
"granularity": 65536,
"persistent": false,
"recording": false
}
],
"drive0": [
},
{
"busy": false,
"count": 0,
"granularity": 65536,
"persistent": false,
"recording": false
},
}
],
"drive0": [
{
"busy": false,
"count": 458752,
@ -865,16 +865,16 @@ write -P0x67 0x3fe0000 0x20000
"granularity": 65536,
"persistent": false,
"recording": false
}
],
"drive0": [
},
{
"busy": false,
"count": 0,
"granularity": 65536,
"persistent": false,
"recording": false
},
}
],
"drive0": [
{
"busy": false,
"count": 458752,
@ -1341,16 +1341,16 @@ write -P0x67 0x3fe0000 0x20000
"granularity": 65536,
"persistent": false,
"recording": false
}
],
"drive0": [
},
{
"busy": false,
"count": 0,
"granularity": 65536,
"persistent": false,
"recording": false
},
}
],
"drive0": [
{
"busy": false,
"count": 458752,
@ -1610,16 +1610,16 @@ write -P0x67 0x3fe0000 0x20000
"granularity": 65536,
"persistent": false,
"recording": false
}
],
"drive0": [
},
{
"busy": false,
"count": 0,
"granularity": 65536,
"persistent": false,
"recording": false
},
}
],
"drive0": [
{
"busy": false,
"count": 458752,
@ -2086,16 +2086,16 @@ write -P0x67 0x3fe0000 0x20000
"granularity": 65536,
"persistent": false,
"recording": false
}
],
"drive0": [
},
{
"busy": false,
"count": 0,
"granularity": 65536,
"persistent": false,
"recording": false
},
}
],
"drive0": [
{
"busy": false,
"count": 458752,
@ -2355,16 +2355,16 @@ write -P0x67 0x3fe0000 0x20000
"granularity": 65536,
"persistent": false,
"recording": false
}
],
"drive0": [
},
{
"busy": false,
"count": 0,
"granularity": 65536,
"persistent": false,
"recording": false
},
}
],
"drive0": [
{
"busy": false,
"count": 458752,
@ -2831,16 +2831,16 @@ write -P0x67 0x3fe0000 0x20000
"granularity": 65536,
"persistent": false,
"recording": false
}
],
"drive0": [
},
{
"busy": false,
"count": 0,
"granularity": 65536,
"persistent": false,
"recording": false
},
}
],
"drive0": [
{
"busy": false,
"count": 458752,
@ -3100,16 +3100,16 @@ write -P0x67 0x3fe0000 0x20000
"granularity": 65536,
"persistent": false,
"recording": false
}
],
"drive0": [
},
{
"busy": false,
"count": 0,
"granularity": 65536,
"persistent": false,
"recording": false
},
}
],
"drive0": [
{
"busy": false,
"count": 458752,
@ -3576,16 +3576,16 @@ write -P0x67 0x3fe0000 0x20000
"granularity": 65536,
"persistent": false,
"recording": false
}
],
"drive0": [
},
{
"busy": false,
"count": 0,
"granularity": 65536,
"persistent": false,
"recording": false
},
}
],
"drive0": [
{
"busy": false,
"count": 458752,
@ -3845,16 +3845,16 @@ write -P0x67 0x3fe0000 0x20000
"granularity": 65536,
"persistent": false,
"recording": false
}
],
"drive0": [
},
{
"busy": false,
"count": 0,
"granularity": 65536,
"persistent": false,
"recording": false
},
}
],
"drive0": [
{
"busy": false,
"count": 458752,
@ -4321,16 +4321,16 @@ write -P0x67 0x3fe0000 0x20000
"granularity": 65536,
"persistent": false,
"recording": false
}
],
"drive0": [
},
{
"busy": false,
"count": 0,
"granularity": 65536,
"persistent": false,
"recording": false
},
}
],
"drive0": [
{
"busy": false,
"count": 458752,
@ -4590,16 +4590,16 @@ write -P0x67 0x3fe0000 0x20000
"granularity": 65536,
"persistent": false,
"recording": false
}
],
"drive0": [
},
{
"busy": false,
"count": 0,
"granularity": 65536,
"persistent": false,
"recording": false
},
}
],
"drive0": [
{
"busy": false,
"count": 458752,
@ -5066,16 +5066,16 @@ write -P0x67 0x3fe0000 0x20000
"granularity": 65536,
"persistent": false,
"recording": false
}
],
"drive0": [
},
{
"busy": false,
"count": 0,
"granularity": 65536,
"persistent": false,
"recording": false
},
}
],
"drive0": [
{
"busy": false,
"count": 458752,