cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From b4dbb84eeca1c793c08b39fe26f3772f200eff36 Mon Sep 17 00:00:00 2001
218e99
From: Max Reitz <mreitz@redhat.com>
218e99
Date: Mon, 4 Nov 2013 22:32:01 +0100
218e99
Subject: [PATCH 08/87] qcow2: Employ metadata overlap checks
218e99
218e99
RH-Author: Max Reitz <mreitz@redhat.com>
218e99
Message-id: <1383604354-12743-11-git-send-email-mreitz@redhat.com>
218e99
Patchwork-id: 55310
218e99
O-Subject: [RHEL-7.0 qemu-kvm PATCH 10/43] qcow2: Employ metadata overlap checks
218e99
Bugzilla: 1004347
218e99
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
218e99
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
218e99
RH-Acked-by: Fam Zheng <famz@redhat.com>
218e99
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
218e99
218e99
BZ: 1004347
218e99
218e99
The pre-write overlap check function is now called before most of the
218e99
qcow2 writes (aborting it on collision or other error).
218e99
218e99
Signed-off-by: Max Reitz <mreitz@redhat.com>
218e99
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
218e99
(cherry picked from commit cf93980e775b709ec8f33f55846e6dcf1c7a612c)
218e99
218e99
Signed-off-by: Max Reitz <mreitz@redhat.com>
218e99
---
218e99
 block/qcow2-cache.c    | 17 +++++++++++++++++
218e99
 block/qcow2-cluster.c  | 21 +++++++++++++++++++++
218e99
 block/qcow2-snapshot.c | 22 ++++++++++++++++++++++
218e99
 block/qcow2.c          | 26 ++++++++++++++++++++++++++
218e99
 4 files changed, 86 insertions(+)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 block/qcow2-cache.c    |   17 +++++++++++++++++
218e99
 block/qcow2-cluster.c  |   21 +++++++++++++++++++++
218e99
 block/qcow2-snapshot.c |   22 ++++++++++++++++++++++
218e99
 block/qcow2.c          |   26 ++++++++++++++++++++++++++
218e99
 4 files changed, 86 insertions(+), 0 deletions(-)
218e99
218e99
diff --git a/block/qcow2-cache.c b/block/qcow2-cache.c
218e99
index 2f3114e..7bcae09 100644
218e99
--- a/block/qcow2-cache.c
218e99
+++ b/block/qcow2-cache.c
218e99
@@ -115,6 +115,23 @@ static int qcow2_cache_entry_flush(BlockDriverState *bs, Qcow2Cache *c, int i)
218e99
     }
218e99
 
218e99
     if (c == s->refcount_block_cache) {
218e99
+        ret = qcow2_pre_write_overlap_check(bs,
218e99
+                QCOW2_OL_DEFAULT & ~QCOW2_OL_REFCOUNT_BLOCK,
218e99
+                c->entries[i].offset, s->cluster_size);
218e99
+    } else if (c == s->l2_table_cache) {
218e99
+        ret = qcow2_pre_write_overlap_check(bs,
218e99
+                QCOW2_OL_DEFAULT & ~QCOW2_OL_ACTIVE_L2,
218e99
+                c->entries[i].offset, s->cluster_size);
218e99
+    } else {
218e99
+        ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_DEFAULT,
218e99
+                c->entries[i].offset, s->cluster_size);
218e99
+    }
218e99
+
218e99
+    if (ret < 0) {
218e99
+        return ret;
218e99
+    }
218e99
+
218e99
+    if (c == s->refcount_block_cache) {
218e99
         BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_UPDATE_PART);
218e99
     } else if (c == s->l2_table_cache) {
218e99
         BLKDBG_EVENT(bs->file, BLKDBG_L2_UPDATE);
218e99
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
218e99
index cca76d4..7c248aa 100644
218e99
--- a/block/qcow2-cluster.c
218e99
+++ b/block/qcow2-cluster.c
218e99
@@ -80,6 +80,14 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,
218e99
         goto fail;
218e99
     }
218e99
 
218e99
+    /* the L1 position has not yet been updated, so these clusters must
218e99
+     * indeed be completely free */
218e99
+    ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_DEFAULT,
218e99
+                                        new_l1_table_offset, new_l1_size2);
218e99
+    if (ret < 0) {
218e99
+        goto fail;
218e99
+    }
218e99
+
218e99
     BLKDBG_EVENT(bs->file, BLKDBG_L1_GROW_WRITE_TABLE);
218e99
     for(i = 0; i < s->l1_size; i++)
218e99
         new_l1_table[i] = cpu_to_be64(new_l1_table[i]);
218e99
@@ -149,6 +157,13 @@ static int write_l1_entry(BlockDriverState *bs, int l1_index)
218e99
         buf[i] = cpu_to_be64(s->l1_table[l1_start_index + i]);
218e99
     }
218e99
 
218e99
+    ret = qcow2_pre_write_overlap_check(bs,
218e99
+            QCOW2_OL_DEFAULT & ~QCOW2_OL_ACTIVE_L1,
218e99
+            s->l1_table_offset + 8 * l1_start_index, sizeof(buf));
218e99
+    if (ret < 0) {
218e99
+        return ret;
218e99
+    }
218e99
+
218e99
     BLKDBG_EVENT(bs->file, BLKDBG_L1_UPDATE);
218e99
     ret = bdrv_pwrite_sync(bs->file, s->l1_table_offset + 8 * l1_start_index,
218e99
         buf, sizeof(buf));
218e99
@@ -368,6 +383,12 @@ static int coroutine_fn copy_sectors(BlockDriverState *bs,
218e99
                         &s->aes_encrypt_key);
218e99
     }
218e99
 
218e99
+    ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_DEFAULT,
218e99
+            cluster_offset + n_start * BDRV_SECTOR_SIZE, n * BDRV_SECTOR_SIZE);
218e99
+    if (ret < 0) {
218e99
+        goto out;
218e99
+    }
218e99
+
218e99
     BLKDBG_EVENT(bs->file, BLKDBG_COW_WRITE);
218e99
     ret = bdrv_co_writev(bs->file, (cluster_offset >> 9) + n_start, n, &qiov);
218e99
     if (ret < 0) {
218e99
diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
218e99
index 0caac90..e7e6013 100644
218e99
--- a/block/qcow2-snapshot.c
218e99
+++ b/block/qcow2-snapshot.c
218e99
@@ -189,6 +189,15 @@ static int qcow2_write_snapshots(BlockDriverState *bs)
218e99
         return ret;
218e99
     }
218e99
 
218e99
+    /* The snapshot list position has not yet been updated, so these clusters
218e99
+     * must indeed be completely free */
218e99
+    ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_DEFAULT, offset,
218e99
+                                        s->snapshots_size);
218e99
+    if (ret < 0) {
218e99
+        return ret;
218e99
+    }
218e99
+
218e99
+
218e99
     /* Write all snapshots to the new list */
218e99
     for(i = 0; i < s->nb_snapshots; i++) {
218e99
         sn = s->snapshots + i;
218e99
@@ -363,6 +372,12 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
218e99
         l1_table[i] = cpu_to_be64(s->l1_table[i]);
218e99
     }
218e99
 
218e99
+    ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_DEFAULT,
218e99
+            sn->l1_table_offset, s->l1_size * sizeof(uint64_t));
218e99
+    if (ret < 0) {
218e99
+        goto fail;
218e99
+    }
218e99
+
218e99
     ret = bdrv_pwrite(bs->file, sn->l1_table_offset, l1_table,
218e99
                       s->l1_size * sizeof(uint64_t));
218e99
     if (ret < 0) {
218e99
@@ -475,6 +490,13 @@ int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id)
218e99
         goto fail;
218e99
     }
218e99
 
218e99
+    ret = qcow2_pre_write_overlap_check(bs,
218e99
+            QCOW2_OL_DEFAULT & ~QCOW2_OL_ACTIVE_L1,
218e99
+            s->l1_table_offset, cur_l1_bytes);
218e99
+    if (ret < 0) {
218e99
+        goto fail;
218e99
+    }
218e99
+
218e99
     ret = bdrv_pwrite_sync(bs->file, s->l1_table_offset, sn_l1_table,
218e99
                            cur_l1_bytes);
218e99
     if (ret < 0) {
218e99
diff --git a/block/qcow2.c b/block/qcow2.c
218e99
index aa9dd23..90950cb 100644
218e99
--- a/block/qcow2.c
218e99
+++ b/block/qcow2.c
218e99
@@ -624,6 +624,8 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags)
218e99
     qcow2_free_snapshots(bs);
218e99
     qcow2_refcount_close(bs);
218e99
     g_free(s->l1_table);
218e99
+    /* else pre-write overlap checks in cache_destroy may crash */
218e99
+    s->l1_table = NULL;
218e99
     if (s->l2_table_cache) {
218e99
         qcow2_cache_destroy(bs, s->l2_table_cache);
218e99
     }
218e99
@@ -933,6 +935,13 @@ static coroutine_fn int qcow2_co_writev(BlockDriverState *bs,
218e99
                 cur_nr_sectors * 512);
218e99
         }
218e99
 
218e99
+        ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_DEFAULT,
218e99
+                cluster_offset + index_in_cluster * BDRV_SECTOR_SIZE,
218e99
+                cur_nr_sectors * BDRV_SECTOR_SIZE);
218e99
+        if (ret < 0) {
218e99
+            goto fail;
218e99
+        }
218e99
+
218e99
         qemu_co_mutex_unlock(&s->lock);
218e99
         BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);
218e99
         trace_qcow2_writev_data(qemu_coroutine_self(),
218e99
@@ -999,6 +1008,8 @@ static void qcow2_close(BlockDriverState *bs)
218e99
 {
218e99
     BDRVQcowState *s = bs->opaque;
218e99
     g_free(s->l1_table);
218e99
+    /* else pre-write overlap checks in cache_destroy may crash */
218e99
+    s->l1_table = NULL;
218e99
 
218e99
     qcow2_cache_flush(bs, s->l2_table_cache);
218e99
     qcow2_cache_flush(bs, s->refcount_block_cache);
218e99
@@ -1676,6 +1687,14 @@ static int qcow2_write_compressed(BlockDriverState *bs, int64_t sector_num,
218e99
 
218e99
     if (ret != Z_STREAM_END || out_len >= s->cluster_size) {
218e99
         /* could not compress: write normal cluster */
218e99
+
218e99
+        ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_DEFAULT,
218e99
+                sector_num * BDRV_SECTOR_SIZE,
218e99
+                s->cluster_sectors * BDRV_SECTOR_SIZE);
218e99
+        if (ret < 0) {
218e99
+            goto fail;
218e99
+        }
218e99
+
218e99
         ret = bdrv_write(bs, sector_num, buf, s->cluster_sectors);
218e99
         if (ret < 0) {
218e99
             goto fail;
218e99
@@ -1688,6 +1707,13 @@ static int qcow2_write_compressed(BlockDriverState *bs, int64_t sector_num,
218e99
             goto fail;
218e99
         }
218e99
         cluster_offset &= s->cluster_offset_mask;
218e99
+
218e99
+        ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_DEFAULT,
218e99
+                cluster_offset, out_len);
218e99
+        if (ret < 0) {
218e99
+            goto fail;
218e99
+        }
218e99
+
218e99
         BLKDBG_EVENT(bs->file, BLKDBG_WRITE_COMPRESSED);
218e99
         ret = bdrv_pwrite(bs->file, cluster_offset, out_buf, out_len);
218e99
         if (ret < 0) {
218e99
-- 
218e99
1.7.1
218e99