From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNTvA-0006vg-2q for qemu-devel@nongnu.org; Fri, 29 Aug 2014 17:41:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNTv4-00084d-P2 for qemu-devel@nongnu.org; Fri, 29 Aug 2014 17:41:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36654) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNTv4-00084P-IF for qemu-devel@nongnu.org; Fri, 29 Aug 2014 17:41:18 -0400 From: Max Reitz Date: Fri, 29 Aug 2014 23:40:55 +0200 Message-Id: <1409348463-16627-4-git-send-email-mreitz@redhat.com> In-Reply-To: <1409348463-16627-1-git-send-email-mreitz@redhat.com> References: <1409348463-16627-1-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v5 03/11] qcow2: Split qcow2_check_refcounts() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , =?UTF-8?q?Beno=C3=AEt=20Canet?= , Max Reitz 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=C3=AEt Canet --- block/qcow2-refcount.c | 153 ++++++++++++++++++++++++++++++++-----------= ------ 1 file changed, 102 insertions(+), 51 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 43665b8..5f0920b 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1496,71 +1496,70 @@ done: return new_offset; } =20 +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 im= age is - * detected as corrupted, and -errno when an internal error occurred. + * Calculates an in-memory refcount table. */ -int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, - BdrvCheckMode fix) +static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *re= s, + BdrvCheckMode fix, uint16_t **refcount_ta= ble, + int64_t *nb_clusters) { BDRVQcowState *s =3D bs->opaque; - int64_t size, i, highest_cluster, nb_clusters; - int refcount1, refcount2; + int64_t i; QCowSnapshot *sn; - uint16_t *refcount_table; int ret; =20 - size =3D bdrv_getlength(bs->file); - if (size < 0) { - res->check_errors++; - return size; - } - - nb_clusters =3D size_to_clusters(s, size); - if (nb_clusters > INT_MAX) { - res->check_errors++; - return -EFBIG; - } - - refcount_table =3D g_try_new0(uint16_t, nb_clusters); - if (nb_clusters && refcount_table =3D=3D NULL) { + *refcount_table =3D g_try_new0(uint16_t, *nb_clusters); + if (*nb_clusters && *refcount_table =3D=3D NULL) { res->check_errors++; return -ENOMEM; } =20 - res->bfi.total_clusters =3D - size_to_clusters(s, bs->total_sectors * BDRV_SECTOR_SIZE); - /* header */ - inc_refcounts(bs, res, refcount_table, nb_clusters, + inc_refcounts(bs, res, *refcount_table, *nb_clusters, 0, s->cluster_size); =20 /* current L1 table */ - ret =3D check_refcounts_l1(bs, res, refcount_table, nb_clusters, + ret =3D check_refcounts_l1(bs, res, *refcount_table, *nb_clusters, s->l1_table_offset, s->l1_size, CHECK_FRAG_= INFO); if (ret < 0) { - goto fail; + return ret; } =20 /* snapshots */ - for(i =3D 0; i < s->nb_snapshots; i++) { + for (i =3D 0; i < s->nb_snapshots; i++) { sn =3D s->snapshots + i; - ret =3D check_refcounts_l1(bs, res, refcount_table, nb_clusters, + ret =3D check_refcounts_l1(bs, res, *refcount_table, *nb_cluster= s, sn->l1_table_offset, sn->l1_size, 0); 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); =20 /* 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)); =20 + 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 =3D bs->opaque; + int64_t i; + for(i =3D 0; i < s->refcount_table_size; i++) { uint64_t offset, cluster; offset =3D s->refcount_table[i]; @@ -1574,7 +1573,7 @@ int qcow2_check_refcounts(BlockDriverState *bs, Bdr= vCheckResult *res, continue; } =20 - if (cluster >=3D nb_clusters) { + if (cluster >=3D *nb_clusters) { fprintf(stderr, "ERROR refcount block %" PRId64 " is outside image\n", i); res->corruptions++; @@ -1582,14 +1581,14 @@ int qcow2_check_refcounts(BlockDriverState *bs, B= drvCheckResult *res, } =20 if (offset !=3D 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] !=3D 1) { + if ((*refcount_table)[cluster] !=3D 1) { fprintf(stderr, "%s refcount block %" PRId64 " refcount=3D%d\n", fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR", - i, refcount_table[cluster]); + i, (*refcount_table)[cluster]); =20 if (fix & BDRV_FIX_ERRORS) { int64_t new_offset; @@ -1601,17 +1600,18 @@ int qcow2_check_refcounts(BlockDriverState *bs, B= drvCheckResult *res, } =20 /* update refcounts */ - if ((new_offset >> s->cluster_bits) >=3D nb_clusters= ) { + if ((new_offset >> s->cluster_bits) >=3D *nb_cluster= s) { /* increase refcount_table size if necessary */ - int old_nb_clusters =3D nb_clusters; - nb_clusters =3D (new_offset >> s->cluster_bits) = + 1; - refcount_table =3D g_renew(uint16_t, refcount_ta= ble, - nb_clusters); - memset(&refcount_table[old_nb_clusters], 0, (nb_= clusters - - old_nb_clusters) * sizeof(uint16_t)); + int old_nb_clusters =3D *nb_clusters; + *nb_clusters =3D (new_offset >> s->cluster_bits)= + 1; + *refcount_table =3D 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); =20 res->corruptions_fixed++; @@ -1622,8 +1622,22 @@ int qcow2_check_refcounts(BlockDriverState *bs, Bd= rvCheckResult *res, } } =20 - /* compare ref counts */ - for (i =3D 0, highest_cluster =3D 0; i < nb_clusters; i++) { + return 0; +} + +/* + * Compares the actual reference count for each cluster in the image aga= inst the + * refcount as reported by the refcount structures on-disk. + */ +static void compare_refcounts(BlockDriverState *bs, BdrvCheckResult *res= , + BdrvCheckMode fix, int64_t *highest_cluste= r, + uint16_t *refcount_table, int64_t nb_clust= ers) +{ + BDRVQcowState *s =3D bs->opaque; + int64_t i; + int refcount1, refcount2, ret; + + for (i =3D 0, *highest_cluster =3D 0; i < nb_clusters; i++) { refcount1 =3D get_refcount(bs, i); if (refcount1 < 0) { fprintf(stderr, "Can't get refcount for cluster %" PRId64 ":= %s\n", @@ -1635,11 +1649,10 @@ int qcow2_check_refcounts(BlockDriverState *bs, B= drvCheckResult *res, refcount2 =3D refcount_table[i]; =20 if (refcount1 > 0 || refcount2 > 0) { - highest_cluster =3D i; + *highest_cluster =3D i; } =20 if (refcount1 !=3D refcount2) { - /* Check if we're allowed to fix the mismatch */ int *num_fixed =3D NULL; if (refcount1 > refcount2 && (fix & BDRV_FIX_LEAKS)) { @@ -1672,6 +1685,44 @@ int qcow2_check_refcounts(BlockDriverState *bs, Bd= rvCheckResult *res, } } } +} + +/* + * Checks an image for refcount consistency. + * + * Returns 0 if no errors are found, the number of errors in case the im= age is + * detected as corrupted, and -errno when an internal error occurred. + */ +int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, + BdrvCheckMode fix) +{ + BDRVQcowState *s =3D bs->opaque; + int64_t size, highest_cluster, nb_clusters; + uint16_t *refcount_table; + int ret; + + size =3D bdrv_getlength(bs->file); + if (size < 0) { + res->check_errors++; + return size; + } + + nb_clusters =3D size_to_clusters(s, size); + if (nb_clusters > INT_MAX) { + res->check_errors++; + return -EFBIG; + } + + res->bfi.total_clusters =3D + size_to_clusters(s, bs->total_sectors * BDRV_SECTOR_SIZE); + + ret =3D calculate_refcounts(bs, res, fix, &refcount_table, &nb_clust= ers); + if (ret < 0) { + goto fail; + } + + compare_refcounts(bs, res, fix, &highest_cluster, refcount_table, + nb_clusters); =20 /* check OFLAG_COPIED */ ret =3D check_oflag_copied(bs, res, fix); --=20 2.1.0