From patchwork Wed Jan 16 16:24:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [RFC, V5, 28/36] qcow2: Do not overwrite existing entries with QCOW_OFLAG_COPIED. From: =?utf-8?q?Beno=C3=AEt_Canet?= X-Patchwork-Id: 212803 Message-Id: <1358353497-5292-29-git-send-email-benoit@irqsave.net> To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Date: Wed, 16 Jan 2013 17:24:49 +0100 In the case of a race condition between two writes a l2 entry can be written without QCOW_OFLAG_COPIED before the first write fill it. This patch simply check if the l2 entry has the correct offset without QCOW_OFLAG_COPIED and do nothing. Signed-off-by: Benoit Canet --- block/qcow2-cluster.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index fedcf57..c016e85 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -763,6 +763,11 @@ int qcow2_alloc_cluster_link_l2(BlockDriverState *bs, QCowL2Meta *m) for (i = 0; i < m->nb_clusters; i++) { uint64_t flags = 0; uint64_t offset = cluster_offset + (i << s->cluster_bits); + + if (be64_to_cpu(l2_table[l2_index + i]) == offset) { + continue; + } + /* if two concurrent writes happen to the same unallocated cluster * each write allocates separate cluster and writes data concurrently. * The first one to complete updates l2 table with pointer to its