yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
05bba0
From f9a81072210afed390c21465ba973fc557105b79 Mon Sep 17 00:00:00 2001
05bba0
From: Max Reitz <mreitz@redhat.com>
05bba0
Date: Sat, 13 Jun 2015 16:22:18 +0200
05bba0
Subject: [PATCH 24/42] qcow2: Let inc_refcounts() resize the reftable
05bba0
05bba0
Message-id: <1434212556-3927-25-git-send-email-mreitz@redhat.com>
05bba0
Patchwork-id: 66043
05bba0
O-Subject: [RHEL-7.2 qemu-kvm PATCH 24/42] qcow2: Let inc_refcounts() resize the reftable
05bba0
Bugzilla: 1129893
05bba0
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
05bba0
RH-Acked-by: Fam Zheng <famz@redhat.com>
05bba0
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
05bba0
05bba0
BZ: 1129893
05bba0
05bba0
Now that the refcount table can be passed around by reference, do that
05bba0
for inc_refcounts() (and subsequently check_refcounts_l1() and
05bba0
check_refcounts_l2()) and use it for resizing it when a cluster after
05bba0
the image end is encountered.
05bba0
05bba0
Signed-off-by: Max Reitz <mreitz@redhat.com>
05bba0
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
05bba0
(cherry picked from commit 641bb63cd6b003ab0ca2e312a014449037d71647)
05bba0
05bba0
Signed-off-by: Max Reitz <mreitz@redhat.com>
05bba0
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
05bba0
---
05bba0
 block/qcow2-refcount.c | 57 +++++++++++++++++++++++++++++++-------------------
05bba0
 1 file changed, 35 insertions(+), 22 deletions(-)
05bba0
05bba0
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
05bba0
index 4655fa2..7d03e65 100644
05bba0
--- a/block/qcow2-refcount.c
05bba0
+++ b/block/qcow2-refcount.c
05bba0
@@ -1055,8 +1055,8 @@ fail:
05bba0
  */
05bba0
 static int inc_refcounts(BlockDriverState *bs,
05bba0
                          BdrvCheckResult *res,
05bba0
-                         uint16_t *refcount_table,
05bba0
-                         int64_t refcount_table_size,
05bba0
+                         uint16_t **refcount_table,
05bba0
+                         int64_t *refcount_table_size,
05bba0
                          int64_t offset, int64_t size)
05bba0
 {
05bba0
     BDRVQcowState *s = bs->opaque;
05bba0
@@ -1071,17 +1071,30 @@ static int inc_refcounts(BlockDriverState *bs,
05bba0
     for(cluster_offset = start; cluster_offset <= last;
05bba0
         cluster_offset += s->cluster_size) {
05bba0
         k = cluster_offset >> s->cluster_bits;
05bba0
-        if (k >= refcount_table_size) {
05bba0
-            fprintf(stderr, "Warning: cluster offset=0x%" PRIx64 " is after "
05bba0
-                "the end of the image file, can't properly check refcounts.\n",
05bba0
-                cluster_offset);
05bba0
-            res->check_errors++;
05bba0
-        } else {
05bba0
-            if (++refcount_table[k] == 0) {
05bba0
-                fprintf(stderr, "ERROR: overflow cluster offset=0x%" PRIx64
05bba0
-                    "\n", cluster_offset);
05bba0
-                res->corruptions++;
05bba0
+        if (k >= *refcount_table_size) {
05bba0
+            int64_t old_refcount_table_size = *refcount_table_size;
05bba0
+            uint16_t *new_refcount_table;
05bba0
+
05bba0
+            *refcount_table_size = k + 1;
05bba0
+            new_refcount_table = g_try_realloc(*refcount_table,
05bba0
+                                               *refcount_table_size *
05bba0
+                                               sizeof(**refcount_table));
05bba0
+            if (!new_refcount_table) {
05bba0
+                *refcount_table_size = old_refcount_table_size;
05bba0
+                res->check_errors++;
05bba0
+                return -ENOMEM;
05bba0
             }
05bba0
+            *refcount_table = new_refcount_table;
05bba0
+
05bba0
+            memset(*refcount_table + old_refcount_table_size, 0,
05bba0
+                   (*refcount_table_size - old_refcount_table_size) *
05bba0
+                   sizeof(**refcount_table));
05bba0
+        }
05bba0
+
05bba0
+        if (++(*refcount_table)[k] == 0) {
05bba0
+            fprintf(stderr, "ERROR: overflow cluster offset=0x%" PRIx64
05bba0
+                    "\n", cluster_offset);
05bba0
+            res->corruptions++;
05bba0
         }
05bba0
     }
05bba0
 
05bba0
@@ -1102,7 +1115,7 @@ enum {
05bba0
  * error occurred.
05bba0
  */
05bba0
 static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
05bba0
-    uint16_t *refcount_table, int64_t refcount_table_size, int64_t l2_offset,
05bba0
+    uint16_t **refcount_table, int64_t *refcount_table_size, int64_t l2_offset,
05bba0
     int flags)
05bba0
 {
05bba0
     BDRVQcowState *s = bs->opaque;
05bba0
@@ -1220,8 +1233,8 @@ fail:
05bba0
  */
05bba0
 static int check_refcounts_l1(BlockDriverState *bs,
05bba0
                               BdrvCheckResult *res,
05bba0
-                              uint16_t *refcount_table,
05bba0
-                              int64_t refcount_table_size,
05bba0
+                              uint16_t **refcount_table,
05bba0
+                              int64_t *refcount_table_size,
05bba0
                               int64_t l1_table_offset, int l1_size,
05bba0
                               int flags)
05bba0
 {
05bba0
@@ -1556,7 +1569,7 @@ static int check_refblocks(BlockDriverState *bs, BdrvCheckResult *res,
05bba0
         }
05bba0
 
05bba0
         if (offset != 0) {
05bba0
-            ret = inc_refcounts(bs, res, *refcount_table, *nb_clusters,
05bba0
+            ret = inc_refcounts(bs, res, refcount_table, nb_clusters,
05bba0
                                 offset, s->cluster_size);
05bba0
             if (ret < 0) {
05bba0
                 return ret;
05bba0
@@ -1589,7 +1602,7 @@ static int check_refblocks(BlockDriverState *bs, BdrvCheckResult *res,
05bba0
                                sizeof(**refcount_table));
05bba0
                     }
05bba0
                     (*refcount_table)[cluster]--;
05bba0
-                    ret = inc_refcounts(bs, res, *refcount_table, *nb_clusters,
05bba0
+                    ret = inc_refcounts(bs, res, refcount_table, nb_clusters,
05bba0
                                         new_offset, s->cluster_size);
05bba0
                     if (ret < 0) {
05bba0
                         return ret;
05bba0
@@ -1625,14 +1638,14 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
05bba0
     }
05bba0
 
05bba0
     /* header */
05bba0
-    ret = inc_refcounts(bs, res, *refcount_table, *nb_clusters,
05bba0
+    ret = inc_refcounts(bs, res, refcount_table, nb_clusters,
05bba0
                         0, s->cluster_size);
05bba0
     if (ret < 0) {
05bba0
         return ret;
05bba0
     }
05bba0
 
05bba0
     /* current L1 table */
05bba0
-    ret = check_refcounts_l1(bs, res, *refcount_table, *nb_clusters,
05bba0
+    ret = check_refcounts_l1(bs, res, refcount_table, nb_clusters,
05bba0
                              s->l1_table_offset, s->l1_size, CHECK_FRAG_INFO);
05bba0
     if (ret < 0) {
05bba0
         return ret;
05bba0
@@ -1641,20 +1654,20 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
05bba0
     /* snapshots */
05bba0
     for (i = 0; i < s->nb_snapshots; i++) {
05bba0
         sn = s->snapshots + i;
05bba0
-        ret = check_refcounts_l1(bs, res, *refcount_table, *nb_clusters,
05bba0
+        ret = check_refcounts_l1(bs, res, refcount_table, nb_clusters,
05bba0
                                  sn->l1_table_offset, sn->l1_size, 0);
05bba0
         if (ret < 0) {
05bba0
             return ret;
05bba0
         }
05bba0
     }
05bba0
-    ret = inc_refcounts(bs, res, *refcount_table, *nb_clusters,
05bba0
+    ret = inc_refcounts(bs, res, refcount_table, nb_clusters,
05bba0
                         s->snapshots_offset, s->snapshots_size);
05bba0
     if (ret < 0) {
05bba0
         return ret;
05bba0
     }
05bba0
 
05bba0
     /* refcount data */
05bba0
-    ret = inc_refcounts(bs, res, *refcount_table, *nb_clusters,
05bba0
+    ret = inc_refcounts(bs, res, refcount_table, nb_clusters,
05bba0
                         s->refcount_table_offset,
05bba0
                         s->refcount_table_size * sizeof(uint64_t));
05bba0
     if (ret < 0) {
05bba0
-- 
05bba0
1.8.3.1
05bba0