From 178d748bce9cbbb79ca0f11128872054f970035d Mon Sep 17 00:00:00 2001 Message-Id: <178d748bce9cbbb79ca0f11128872054f970035d.1429902956.git.jen@redhat.com> In-Reply-To: <67968bc615637394c3ef7dfefa360dab90f33d5d.1429902956.git.jen@redhat.com> References: <67968bc615637394c3ef7dfefa360dab90f33d5d.1429902956.git.jen@redhat.com> From: Max Reitz Date: Wed, 18 Mar 2015 19:22:05 -0500 Subject: [CHANGE 22/42] qcow2: Split qcow2_check_refcounts() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To: rhvirt-patches@redhat.com, jen@redhat.com RH-Author: Max Reitz Message-id: <1426706542-30384-23-git-send-email-mreitz@redhat.com> Patchwork-id: 64486 O-Subject: [RHEL-6.7 qemu-kvm PATCH v2 22/39] qcow2: Split qcow2_check_refcounts() Bugzilla: 1129892 RH-Acked-by: Jeffrey Cody RH-Acked-by: Kevin Wolf RH-Acked-by: Stefan Hajnoczi BZ: 1129892 Put the code for calculating the reference counts and comparing them during qemu-img check into own functions. Signed-off-by: Max Reitz Reviewed-by: Benoît Canet Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf (cherry picked from commit 6ca56bf5e90aa167395727667d17c699950c545c) Signed-off-by: Jeff E. Nelson Conflicts: block/qcow2-refcount.c There have been several changes upstream to the code in question, some of which I tried to work around (e.g. fba31bae2d776fb4134186a830a252523df7933f, which makes the check function record fragmentation statistics, which we do not have downstream and which I do not want to backport), others of which I just pulled in the changes into this patch, because they are touching a larger part of the code base and they only concern the code being removed here (which is added somewhere else, including the changes from these other commits), e.g. 5839e53bbc0fec56021d758aab7610df421ed8c8. Signed-off-by: Max Reitz --- block/qcow2-refcount.c | 148 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 103 insertions(+), 45 deletions(-) Signed-off-by: Jeff E. Nelson --- block/qcow2-refcount.c | 148 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 103 insertions(+), 45 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index e1bbc8b..e99a052 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1346,64 +1346,70 @@ done: return new_offset; } +static int check_refblocks(BlockDriverState *bs, BdrvCheckResult *res, + BdrvCheckMode fix, uint16_t **refcount_table, + int64_t *nb_clusters); + /* - * Checks an image for refcount consistency. - * - * Returns 0 if no errors are found, the number of errors in case the image is - * detected as corrupted, and -errno when an internal error occured. + * Calculates an in-memory refcount table. */ -int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, - BdrvCheckMode fix) +static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res, + BdrvCheckMode fix, uint16_t **refcount_table, + int64_t *nb_clusters) { BDRVQcowState *s = bs->opaque; - int64_t size, i, highest_cluster, nb_clusters; - int refcount1, refcount2; + int64_t i; QCowSnapshot *sn; - uint16_t *refcount_table; int ret; - size = bdrv_getlength(bs->file); - if (size < 0) { + *refcount_table = g_try_new0(uint16_t, *nb_clusters); + if (*nb_clusters && *refcount_table == NULL) { res->check_errors++; - return size; + return -ENOMEM; } - nb_clusters = size_to_clusters(s, size); - if (nb_clusters > INT_MAX) { - res->check_errors++; - return -EFBIG; - } - - refcount_table = g_malloc0(nb_clusters * sizeof(uint16_t)); - /* header */ - inc_refcounts(bs, res, refcount_table, nb_clusters, + inc_refcounts(bs, res, *refcount_table, *nb_clusters, 0, s->cluster_size); /* 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); if (ret < 0) { - goto fail; + return ret; } /* snapshots */ - for(i = 0; i < s->nb_snapshots; i++) { + 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); if (ret < 0) { - goto fail; + return ret; } } - inc_refcounts(bs, res, refcount_table, nb_clusters, + inc_refcounts(bs, res, *refcount_table, *nb_clusters, s->snapshots_offset, s->snapshots_size); /* refcount data */ - inc_refcounts(bs, res, refcount_table, nb_clusters, + inc_refcounts(bs, res, *refcount_table, *nb_clusters, s->refcount_table_offset, s->refcount_table_size * sizeof(uint64_t)); + return check_refblocks(bs, res, fix, refcount_table, nb_clusters); +} + +/* + * Checks consistency of refblocks and accounts for each refblock in + * *refcount_table. + */ +static int check_refblocks(BlockDriverState *bs, BdrvCheckResult *res, + BdrvCheckMode fix, uint16_t **refcount_table, + int64_t *nb_clusters) +{ + BDRVQcowState *s = bs->opaque; + int64_t i; + for(i = 0; i < s->refcount_table_size; i++) { uint64_t offset, cluster; offset = s->refcount_table[i]; @@ -1417,7 +1423,7 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, continue; } - if (cluster >= nb_clusters) { + if (cluster >= *nb_clusters) { fprintf(stderr, "ERROR refcount block %" PRId64 " is outside image\n", i); res->corruptions++; @@ -1425,14 +1431,14 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, } if (offset != 0) { - inc_refcounts(bs, res, refcount_table, nb_clusters, + inc_refcounts(bs, res, *refcount_table, *nb_clusters, offset, s->cluster_size); - if (refcount_table[cluster] != 1) { + if ((*refcount_table)[cluster] != 1) { fprintf(stderr, "%s refcount block %" PRId64 " refcount=%d\n", fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR", - i, refcount_table[cluster]); + i, (*refcount_table)[cluster]); if (fix & BDRV_FIX_ERRORS) { int64_t new_offset; @@ -1444,17 +1450,18 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, } /* update refcounts */ - if ((new_offset >> s->cluster_bits) >= nb_clusters) { + if ((new_offset >> s->cluster_bits) >= *nb_clusters) { /* increase refcount_table size if necessary */ - int old_nb_clusters = nb_clusters; - nb_clusters = (new_offset >> s->cluster_bits) + 1; - refcount_table = g_realloc(refcount_table, - nb_clusters * sizeof(uint16_t)); - memset(&refcount_table[old_nb_clusters], 0, (nb_clusters - - old_nb_clusters) * sizeof(uint16_t)); + int old_nb_clusters = *nb_clusters; + *nb_clusters = (new_offset >> s->cluster_bits) + 1; + *refcount_table = g_renew(uint16_t, *refcount_table, + *nb_clusters); + memset(&(*refcount_table)[old_nb_clusters], 0, + (*nb_clusters - old_nb_clusters) * + sizeof(uint16_t)); } - refcount_table[cluster]--; - inc_refcounts(bs, res, refcount_table, nb_clusters, + (*refcount_table)[cluster]--; + inc_refcounts(bs, res, *refcount_table, *nb_clusters, new_offset, s->cluster_size); res->corruptions_fixed++; @@ -1465,8 +1472,22 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, } } - /* compare ref counts */ - for (i = 0, highest_cluster = 0; i < nb_clusters; i++) { + return 0; +} + +/* + * Compares the actual reference count for each cluster in the image against the + * refcount as reported by the refcount structures on-disk. + */ +static void compare_refcounts(BlockDriverState *bs, BdrvCheckResult *res, + BdrvCheckMode fix, int64_t *highest_cluster, + uint16_t *refcount_table, int64_t nb_clusters) +{ + BDRVQcowState *s = bs->opaque; + int64_t i; + int refcount1, refcount2, ret; + + for (i = 0, *highest_cluster = 0; i < nb_clusters; i++) { refcount1 = get_refcount(bs, i); if (refcount1 < 0) { fprintf(stderr, "Can't get refcount for cluster %" PRId64 ": %s\n", @@ -1478,11 +1499,10 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, refcount2 = refcount_table[i]; if (refcount1 > 0 || refcount2 > 0) { - highest_cluster = i; + *highest_cluster = i; } if (refcount1 != refcount2) { - /* Check if we're allowed to fix the mismatch */ int *num_fixed = NULL; if (refcount1 > refcount2 && (fix & BDRV_FIX_LEAKS)) { @@ -1514,6 +1534,44 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, } } } +} + +/* + * Checks an image for refcount consistency. + * + * Returns 0 if no errors are found, the number of errors in case the image is + * detected as corrupted, and -errno when an internal error occurred. + */ +int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, + BdrvCheckMode fix) +{ + BDRVQcowState *s = bs->opaque; + int64_t size, highest_cluster, nb_clusters; + uint16_t *refcount_table; + int ret; + + size = bdrv_getlength(bs->file); + if (size < 0) { + res->check_errors++; + return size; + } + + nb_clusters = size_to_clusters(s, size); + if (nb_clusters > INT_MAX) { + res->check_errors++; + return -EFBIG; + } + + res->bfi.total_clusters = + size_to_clusters(s, bs->total_sectors * BDRV_SECTOR_SIZE); + + ret = calculate_refcounts(bs, res, fix, &refcount_table, &nb_clusters); + if (ret < 0) { + goto fail; + } + + compare_refcounts(bs, res, fix, &highest_cluster, refcount_table, + nb_clusters); /* check OFLAG_COPIED */ ret = check_oflag_copied(bs, res, fix); -- 2.1.0