From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHtec-0006yL-4Y for qemu-devel@nongnu.org; Thu, 14 Aug 2014 07:57:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHteV-0003bD-SH for qemu-devel@nongnu.org; Thu, 14 Aug 2014 07:57:14 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:35389 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHteV-0003b7-Hq for qemu-devel@nongnu.org; Thu, 14 Aug 2014 07:57:07 -0400 Date: Thu, 14 Aug 2014 13:56:15 +0200 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140814115615.GF2009@irqsave.net> References: <1407963710-4942-1-git-send-email-mreitz@redhat.com> <1407963710-4942-2-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1407963710-4942-2-git-send-email-mreitz@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 1/8] qcow2: Factor out refcount accounting for check List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi The Wednesday 13 Aug 2014 =E0 23:01:43 (+0200), Max Reitz wrote : > Put the code for calculating the reference counts during qemu-img check > into an own function. >=20 > Signed-off-by: Max Reitz > --- > block/qcow2-refcount.c | 202 +++++++++++++++++++++++++++++------------= -------- > 1 file changed, 122 insertions(+), 80 deletions(-) >=20 > diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c > index d60e2fe..9793c27 100644 > --- a/block/qcow2-refcount.c > +++ b/block/qcow2-refcount.c > @@ -1496,71 +1496,17 @@ done: > } > =20 > /* > - * 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. > + * Checks consistency of refblocks and accounts for each refblock in > + * *refcount_table. > */ > -int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, > - BdrvCheckMode fix) > +static int check_refblocks(BlockDriverState *bs, BdrvCheckResult *res, > + BdrvCheckMode fix, uint16_t **refcount_tabl= e, > + int64_t *nb_clusters) > { > BDRVQcowState *s =3D bs->opaque; > - int64_t size, i, highest_cluster, nb_clusters; > - int refcount1, refcount2; > - QCowSnapshot *sn; > - 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; > - } > - > - refcount_table =3D g_try_malloc0(nb_clusters * sizeof(uint16_t)); > - if (nb_clusters && refcount_table =3D=3D NULL) { > - res->check_errors++; > - return -ENOMEM; > - } > - > - res->bfi.total_clusters =3D > - size_to_clusters(s, bs->total_sectors * BDRV_SECTOR_SIZE); > - > - /* header */ > - inc_refcounts(bs, res, refcount_table, nb_clusters, > - 0, s->cluster_size); > - > - /* current L1 table */ > - ret =3D check_refcounts_l1(bs, res, refcount_table, nb_clusters, > - s->l1_table_offset, s->l1_size, CHECK_FRA= G_INFO); > - if (ret < 0) { > - goto fail; > - } > + int64_t i; > =20 > - /* snapshots */ > - for(i =3D 0; i < s->nb_snapshots; i++) { > - sn =3D s->snapshots + i; > - 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; > - } > - } > - inc_refcounts(bs, res, refcount_table, nb_clusters, > - s->snapshots_offset, s->snapshots_size); > - > - /* refcount data */ > - inc_refcounts(bs, res, refcount_table, nb_clusters, > - s->refcount_table_offset, > - s->refcount_table_size * sizeof(uint64_t)); > - > - for(i =3D 0; i < s->refcount_table_size; i++) { > + for (i =3D 0; i < s->refcount_table_size; i++) { > uint64_t offset, cluster; > offset =3D s->refcount_table[i]; > cluster =3D offset >> s->cluster_bits; > @@ -1568,12 +1514,12 @@ int qcow2_check_refcounts(BlockDriverState *bs,= BdrvCheckResult *res, > /* Refcount blocks are cluster aligned */ > if (offset_into_cluster(s, offset)) { > fprintf(stderr, "ERROR refcount block %" PRId64 " is not " > - "cluster aligned; refcount table entry corrupted\n", i= ); > + "cluster aligned; refcount table entry corrupted\n= ", i); > res->corruptions++; > 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++; > @@ -1581,14 +1527,14 @@ int qcow2_check_refcounts(BlockDriverState *bs,= BdrvCheckResult *res, > } > =20 > if (offset !=3D 0) { > - inc_refcounts(bs, res, refcount_table, nb_clusters, > - offset, s->cluster_size); > - if (refcount_table[cluster] !=3D 1) { > + inc_refcounts(bs, res, *refcount_table, *nb_clusters, > + offset, s->cluster_size); > + 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]); > + " refcount=3D%d\n", > + fix & BDRV_FIX_ERRORS ? "Repairing" : > + "ERROR", > + i, (*refcount_table)[cluster]); > =20 > if (fix & BDRV_FIX_ERRORS) { > int64_t new_offset; > @@ -1600,18 +1546,25 @@ int qcow2_check_refcounts(BlockDriverState *bs,= BdrvCheckResult *res, > } > =20 > /* update refcounts */ > - if ((new_offset >> s->cluster_bits) >=3D nb_cluste= rs) { > + if ((new_offset >> s->cluster_bits) >=3D *nb_clust= ers) { > /* 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_realloc(refcount_table, > - nb_clusters * sizeof(uint16_t)); > - memset(&refcount_table[old_nb_clusters], 0, (n= b_clusters > - - old_nb_clusters) * sizeof(uint16_t))= ; > + int old_nb_clusters =3D *nb_clusters; > + *nb_clusters =3D (new_offset >> s->cluster_bit= s) + 1; > + > + *refcount_table =3D g_try_realloc(*refcount_ta= ble, > + *nb_clusters * sizeof(uint16_t)); > + if (!*refcount_table) { > + res->check_errors++; > + return -ENOMEM; > + } > + > + 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= , > - new_offset, s->cluster_size); > + (*refcount_table)[cluster]--; > + inc_refcounts(bs, res, *refcount_table, *nb_cluste= rs, > + new_offset, s->cluster_size); > =20 > res->corruptions_fixed++; > } else { > @@ -1621,6 +1574,95 @@ int qcow2_check_refcounts(BlockDriverState *bs, = BdrvCheckResult *res, > } > } > =20 > + return 0; > +} > + > +/* > + * Calculates an in-memory refcount table. > + */ > +static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *= res, > + BdrvCheckMode fix, uint16_t **refcount_= table, > + int64_t *nb_clusters) > +{ > + BDRVQcowState *s =3D bs->opaque; > + QCowSnapshot *sn; > + int64_t i; > + int ret; > + > + if (!*refcount_table) { > + *refcount_table =3D g_try_malloc0(*nb_clusters * sizeof(uint16= _t)); > + if (*nb_clusters && !*refcount_table) { > + res->check_errors++; > + return -ENOMEM; > + } > + } > + > + /* header */ > + inc_refcounts(bs, res, *refcount_table, *nb_clusters, > + 0, s->cluster_size); > + > + /* current L1 table */ > + ret =3D check_refcounts_l1(bs, res, *refcount_table, *nb_clusters, > + s->l1_table_offset, s->l1_size, CHECK_FRA= G_INFO); > + if (ret < 0) { > + return ret; > + } > + > + /* snapshots */ > + for (i =3D 0; i < s->nb_snapshots; i++) { > + sn =3D s->snapshots + i; > + ret =3D check_refcounts_l1(bs, res, *refcount_table, *nb_clust= ers, > + sn->l1_table_offset, sn->l1_size, 0); > + if (ret < 0) { > + return ret; > + } > + } > + inc_refcounts(bs, res, *refcount_table, *nb_clusters, > + s->snapshots_offset, s->snapshots_size); > + > + /* refcount data */ > + 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 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 =3D bs->opaque; > + int64_t size, i, highest_cluster, nb_clusters; > + int refcount1, refcount2; > + uint16_t *refcount_table =3D NULL; > + 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_clu= sters); > + if (ret < 0) { > + goto fail; > + } > + > /* compare ref counts */ > for (i =3D 0, highest_cluster =3D 0; i < nb_clusters; i++) { > refcount1 =3D get_refcount(bs, i); > --=20 > 2.0.3 >=20 >=20 The diff is impressive but the patch is mostly moving stuff around. So Reviewed-by: Benoit Canet