From: "Denis V. Lunev" <den@virtuozzo.com>
To: Alexander Ivanov <alexander.ivanov@virtuozzo.com>, qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, stefanha@redhat.com,
vsementsov@yandex-team.ru, kwolf@redhat.com, hreitz@redhat.com
Subject: Re: [PATCH v6 07/10] parallels: Move check of cluster outside image to a separate function
Date: Fri, 26 Aug 2022 15:08:49 +0200 [thread overview]
Message-ID: <894e03ab-4cbd-da6b-7f95-df1912d3f47e@virtuozzo.com> (raw)
In-Reply-To: <20220825143109.176582-8-alexander.ivanov@virtuozzo.com>
On 25.08.2022 16:31, Alexander Ivanov wrote:
> We will add more and more checks so we need a better code structure
> in parallels_co_check. Let each check performs in a separate loop
> in a separate helper.
>
> Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
> ---
> block/parallels.c | 59 ++++++++++++++++++++++++++++++++++-------------
> 1 file changed, 43 insertions(+), 16 deletions(-)
>
> diff --git a/block/parallels.c b/block/parallels.c
> index eea318f809..f50cd232aa 100644
> --- a/block/parallels.c
> +++ b/block/parallels.c
> @@ -438,13 +438,50 @@ static void parallels_check_unclean(BlockDriverState *bs,
> }
> }
>
> +static int parallels_check_outside_image(BlockDriverState *bs,
> + BdrvCheckResult *res,
> + BdrvCheckMode fix)
> +{
> + BDRVParallelsState *s = bs->opaque;
> + uint32_t i;
> + int64_t off, high_off, size;
> +
> + size = bdrv_getlength(bs->file->bs);
> + if (size < 0) {
> + res->check_errors++;
> + return size;
> + }
> +
> + high_off = 0;
> + for (i = 0; i < s->bat_size; i++) {
> + off = bat2sect(s, i) << BDRV_SECTOR_BITS;
> + if (off > size) {
we need one more patch here. Correct check would be
if (off >= size) {
bla-bla()
}
> + fprintf(stderr, "%s cluster %u is outside image\n",
> + fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR", i);
> + res->corruptions++;
> + if (fix & BDRV_FIX_ERRORS) {
> + parallels_set_bat_entry(s, i, 0);
> + res->corruptions_fixed++;
> + }
> + continue;
> + }
> + if (high_off < off) {
> + high_off = off;
> + }
> + }
> +
> + s->data_end = (high_off + s->cluster_size) >> BDRV_SECTOR_BITS;
> +
> + return 0;
> +}
> +
> static int coroutine_fn parallels_co_check(BlockDriverState *bs,
> BdrvCheckResult *res,
> BdrvCheckMode fix)
> {
> BDRVParallelsState *s = bs->opaque;
> int64_t size, prev_off, high_off;
> - int ret = 0;
> + int ret;
> uint32_t i;
>
> size = bdrv_getlength(bs->file->bs);
> @@ -457,6 +494,11 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs,
>
> parallels_check_unclean(bs, res, fix);
>
> + ret = parallels_check_outside_image(bs, res, fix);
> + if (ret < 0) {
> + goto out;
> + }
> +
> res->bfi.total_clusters = s->bat_size;
> res->bfi.compressed_clusters = 0; /* compression is not supported */
>
> @@ -469,19 +511,6 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs,
> continue;
> }
>
> - /* cluster outside the image */
> - if (off > size) {
> - fprintf(stderr, "%s cluster %u is outside image\n",
> - fix & BDRV_FIX_ERRORS ? "Repairing" : "ERROR", i);
> - res->corruptions++;
> - if (fix & BDRV_FIX_ERRORS) {
> - parallels_set_bat_entry(s, i, 0);
> - res->corruptions_fixed++;
> - }
> - prev_off = 0;
> - continue;
> - }
> -
> res->bfi.allocated_clusters++;
> if (off > high_off) {
> high_off = off;
> @@ -519,8 +548,6 @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs,
> }
> }
>
> - s->data_end = res->image_end_offset >> BDRV_SECTOR_BITS;
> -
> out:
> qemu_co_mutex_unlock(&s->lock);
>
Reviewed-by: Denis V. Lunev <den@openvz.org>
next prev parent reply other threads:[~2022-08-26 13:11 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-25 14:30 [PATCH v6 00/10] parallels: Refactor the code of images checks and fix a bug Alexander Ivanov
2022-08-25 14:31 ` [PATCH v6 01/10] parallels: Out of image offset in BAT leads to image inflation Alexander Ivanov
2022-08-26 12:54 ` Denis V. Lunev
2022-08-25 14:31 ` [PATCH v6 02/10] parallels: Fix high_off calculation in parallels_co_check() Alexander Ivanov
2022-08-26 12:58 ` Denis V. Lunev
2022-08-25 14:31 ` [PATCH v6 03/10] parallels: Fix data_end after out-of-image check Alexander Ivanov
2022-08-26 13:01 ` Denis V. Lunev
2022-08-25 14:31 ` [PATCH v6 04/10] parallels: create parallels_set_bat_entry_helper() to assign BAT value Alexander Ivanov
2022-08-25 14:31 ` [PATCH v6 05/10] parallels: Use generic infrastructure for BAT writing in parallels_co_check() Alexander Ivanov
2022-08-25 14:31 ` [PATCH v6 06/10] parallels: Move check of unclean image to a separate function Alexander Ivanov
2022-08-25 14:31 ` [PATCH v6 07/10] parallels: Move check of cluster outside " Alexander Ivanov
2022-08-26 13:08 ` Denis V. Lunev [this message]
2022-08-26 13:23 ` Alexander Ivanov
2022-08-26 13:58 ` Denis V. Lunev
2022-08-25 14:31 ` [PATCH v6 08/10] parallels: Move check of leaks " Alexander Ivanov
2022-08-26 13:21 ` Denis V. Lunev
2022-08-25 14:31 ` [PATCH v6 09/10] parallels: Move statistic collection " Alexander Ivanov
2022-08-25 14:31 ` [PATCH v6 10/10] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD Alexander Ivanov
2022-08-26 14:27 ` [PATCH v6 11/10] parallels: Incorrect condition in out-of-image check Alexander Ivanov
2022-08-26 15:23 ` Denis V. Lunev
2022-08-29 9:24 ` [PATCH v7 02/10] parallels: Fix high_off calculation in parallels_co_check() Alexander Ivanov
2022-08-29 9:24 ` [PATCH v7 03/10] parallels: Fix data_end after out-of-image check Alexander Ivanov
2022-08-29 9:24 ` [PATCH v7 04/10] parallels: create parallels_set_bat_entry_helper() to assign BAT value Alexander Ivanov
2022-08-29 9:24 ` [PATCH v7 05/10] parallels: Use generic infrastructure for BAT writing in parallels_co_check() Alexander Ivanov
2022-08-29 9:24 ` [PATCH v7 06/10] parallels: Move check of unclean image to a separate function Alexander Ivanov
2022-08-29 9:24 ` [PATCH v7 07/10] parallels: Move check of cluster outside " Alexander Ivanov
2022-08-29 9:24 ` [PATCH v7 08/10] parallels: Move check of leaks " Alexander Ivanov
2022-08-29 9:24 ` [PATCH v7 09/10] parallels: Move statistic collection " Alexander Ivanov
2022-08-29 9:24 ` [PATCH v7 10/10] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD Alexander Ivanov
2022-08-29 9:24 ` [PATCH v7 11/10] parallels: Incorrect condition in out-of-image check Alexander Ivanov
2022-08-29 10:11 ` [PATCH v7 02/10] parallels: Fix high_off calculation in parallels_co_check() Alexander Ivanov
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=894e03ab-4cbd-da6b-7f95-df1912d3f47e@virtuozzo.com \
--to=den@virtuozzo.com \
--cc=alexander.ivanov@virtuozzo.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=vsementsov@yandex-team.ru \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.