qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	Roman Kagan <rkagan@parallels.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	"Denis V. Lunev" <den@openvz.org>
Subject: [Qemu-devel] [PULL 19/38] block/parallels: implement parallels_check method of block driver
Date: Fri, 22 May 2015 10:01:51 +0100	[thread overview]
Message-ID: <1432285330-13994-20-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1432285330-13994-1-git-send-email-stefanha@redhat.com>

From: "Denis V. Lunev" <den@openvz.org>

The check is very simple at the moment. It calculates necessary stats
and fix only the following errors:
- space leak at the end of the image. This would happens due to
  preallocation
- clusters outside the image are zeroed. Nothing else could be done here

Signed-off-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Roman Kagan <rkagan@parallels.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Roman Kagan <rkagan@parallels.com>
Message-id: 1430207220-24458-20-git-send-email-den@openvz.org
CC: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/parallels.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/block/parallels.c b/block/parallels.c
index 35ffb6f..35f231a 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -242,6 +242,90 @@ static coroutine_fn int parallels_co_readv(BlockDriverState *bs,
     return ret;
 }
 
+
+static int parallels_check(BlockDriverState *bs, BdrvCheckResult *res,
+                           BdrvCheckMode fix)
+{
+    BDRVParallelsState *s = bs->opaque;
+    int64_t size, prev_off, high_off;
+    int ret;
+    uint32_t i;
+    bool flush_bat = false;
+    int cluster_size = s->tracks << BDRV_SECTOR_BITS;
+
+    size = bdrv_getlength(bs->file);
+    if (size < 0) {
+        res->check_errors++;
+        return size;
+    }
+
+    res->bfi.total_clusters = s->bat_size;
+    res->bfi.compressed_clusters = 0; /* compression is not supported */
+
+    high_off = 0;
+    prev_off = 0;
+    for (i = 0; i < s->bat_size; i++) {
+        int64_t off = bat2sect(s, i) << BDRV_SECTOR_BITS;
+        if (off == 0) {
+            prev_off = 0;
+            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) {
+                prev_off = 0;
+                s->bat_bitmap[i] = 0;
+                res->corruptions_fixed++;
+                flush_bat = true;
+                continue;
+            }
+        }
+
+        res->bfi.allocated_clusters++;
+        if (off > high_off) {
+            high_off = off;
+        }
+
+        if (prev_off != 0 && (prev_off + cluster_size) != off) {
+            res->bfi.fragmented_clusters++;
+        }
+        prev_off = off;
+    }
+
+    if (flush_bat) {
+        ret = bdrv_pwrite_sync(bs->file, 0, s->header, s->header_size);
+        if (ret < 0) {
+            res->check_errors++;
+            return ret;
+        }
+    }
+
+    res->image_end_offset = high_off + cluster_size;
+    if (size > res->image_end_offset) {
+        int64_t count;
+        count = DIV_ROUND_UP(size - res->image_end_offset, cluster_size);
+        fprintf(stderr, "%s space leaked at the end of the image %" PRId64 "\n",
+                fix & BDRV_FIX_LEAKS ? "Repairing" : "ERROR",
+                size - res->image_end_offset);
+        res->leaks += count;
+        if (fix & BDRV_FIX_LEAKS) {
+            ret = bdrv_truncate(bs->file, res->image_end_offset);
+            if (ret < 0) {
+                res->check_errors++;
+                return ret;
+            }
+            res->leaks_fixed += count;
+        }
+    }
+
+    return 0;
+}
+
+
 static int parallels_create(const char *filename, QemuOpts *opts, Error **errp)
 {
     int64_t total_size, cl_size;
@@ -449,6 +533,7 @@ static BlockDriver bdrv_parallels = {
     .bdrv_co_writev = parallels_co_writev,
 
     .bdrv_create    = parallels_create,
+    .bdrv_check     = parallels_check,
     .create_opts    = &parallels_create_opts,
 };
 
-- 
2.1.0

  parent reply	other threads:[~2015-05-22  9:03 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-22  9:01 [Qemu-devel] [PULL 00/38] Block patches Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 01/38] iotests, parallels: quote TEST_IMG in 076 test to be path-safe Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 02/38] block/parallels: rename parallels_header to ParallelsHeader Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 03/38] block/parallels: switch to bdrv_read Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 04/38] block/parallels: read up to cluster end in one go Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 05/38] block/parallels: add get_block_status Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 06/38] block/parallels: provide _co_readv routine for parallels format driver Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 07/38] block/parallels: replace magic constants 4, 64 with proper sizeofs Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 08/38] block/parallels: mark parallels format driver as zero inited Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 09/38] block/parallels: _co_writev callback for Parallels format Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 10/38] iotests, parallels: test for write into Parallels image Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 11/38] block/parallels: support parallels image creation Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 12/38] iotests, parallels: test for newly created parallels image via qemu-img Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 13/38] parallels: change copyright information in the image header Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 14/38] block/parallels: rename catalog_ names to bat_ Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 15/38] block/parallels: create bat2sect helper Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 16/38] block/parallels: keep BAT bitmap data in little endian in memory Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 17/38] block/parallels: read parallels image header and BAT into single buffer Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 18/38] block/parallels: move parallels_open/probe to the very end of the file Stefan Hajnoczi
2015-05-22  9:01 ` Stefan Hajnoczi [this message]
2015-05-22  9:01 ` [Qemu-devel] [PULL 20/38] block/parallels: implement incorrect close detection Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 21/38] iotests, parallels: check for incorrectly closed image in tests Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 22/38] block/parallels: improve image reading performance Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 23/38] block/parallels: create bat_entry_off helper Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 24/38] block/parallels: delay writing to BAT till bdrv_co_flush_to_os Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 25/38] block/parallels: add prealloc-mode and prealloc-size open paramemets Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 26/38] block/parallels: optimize linear image expansion Stefan Hajnoczi
2015-05-22  9:01 ` [Qemu-devel] [PULL 27/38] block/parallels: improve image writing performance further Stefan Hajnoczi
2015-05-22  9:02 ` [Qemu-devel] [PULL 28/38] configure: handle clang -nopie argument warning Stefan Hajnoczi
2015-05-22  9:02 ` [Qemu-devel] [PULL 29/38] configure: factor out supported flag check Stefan Hajnoczi
2015-05-22  9:02 ` [Qemu-devel] [PULL 30/38] configure: silence glib unknown attribute __alloc_size__ Stefan Hajnoczi
2015-05-22  9:02 ` [Qemu-devel] [PULL 31/38] configure: Add workaround for ccache and clang Stefan Hajnoczi
2015-05-22  9:02 ` [Qemu-devel] [PULL 32/38] block: return EPERM on writes or discards to read-only devices Stefan Hajnoczi
2015-05-22  9:02 ` [Qemu-devel] [PULL 33/38] block: minimal bounce buffer alignment Stefan Hajnoczi
2015-05-22  9:02 ` [Qemu-devel] [PULL 34/38] block: align bounce buffers to page Stefan Hajnoczi
2015-05-22  9:02 ` [Qemu-devel] [PULL 35/38] Revert "block: Fix unaligned zero write" Stefan Hajnoczi
2015-05-22  9:02 ` [Qemu-devel] [PULL 36/38] block: Fix NULL deference for unaligned write if qiov is NULL Stefan Hajnoczi
2015-05-22  9:02 ` [Qemu-devel] [PULL 37/38] qemu-iotests: Test unaligned sub-block zero write Stefan Hajnoczi
2015-05-22  9:02 ` [Qemu-devel] [PULL 38/38] block: get_block_status: use "else" when testing the opposite condition Stefan Hajnoczi
2015-05-22 14:48 ` [Qemu-devel] [PULL 00/38] Block patches Peter Maydell

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=1432285330-13994-20-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=den@openvz.org \
    --cc=kwolf@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=rkagan@parallels.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).