From: Max Reitz <mreitz@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Benoît Canet" <benoit.canet@nodalink.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Max Reitz" <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH v8 10/17] qcow2: Let inc_refcounts() resize the reftable
Date: Wed, 22 Oct 2014 14:09:36 +0200 [thread overview]
Message-ID: <1413979783-1549-11-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1413979783-1549-1-git-send-email-mreitz@redhat.com>
Now that the refcount table can be passed around by reference, do that
for inc_refcounts() (and subsequently check_refcounts_l1() and
check_refcounts_l2()) and use it for resizing it when a cluster after
the image end is encountered.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
block/qcow2-refcount.c | 57 +++++++++++++++++++++++++++++++-------------------
1 file changed, 35 insertions(+), 22 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 6001c85..d653124 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1083,8 +1083,8 @@ fail:
*/
static int inc_refcounts(BlockDriverState *bs,
BdrvCheckResult *res,
- uint16_t *refcount_table,
- int64_t refcount_table_size,
+ uint16_t **refcount_table,
+ int64_t *refcount_table_size,
int64_t offset, int64_t size)
{
BDRVQcowState *s = bs->opaque;
@@ -1099,17 +1099,30 @@ static int inc_refcounts(BlockDriverState *bs,
for(cluster_offset = start; cluster_offset <= last;
cluster_offset += s->cluster_size) {
k = cluster_offset >> s->cluster_bits;
- if (k >= refcount_table_size) {
- fprintf(stderr, "Warning: cluster offset=0x%" PRIx64 " is after "
- "the end of the image file, can't properly check refcounts.\n",
- cluster_offset);
- res->check_errors++;
- } else {
- if (++refcount_table[k] == 0) {
- fprintf(stderr, "ERROR: overflow cluster offset=0x%" PRIx64
- "\n", cluster_offset);
- res->corruptions++;
+ if (k >= *refcount_table_size) {
+ int64_t old_refcount_table_size = *refcount_table_size;
+ uint16_t *new_refcount_table;
+
+ *refcount_table_size = k + 1;
+ new_refcount_table = g_try_realloc(*refcount_table,
+ *refcount_table_size *
+ sizeof(**refcount_table));
+ if (!new_refcount_table) {
+ *refcount_table_size = old_refcount_table_size;
+ res->check_errors++;
+ return -ENOMEM;
}
+ *refcount_table = new_refcount_table;
+
+ memset(*refcount_table + old_refcount_table_size, 0,
+ (*refcount_table_size - old_refcount_table_size) *
+ sizeof(**refcount_table));
+ }
+
+ if (++(*refcount_table)[k] == 0) {
+ fprintf(stderr, "ERROR: overflow cluster offset=0x%" PRIx64
+ "\n", cluster_offset);
+ res->corruptions++;
}
}
@@ -1130,7 +1143,7 @@ enum {
* error occurred.
*/
static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
- uint16_t *refcount_table, int64_t refcount_table_size, int64_t l2_offset,
+ uint16_t **refcount_table, int64_t *refcount_table_size, int64_t l2_offset,
int flags)
{
BDRVQcowState *s = bs->opaque;
@@ -1248,8 +1261,8 @@ fail:
*/
static int check_refcounts_l1(BlockDriverState *bs,
BdrvCheckResult *res,
- uint16_t *refcount_table,
- int64_t refcount_table_size,
+ uint16_t **refcount_table,
+ int64_t *refcount_table_size,
int64_t l1_table_offset, int l1_size,
int flags)
{
@@ -1586,7 +1599,7 @@ static int check_refblocks(BlockDriverState *bs, BdrvCheckResult *res,
}
if (offset != 0) {
- ret = inc_refcounts(bs, res, *refcount_table, *nb_clusters,
+ ret = inc_refcounts(bs, res, refcount_table, nb_clusters,
offset, s->cluster_size);
if (ret < 0) {
return ret;
@@ -1619,7 +1632,7 @@ static int check_refblocks(BlockDriverState *bs, BdrvCheckResult *res,
sizeof(**refcount_table));
}
(*refcount_table)[cluster]--;
- ret = inc_refcounts(bs, res, *refcount_table, *nb_clusters,
+ ret = inc_refcounts(bs, res, refcount_table, nb_clusters,
new_offset, s->cluster_size);
if (ret < 0) {
return ret;
@@ -1655,14 +1668,14 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
}
/* header */
- ret = inc_refcounts(bs, res, *refcount_table, *nb_clusters,
+ ret = inc_refcounts(bs, res, refcount_table, nb_clusters,
0, s->cluster_size);
if (ret < 0) {
return ret;
}
/* current L1 table */
- ret = check_refcounts_l1(bs, res, *refcount_table, *nb_clusters,
+ ret = check_refcounts_l1(bs, res, refcount_table, nb_clusters,
s->l1_table_offset, s->l1_size, CHECK_FRAG_INFO);
if (ret < 0) {
return ret;
@@ -1671,20 +1684,20 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
/* snapshots */
for (i = 0; i < s->nb_snapshots; i++) {
sn = s->snapshots + i;
- ret = check_refcounts_l1(bs, res, *refcount_table, *nb_clusters,
+ ret = check_refcounts_l1(bs, res, refcount_table, nb_clusters,
sn->l1_table_offset, sn->l1_size, 0);
if (ret < 0) {
return ret;
}
}
- ret = inc_refcounts(bs, res, *refcount_table, *nb_clusters,
+ ret = inc_refcounts(bs, res, refcount_table, nb_clusters,
s->snapshots_offset, s->snapshots_size);
if (ret < 0) {
return ret;
}
/* refcount data */
- ret = inc_refcounts(bs, res, *refcount_table, *nb_clusters,
+ ret = inc_refcounts(bs, res, refcount_table, nb_clusters,
s->refcount_table_offset,
s->refcount_table_size * sizeof(uint64_t));
if (ret < 0) {
--
1.9.3
next prev parent reply other threads:[~2014-10-22 12:10 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-22 12:09 [Qemu-devel] [PATCH v8 00/17] qcow2: Fix image repairing Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 01/17] block: Add qemu_{, try_}blockalign0() Max Reitz
2014-10-22 14:02 ` Eric Blake
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 02/17] qcow2: Calculate refcount block entry count Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 03/17] qcow2: Fix leaks in dirty images Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 04/17] qcow2: Split qcow2_check_refcounts() Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 05/17] qcow2: Use sizeof(**refcount_table) Max Reitz
2014-10-22 14:38 ` Eric Blake
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 06/17] qcow2: Pull check_refblocks() up Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 07/17] qcow2: Use int64_t for in-memory reftable size Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 08/17] qcow2: Split fail code in L1 and L2 checks Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 09/17] qcow2: Let inc_refcounts() return -errno Max Reitz
2014-10-22 12:09 ` Max Reitz [this message]
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 11/17] qcow2: Reuse refcount table in calculate_refcounts() Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 12/17] qcow2: Fix refcount blocks beyond image end Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 13/17] qcow2: Do not perform potentially damaging repairs Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 14/17] qcow2: Rebuild refcount structure during check Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 15/17] qcow2: Clean up after refcount rebuild Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 16/17] iotests: Fix test outputs Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 17/17] iotests: Add test for potentially damaging repairs Max Reitz
2014-10-22 13:18 ` [Qemu-devel] [PATCH v8 00/17] qcow2: Fix image repairing Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413979783-1549-11-git-send-email-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=benoit.canet@nodalink.com \
--cc=kwolf@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).