[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 5/8] block/qcow2-refcount: check_refcounts_l2: do
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH v3 5/8] block/qcow2-refcount: check_refcounts_l2: don't count corrupted entries |
Date: |
Thu, 11 Oct 2018 18:16:20 +0300 |
Misaligned entries will lead to fatal qcow2 driver corruption on read
or write to corresponding offset, so there is no sense to take them
into account.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
block/qcow2-refcount.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 8fb9c9af39..3b34681f16 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1634,15 +1634,6 @@ static int check_refcounts_l2(BlockDriverState *bs,
BdrvCheckResult *res,
{
uint64_t offset = l2_entry & L2E_OFFSET_MASK;
- if (flags & CHECK_FRAG_INFO) {
- res->bfi.allocated_clusters++;
- if (next_contiguous_offset &&
- offset != next_contiguous_offset) {
- res->bfi.fragmented_clusters++;
- }
- next_contiguous_offset = offset + s->cluster_size;
- }
-
/* Correct offsets are cluster aligned */
if (offset_into_cluster(s, offset)) {
if (qcow2_get_cluster_type(l2_entry) ==
@@ -1681,9 +1672,6 @@ static int check_refcounts_l2(BlockDriverState *bs,
BdrvCheckResult *res,
* L2 table's entries */
} else {
res->corruptions_fixed++;
- /* Skip marking the cluster as used
- * (it is unused now) */
- continue;
}
} else {
res->corruptions++;
@@ -1693,6 +1681,19 @@ static int check_refcounts_l2(BlockDriverState *bs,
BdrvCheckResult *res,
"not properly aligned; L2 entry corrupted.\n", offset);
res->corruptions++;
}
+
+ /* Skip marking the cluster as used
+ * (l2 entry is marked as zero or still fatally corrupted) */
+ continue;
+ }
+
+ if (flags & CHECK_FRAG_INFO) {
+ res->bfi.allocated_clusters++;
+ if (next_contiguous_offset &&
+ offset != next_contiguous_offset) {
+ res->bfi.fragmented_clusters++;
+ }
+ next_contiguous_offset = offset + s->cluster_size;
}
/* Mark cluster as used */
--
2.18.0
- [Qemu-block] [PATCH v3 0/8] qcow2 check improvements, Vladimir Sementsov-Ogievskiy, 2018/10/11
- [Qemu-block] [PATCH v3 2/8] block/qcow2-refcount: avoid eating RAM, Vladimir Sementsov-Ogievskiy, 2018/10/11
- [Qemu-block] [PATCH v3 3/8] block/qcow2-refcount: check_refcounts_l2: refactor compressed case, Vladimir Sementsov-Ogievskiy, 2018/10/11
- [Qemu-block] [PATCH v3 8/8] block/qcow2-refcount: fix out-of-file L2 entries, Vladimir Sementsov-Ogievskiy, 2018/10/11
- [Qemu-block] [PATCH v3 7/8] block/qcow2-refcount: fix out-of-file L1 entries to be zero, Vladimir Sementsov-Ogievskiy, 2018/10/11
- [Qemu-block] [PATCH v3 5/8] block/qcow2-refcount: check_refcounts_l2: don't count corrupted entries,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH v3 1/8] block/qcow2-refcount: fix check_oflag_copied, Vladimir Sementsov-Ogievskiy, 2018/10/11
- [Qemu-block] [PATCH v3 4/8] block/qcow2-refcount: check_refcounts_l2: reduce ignored overlaps, Vladimir Sementsov-Ogievskiy, 2018/10/11
- [Qemu-block] [PATCH v3 6/8] block/qcow2-refcount: refactor fixing L2 entry, Vladimir Sementsov-Ogievskiy, 2018/10/11