From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKty6-0005Yl-RR for qemu-devel@nongnu.org; Mon, 09 Feb 2015 14:26:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YKty5-0003Uh-Sb for qemu-devel@nongnu.org; Mon, 09 Feb 2015 14:26:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52006) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKty5-0003UQ-Lv for qemu-devel@nongnu.org; Mon, 09 Feb 2015 14:26:01 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t19JQ0Ea025345 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 9 Feb 2015 14:26:01 -0500 From: Max Reitz Date: Mon, 9 Feb 2015 14:25:46 -0500 Message-Id: <1423509950-7468-9-git-send-email-mreitz@redhat.com> In-Reply-To: <1423509950-7468-1-git-send-email-mreitz@redhat.com> References: <1423509950-7468-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 08/12] qcow2/overlaps: Protect active L2 tables List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz Keep track of the active L2 tables in the metadata list to protect them against accidental modifications. Signed-off-by: Max Reitz --- block/qcow2-cluster.c | 2 ++ block/qcow2-refcount.c | 6 ++++++ block/qcow2-snapshot.c | 21 +++++++++++++++++++++ block/qcow2.c | 8 +++++++- 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index bc93c00..88dd4f0 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -288,6 +288,8 @@ static int l2_allocate(BlockDriverState *bs, int l1_index, uint64_t **table) goto fail; } + qcow2_metadata_list_enter(bs, l2_offset, 1, QCOW2_OL_ACTIVE_L2); + *table = l2_table; trace_qcow2_l2_allocate_done(bs, l1_index, 0); return 0; diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index a785027..6255ed2 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1043,6 +1043,12 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, if (addend != 0) { refcount = qcow2_update_cluster_refcount(bs, l2_offset >> s->cluster_bits, addend, QCOW2_DISCARD_SNAPSHOT); + if (addend < 0) { + if (!l1_allocated) { + qcow2_metadata_list_remove(bs, l2_offset, 1, + QCOW2_OL_ACTIVE_L2); + } + } } else { refcount = qcow2_get_refcount(bs, l2_offset >> s->cluster_bits); } diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index 41ea053..d83a939 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -561,6 +561,13 @@ int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id) g_free(sn_l1_table); sn_l1_table = NULL; + for (i = 0; i < s->l1_size; i++) { + uint64_t l2_offset = s->l1_table[i] & L1E_OFFSET_MASK; + if (l2_offset) { + qcow2_metadata_list_enter(bs, l2_offset, 1, QCOW2_OL_ACTIVE_L2); + } + } + /* * Update QCOW_OFLAG_COPIED in the active L1 table (it may have changed * when we decreased the refcount of the old snapshot. @@ -725,6 +732,13 @@ int qcow2_snapshot_load_tmp(BlockDriverState *bs, sizeof(uint64_t)), QCOW2_OL_ACTIVE_L1); + for (i = 0; i < s->l1_size; i++) { + uint64_t l2_offset = s->l1_table[i] & L1E_OFFSET_MASK; + if (l2_offset) { + qcow2_metadata_list_remove(bs, l2_offset, 1, QCOW2_OL_ACTIVE_L2); + } + } + /* Switch the L1 table */ qemu_vfree(s->l1_table); @@ -741,5 +755,12 @@ int qcow2_snapshot_load_tmp(BlockDriverState *bs, sizeof(uint64_t)), QCOW2_OL_ACTIVE_L1); + for (i = 0; i < s->l1_size; i++) { + uint64_t l2_offset = s->l1_table[i] & L1E_OFFSET_MASK; + if (l2_offset) { + qcow2_metadata_list_enter(bs, l2_offset, 1, QCOW2_OL_ACTIVE_L2); + } + } + return 0; } diff --git a/block/qcow2.c b/block/qcow2.c index f285555..8225ca2 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -851,8 +851,14 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, error_setg_errno(errp, -ret, "Could not read L1 table"); goto fail; } - for(i = 0;i < s->l1_size; i++) { + for (i = 0; i < s->l1_size; i++) { + uint64_t l2_offset; + be64_to_cpus(&s->l1_table[i]); + l2_offset = s->l1_table[i] & L1E_OFFSET_MASK; + if (l2_offset) { + qcow2_metadata_list_enter(bs, l2_offset, 1, QCOW2_OL_ACTIVE_L2); + } } } -- 2.1.0