cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-qcow2-Add-refcount-update-reason-to-all-callers.patch

218e99
From 2e86e4a584cd9054a99d6bb8d3d4d7e8878bff4a Mon Sep 17 00:00:00 2001
218e99
From: Kevin Wolf <kwolf@redhat.com>
218e99
Date: Mon, 9 Sep 2013 14:28:00 +0200
218e99
Subject: [PATCH 09/38] qcow2: Add refcount update reason to all callers
218e99
218e99
RH-Author: Kevin Wolf <kwolf@redhat.com>
218e99
Message-id: <1378736903-18489-10-git-send-email-kwolf@redhat.com>
218e99
Patchwork-id: 54198
218e99
O-Subject: [RHEL-7.0 qemu-kvm PATCH 09/32] qcow2: Add refcount update reason to all callers
218e99
Bugzilla: 1005818
218e99
RH-Acked-by: Fam Zheng <famz@redhat.com>
218e99
RH-Acked-by: Max Reitz <mreitz@redhat.com>
218e99
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
218e99
Bugzilla: 1005818
218e99
218e99
This adds a refcount update reason to all callers of update_refcounts(),
218e99
so that a follow-up patch can use this information to decide whether
218e99
clusters that reach a refcount of 0 should be discarded in the image
218e99
file.
218e99
218e99
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
218e99
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
218e99
(cherry picked from commit 6cfcb9b8b91d303ab51b78623f2299b5288d2d51)
218e99
218e99
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
218e99
---
218e99
 block/qcow2-cluster.c  | 19 +++++++++++------
218e99
 block/qcow2-refcount.c | 55 +++++++++++++++++++++++++++++++-------------------
218e99
 block/qcow2-snapshot.c |  6 ++++--
218e99
 block/qcow2.c          |  3 ++-
218e99
 block/qcow2.h          | 16 ++++++++++++---
218e99
 5 files changed, 66 insertions(+), 33 deletions(-)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 block/qcow2-cluster.c  |   19 +++++++++++-----
218e99
 block/qcow2-refcount.c |   55 +++++++++++++++++++++++++++++------------------
218e99
 block/qcow2-snapshot.c |    6 +++-
218e99
 block/qcow2.c          |    3 +-
218e99
 block/qcow2.h          |   16 +++++++++++--
218e99
 5 files changed, 66 insertions(+), 33 deletions(-)
218e99
218e99
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
218e99
index 76f30e5..3191d6b 100644
218e99
--- a/block/qcow2-cluster.c
218e99
+++ b/block/qcow2-cluster.c
218e99
@@ -98,14 +98,16 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,
218e99
         goto fail;
218e99
     }
218e99
     g_free(s->l1_table);
218e99
-    qcow2_free_clusters(bs, s->l1_table_offset, s->l1_size * sizeof(uint64_t));
218e99
+    qcow2_free_clusters(bs, s->l1_table_offset, s->l1_size * sizeof(uint64_t),
218e99
+                        QCOW2_DISCARD_OTHER);
218e99
     s->l1_table_offset = new_l1_table_offset;
218e99
     s->l1_table = new_l1_table;
218e99
     s->l1_size = new_l1_size;
218e99
     return 0;
218e99
  fail:
218e99
     g_free(new_l1_table);
218e99
-    qcow2_free_clusters(bs, new_l1_table_offset, new_l1_size2);
218e99
+    qcow2_free_clusters(bs, new_l1_table_offset, new_l1_size2,
218e99
+                        QCOW2_DISCARD_OTHER);
218e99
     return ret;
218e99
 }
218e99
 
218e99
@@ -548,7 +550,8 @@ static int get_cluster_table(BlockDriverState *bs, uint64_t offset,
218e99
 
218e99
         /* Then decrease the refcount of the old table */
218e99
         if (l2_offset) {
218e99
-            qcow2_free_clusters(bs, l2_offset, s->l2_size * sizeof(uint64_t));
218e99
+            qcow2_free_clusters(bs, l2_offset, s->l2_size * sizeof(uint64_t),
218e99
+                                QCOW2_DISCARD_OTHER);
218e99
         }
218e99
     }
218e99
 
218e99
@@ -715,10 +718,14 @@ int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m)
218e99
     /*
218e99
      * If this was a COW, we need to decrease the refcount of the old cluster.
218e99
      * Also flush bs->file to get the right order for L2 and refcount update.
218e99
+     *
218e99
+     * Don't discard clusters that reach a refcount of 0 (e.g. compressed
218e99
+     * clusters), the next write will reuse them anyway.
218e99
      */
218e99
     if (j != 0) {
218e99
         for (i = 0; i < j; i++) {
218e99
-            qcow2_free_any_clusters(bs, be64_to_cpu(old_cluster[i]), 1);
218e99
+            qcow2_free_any_clusters(bs, be64_to_cpu(old_cluster[i]), 1,
218e99
+                                    QCOW2_DISCARD_NEVER);
218e99
         }
218e99
     }
218e99
 
218e99
@@ -1339,7 +1346,7 @@ static int discard_single_l2(BlockDriverState *bs, uint64_t offset,
218e99
         l2_table[l2_index + i] = cpu_to_be64(0);
218e99
 
218e99
         /* Then decrease the refcount */
218e99
-        qcow2_free_any_clusters(bs, old_offset, 1);
218e99
+        qcow2_free_any_clusters(bs, old_offset, 1, QCOW2_DISCARD_REQUEST);
218e99
     }
218e99
 
218e99
     ret = qcow2_cache_put(bs, s->l2_table_cache, (void**) &l2_table);
218e99
@@ -1415,7 +1422,7 @@ static int zero_single_l2(BlockDriverState *bs, uint64_t offset,
218e99
         qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_table);
218e99
         if (old_offset & QCOW_OFLAG_COMPRESSED) {
218e99
             l2_table[l2_index + i] = cpu_to_be64(QCOW_OFLAG_ZERO);
218e99
-            qcow2_free_any_clusters(bs, old_offset, 1);
218e99
+            qcow2_free_any_clusters(bs, old_offset, 1, QCOW2_DISCARD_REQUEST);
218e99
         } else {
218e99
             l2_table[l2_index + i] |= cpu_to_be64(QCOW_OFLAG_ZERO);
218e99
         }
218e99
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
218e99
index b32738f..6d35e49 100644
218e99
--- a/block/qcow2-refcount.c
218e99
+++ b/block/qcow2-refcount.c
218e99
@@ -29,7 +29,7 @@
218e99
 static int64_t alloc_clusters_noref(BlockDriverState *bs, int64_t size);
218e99
 static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs,
218e99
                             int64_t offset, int64_t length,
218e99
-                            int addend);
218e99
+                            int addend, enum qcow2_discard_type type);
218e99
 
218e99
 
218e99
 /*********************************************************/
218e99
@@ -235,7 +235,8 @@ static int alloc_refcount_block(BlockDriverState *bs,
218e99
     } else {
218e99
         /* Described somewhere else. This can recurse at most twice before we
218e99
          * arrive at a block that describes itself. */
218e99
-        ret = update_refcount(bs, new_block, s->cluster_size, 1);
218e99
+        ret = update_refcount(bs, new_block, s->cluster_size, 1,
218e99
+                              QCOW2_DISCARD_NEVER);
218e99
         if (ret < 0) {
218e99
             goto fail_block;
218e99
         }
218e99
@@ -399,7 +400,8 @@ static int alloc_refcount_block(BlockDriverState *bs,
218e99
 
218e99
     /* Free old table. Remember, we must not change free_cluster_index */
218e99
     uint64_t old_free_cluster_index = s->free_cluster_index;
218e99
-    qcow2_free_clusters(bs, old_table_offset, old_table_size * sizeof(uint64_t));
218e99
+    qcow2_free_clusters(bs, old_table_offset, old_table_size * sizeof(uint64_t),
218e99
+                        QCOW2_DISCARD_OTHER);
218e99
     s->free_cluster_index = old_free_cluster_index;
218e99
 
218e99
     ret = load_refcount_block(bs, new_block, (void**) refcount_block);
218e99
@@ -420,7 +422,7 @@ fail_block:
218e99
 
218e99
 /* XXX: cache several refcount block clusters ? */
218e99
 static int QEMU_WARN_UNUSED_RESULT update_refcount(BlockDriverState *bs,
218e99
-    int64_t offset, int64_t length, int addend)
218e99
+    int64_t offset, int64_t length, int addend, enum qcow2_discard_type type)
218e99
 {
218e99
     BDRVQcowState *s = bs->opaque;
218e99
     int64_t start, last, cluster_offset;
218e99
@@ -506,7 +508,8 @@ fail:
218e99
      */
218e99
     if (ret < 0) {
218e99
         int dummy;
218e99
-        dummy = update_refcount(bs, offset, cluster_offset - offset, -addend);
218e99
+        dummy = update_refcount(bs, offset, cluster_offset - offset, -addend,
218e99
+                                QCOW2_DISCARD_NEVER);
218e99
         (void)dummy;
218e99
     }
218e99
 
218e99
@@ -522,12 +525,14 @@ fail:
218e99
  */
218e99
 static int update_cluster_refcount(BlockDriverState *bs,
218e99
                                    int64_t cluster_index,
218e99
-                                   int addend)
218e99
+                                   int addend,
218e99
+                                   enum qcow2_discard_type type)
218e99
 {
218e99
     BDRVQcowState *s = bs->opaque;
218e99
     int ret;
218e99
 
218e99
-    ret = update_refcount(bs, cluster_index << s->cluster_bits, 1, addend);
218e99
+    ret = update_refcount(bs, cluster_index << s->cluster_bits, 1, addend,
218e99
+                          type);
218e99
     if (ret < 0) {
218e99
         return ret;
218e99
     }
218e99
@@ -579,7 +584,7 @@ int64_t qcow2_alloc_clusters(BlockDriverState *bs, int64_t size)
218e99
         return offset;
218e99
     }
218e99
 
218e99
-    ret = update_refcount(bs, offset, size, 1);
218e99
+    ret = update_refcount(bs, offset, size, 1, QCOW2_DISCARD_NEVER);
218e99
     if (ret < 0) {
218e99
         return ret;
218e99
     }
218e99
@@ -611,7 +616,8 @@ int qcow2_alloc_clusters_at(BlockDriverState *bs, uint64_t offset,
218e99
     old_free_cluster_index = s->free_cluster_index;
218e99
     s->free_cluster_index = cluster_index + i;
218e99
 
218e99
-    ret = update_refcount(bs, offset, i << s->cluster_bits, 1);
218e99
+    ret = update_refcount(bs, offset, i << s->cluster_bits, 1,
218e99
+                          QCOW2_DISCARD_NEVER);
218e99
     if (ret < 0) {
218e99
         return ret;
218e99
     }
218e99
@@ -649,7 +655,8 @@ int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size)
218e99
         if (free_in_cluster == 0)
218e99
             s->free_byte_offset = 0;
218e99
         if ((offset & (s->cluster_size - 1)) != 0)
218e99
-            update_cluster_refcount(bs, offset >> s->cluster_bits, 1);
218e99
+            update_cluster_refcount(bs, offset >> s->cluster_bits, 1,
218e99
+                                    QCOW2_DISCARD_NEVER);
218e99
     } else {
218e99
         offset = qcow2_alloc_clusters(bs, s->cluster_size);
218e99
         if (offset < 0) {
218e99
@@ -659,7 +666,8 @@ int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size)
218e99
         if ((cluster_offset + s->cluster_size) == offset) {
218e99
             /* we are lucky: contiguous data */
218e99
             offset = s->free_byte_offset;
218e99
-            update_cluster_refcount(bs, offset >> s->cluster_bits, 1);
218e99
+            update_cluster_refcount(bs, offset >> s->cluster_bits, 1,
218e99
+                                    QCOW2_DISCARD_NEVER);
218e99
             s->free_byte_offset += size;
218e99
         } else {
218e99
             s->free_byte_offset = offset;
218e99
@@ -676,12 +684,13 @@ int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size)
218e99
 }
218e99
 
218e99
 void qcow2_free_clusters(BlockDriverState *bs,
218e99
-                          int64_t offset, int64_t size)
218e99
+                          int64_t offset, int64_t size,
218e99
+                          enum qcow2_discard_type type)
218e99
 {
218e99
     int ret;
218e99
 
218e99
     BLKDBG_EVENT(bs->file, BLKDBG_CLUSTER_FREE);
218e99
-    ret = update_refcount(bs, offset, size, -1);
218e99
+    ret = update_refcount(bs, offset, size, -1, type);
218e99
     if (ret < 0) {
218e99
         fprintf(stderr, "qcow2_free_clusters failed: %s\n", strerror(-ret));
218e99
         /* TODO Remember the clusters to free them later and avoid leaking */
218e99
@@ -692,8 +701,8 @@ void qcow2_free_clusters(BlockDriverState *bs,
218e99
  * Free a cluster using its L2 entry (handles clusters of all types, e.g.
218e99
  * normal cluster, compressed cluster, etc.)
218e99
  */
218e99
-void qcow2_free_any_clusters(BlockDriverState *bs,
218e99
-    uint64_t l2_entry, int nb_clusters)
218e99
+void qcow2_free_any_clusters(BlockDriverState *bs, uint64_t l2_entry,
218e99
+                             int nb_clusters, enum qcow2_discard_type type)
218e99
 {
218e99
     BDRVQcowState *s = bs->opaque;
218e99
 
218e99
@@ -705,12 +714,12 @@ void qcow2_free_any_clusters(BlockDriverState *bs,
218e99
                            s->csize_mask) + 1;
218e99
             qcow2_free_clusters(bs,
218e99
                 (l2_entry & s->cluster_offset_mask) & ~511,
218e99
-                nb_csectors * 512);
218e99
+                nb_csectors * 512, type);
218e99
         }
218e99
         break;
218e99
     case QCOW2_CLUSTER_NORMAL:
218e99
         qcow2_free_clusters(bs, l2_entry & L2E_OFFSET_MASK,
218e99
-                            nb_clusters << s->cluster_bits);
218e99
+                            nb_clusters << s->cluster_bits, type);
218e99
         break;
218e99
     case QCOW2_CLUSTER_UNALLOCATED:
218e99
     case QCOW2_CLUSTER_ZERO:
218e99
@@ -785,7 +794,8 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs,
218e99
                             int ret;
218e99
                             ret = update_refcount(bs,
218e99
                                 (offset & s->cluster_offset_mask) & ~511,
218e99
-                                nb_csectors * 512, addend);
218e99
+                                nb_csectors * 512, addend,
218e99
+                                QCOW2_DISCARD_SNAPSHOT);
218e99
                             if (ret < 0) {
218e99
                                 goto fail;
218e99
                             }
218e99
@@ -795,7 +805,8 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs,
218e99
                     } else {
218e99
                         uint64_t cluster_index = (offset & L2E_OFFSET_MASK) >> s->cluster_bits;
218e99
                         if (addend != 0) {
218e99
-                            refcount = update_cluster_refcount(bs, cluster_index, addend);
218e99
+                            refcount = update_cluster_refcount(bs, cluster_index, addend,
218e99
+                                                               QCOW2_DISCARD_SNAPSHOT);
218e99
                         } else {
218e99
                             refcount = get_refcount(bs, cluster_index);
218e99
                         }
218e99
@@ -827,7 +838,8 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs,
218e99
 
218e99
 
218e99
             if (addend != 0) {
218e99
-                refcount = update_cluster_refcount(bs, l2_offset >> s->cluster_bits, addend);
218e99
+                refcount = update_cluster_refcount(bs, l2_offset >> s->cluster_bits, addend,
218e99
+                                                   QCOW2_DISCARD_SNAPSHOT);
218e99
             } else {
218e99
                 refcount = get_refcount(bs, l2_offset >> s->cluster_bits);
218e99
             }
218e99
@@ -1253,7 +1265,8 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
218e99
 
218e99
             if (num_fixed) {
218e99
                 ret = update_refcount(bs, i << s->cluster_bits, 1,
218e99
-                                      refcount2 - refcount1);
218e99
+                                      refcount2 - refcount1,
218e99
+                                      QCOW2_DISCARD_ALWAYS);
218e99
                 if (ret >= 0) {
218e99
                     (*num_fixed)++;
218e99
                     continue;
218e99
diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
218e99
index 992a5c8..0caac90 100644
218e99
--- a/block/qcow2-snapshot.c
218e99
+++ b/block/qcow2-snapshot.c
218e99
@@ -262,7 +262,8 @@ static int qcow2_write_snapshots(BlockDriverState *bs)
218e99
     }
218e99
 
218e99
     /* free the old snapshot table */
218e99
-    qcow2_free_clusters(bs, s->snapshots_offset, s->snapshots_size);
218e99
+    qcow2_free_clusters(bs, s->snapshots_offset, s->snapshots_size,
218e99
+                        QCOW2_DISCARD_SNAPSHOT);
218e99
     s->snapshots_offset = snapshots_offset;
218e99
     s->snapshots_size = snapshots_size;
218e99
     return 0;
218e99
@@ -569,7 +570,8 @@ int qcow2_snapshot_delete(BlockDriverState *bs, const char *snapshot_id)
218e99
     if (ret < 0) {
218e99
         return ret;
218e99
     }
218e99
-    qcow2_free_clusters(bs, sn.l1_table_offset, sn.l1_size * sizeof(uint64_t));
218e99
+    qcow2_free_clusters(bs, sn.l1_table_offset, sn.l1_size * sizeof(uint64_t),
218e99
+                        QCOW2_DISCARD_SNAPSHOT);
218e99
 
218e99
     /* must update the copied flag on the current cluster offsets */
218e99
     ret = qcow2_update_snapshot_refcount(bs, s->l1_table_offset, s->l1_size, 0);
218e99
diff --git a/block/qcow2.c b/block/qcow2.c
218e99
index 0fa5cb2..e28ea47 100644
218e99
--- a/block/qcow2.c
218e99
+++ b/block/qcow2.c
218e99
@@ -1196,7 +1196,8 @@ static int preallocate(BlockDriverState *bs)
218e99
 
218e99
         ret = qcow2_alloc_cluster_link_l2(bs, meta);
218e99
         if (ret < 0) {
218e99
-            qcow2_free_any_clusters(bs, meta->alloc_offset, meta->nb_clusters);
218e99
+            qcow2_free_any_clusters(bs, meta->alloc_offset, meta->nb_clusters,
218e99
+                                    QCOW2_DISCARD_NEVER);
218e99
             return ret;
218e99
         }
218e99
 
218e99
diff --git a/block/qcow2.h b/block/qcow2.h
218e99
index 6959c6a..64a6479 100644
218e99
--- a/block/qcow2.h
218e99
+++ b/block/qcow2.h
218e99
@@ -129,6 +129,15 @@ enum {
218e99
     QCOW2_COMPAT_FEAT_MASK            = QCOW2_COMPAT_LAZY_REFCOUNTS,
218e99
 };
218e99
 
218e99
+enum qcow2_discard_type {
218e99
+    QCOW2_DISCARD_NEVER = 0,
218e99
+    QCOW2_DISCARD_ALWAYS,
218e99
+    QCOW2_DISCARD_REQUEST,
218e99
+    QCOW2_DISCARD_SNAPSHOT,
218e99
+    QCOW2_DISCARD_OTHER,
218e99
+    QCOW2_DISCARD_MAX
218e99
+};
218e99
+
218e99
 typedef struct Qcow2Feature {
218e99
     uint8_t type;
218e99
     uint8_t bit;
218e99
@@ -349,9 +358,10 @@ int qcow2_alloc_clusters_at(BlockDriverState *bs, uint64_t offset,
218e99
     int nb_clusters);
218e99
 int64_t qcow2_alloc_bytes(BlockDriverState *bs, int size);
218e99
 void qcow2_free_clusters(BlockDriverState *bs,
218e99
-    int64_t offset, int64_t size);
218e99
-void qcow2_free_any_clusters(BlockDriverState *bs,
218e99
-    uint64_t cluster_offset, int nb_clusters);
218e99
+                          int64_t offset, int64_t size,
218e99
+                          enum qcow2_discard_type type);
218e99
+void qcow2_free_any_clusters(BlockDriverState *bs, uint64_t l2_entry,
218e99
+                             int nb_clusters, enum qcow2_discard_type type);
218e99
 
218e99
 int qcow2_update_snapshot_refcount(BlockDriverState *bs,
218e99
     int64_t l1_table_offset, int l1_size, int addend);
218e99
-- 
218e99
1.7.1
218e99