xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-23 11:39:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qcow2: Support exact L1 table growth

Browse Source 
The L1 table grow operation includes a size calculation that bumps up
the new L1 table size in order to anticipate the size needs of vmstate
data.  This helps reduce the number of times that the L1 table has to be
grown when vmstate data is appended.

This size overhead is not necessary during image creation,
bdrv_truncate(), or snapshot goto operations.  In fact, existing
qemu-iotests that exercise table growth are no longer able to trigger it
because image creation preallocates an L1 table that is too large after
changes to qcow_create2().

This patch keeps the size calculation but also adds exact growth for
callers that do not want to inflate the L1 table size unnecessarily.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2010-10-18 16:53:53 +01:00 committed by Kevin Wolf
parent d03703c81a
commit 72893756e0
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
block/qcow2-cluster.c
View File

@ -28,7 +28,7 @@
#include "block_int.h" #include "block_int.h"
#include "block/qcow2.h" #include "block/qcow2.h"
int qcow2_grow_l1_table(BlockDriverState *bs, int min_size) int qcow2_grow_l1_table(BlockDriverState *bs, int min_size, bool exact_size)
{ {
BDRVQcowState *s = bs->opaque; BDRVQcowState *s = bs->opaque;
int new_l1_size, new_l1_size2, ret, i; int new_l1_size, new_l1_size2, ret, i;
@ -36,15 +36,22 @@ int qcow2_grow_l1_table(BlockDriverState *bs, int min_size)
int64_t new_l1_table_offset; int64_t new_l1_table_offset;
uint8_t data[12]; uint8_t data[12];
new_l1_size = s->l1_size; if (min_size <= s->l1_size)
if (min_size <= new_l1_size)
return 0; return 0;
if (new_l1_size == 0) {
new_l1_size = 1; if (exact_size) {
} new_l1_size = min_size;
while (min_size > new_l1_size) { } else {
new_l1_size = (new_l1_size * 3 + 1) / 2; /* Bump size up to reduce the number of times we have to grow */
new_l1_size = s->l1_size;
if (new_l1_size == 0) {
new_l1_size = 1;
}
while (min_size > new_l1_size) {
new_l1_size = (new_l1_size * 3 + 1) / 2;
}
} }
#ifdef DEBUG_ALLOC2 #ifdef DEBUG_ALLOC2
printf("grow l1_table from %d to %d\n", s->l1_size, new_l1_size); printf("grow l1_table from %d to %d\n", s->l1_size, new_l1_size);
#endif #endif
@ -550,7 +557,7 @@ static int get_cluster_table(BlockDriverState *bs, uint64_t offset,
l1_index = offset >> (s->l2_bits + s->cluster_bits); l1_index = offset >> (s->l2_bits + s->cluster_bits);
if (l1_index >= s->l1_size) { if (l1_index >= s->l1_size) {
ret = qcow2_grow_l1_table(bs, l1_index + 1); ret = qcow2_grow_l1_table(bs, l1_index + 1, false);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }

2
block/qcow2-snapshot.c
View File

@ -327,7 +327,7 @@ int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id)
if (qcow2_update_snapshot_refcount(bs, s->l1_table_offset, s->l1_size, -1) < 0) if (qcow2_update_snapshot_refcount(bs, s->l1_table_offset, s->l1_size, -1) < 0)
goto fail; goto fail;
if (qcow2_grow_l1_table(bs, sn->l1_size) < 0) if (qcow2_grow_l1_table(bs, sn->l1_size, true) < 0)
goto fail; goto fail;
s->l1_size = sn->l1_size; s->l1_size = sn->l1_size;

2
block/qcow2.c
View File

@ -1154,7 +1154,7 @@ static int qcow2_truncate(BlockDriverState *bs, int64_t offset)
} }
new_l1_size = size_to_l1(s, offset); new_l1_size = size_to_l1(s, offset);
ret = qcow2_grow_l1_table(bs, new_l1_size); ret = qcow2_grow_l1_table(bs, new_l1_size, true);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }

2
block/qcow2.h
View File

@ -188,7 +188,7 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs,
int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res); int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res);
/* qcow2-cluster.c functions */ /* qcow2-cluster.c functions */
int qcow2_grow_l1_table(BlockDriverState *bs, int min_size); int qcow2_grow_l1_table(BlockDriverState *bs, int min_size, bool exact_size);
void qcow2_l2_cache_reset(BlockDriverState *bs); void qcow2_l2_cache_reset(BlockDriverState *bs);
int qcow2_decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset); int qcow2_decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset);
void qcow2_encrypt_sectors(BDRVQcowState *s, int64_t sector_num, void qcow2_encrypt_sectors(BDRVQcowState *s, int64_t sector_num,