yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
05bba0
From 1ae5408c46e940c7a993ba59c7e31163d78dd81a Mon Sep 17 00:00:00 2001
05bba0
From: Max Reitz <mreitz@redhat.com>
05bba0
Date: Sat, 13 Jun 2015 16:22:36 +0200
05bba0
Subject: [PATCH 42/42] qcow2: Flush pending discards before allocating cluster
05bba0
05bba0
Message-id: <1434212556-3927-43-git-send-email-mreitz@redhat.com>
05bba0
Patchwork-id: 66061
05bba0
O-Subject: [RHEL-7.2 qemu-kvm PATCH 42/42] qcow2: Flush pending discards before allocating cluster
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
From: Kevin Wolf <kwolf@redhat.com>
05bba0
05bba0
BZ: 1129893
05bba0
05bba0
Before a freed cluster can be reused, pending discards for this cluster
05bba0
must be processed.
05bba0
05bba0
The original assumption was that this was not a problem because discards
05bba0
are only cached during discard/write zeroes operations, which are
05bba0
synchronous so that no concurrent write requests can cause cluster
05bba0
allocations.
05bba0
05bba0
However, the discard/write zeroes operation itself can allocate a new L2
05bba0
table (and it has to in order to put zero flags there), so make sure we
05bba0
can cope with the situation.
05bba0
05bba0
This fixes https://bugs.launchpad.net/bugs/1349972.
05bba0
05bba0
Cc: qemu-stable@nongnu.org
05bba0
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
05bba0
Reviewed-by: Max Reitz <mreitz@redhat.com>
05bba0
(cherry picked from commit ecbda7a22576591a84f44de1be0150faf6001f1c)
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 | 5 +++++
05bba0
 1 file changed, 5 insertions(+)
05bba0
05bba0
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
05bba0
index cee5b1f..848fd31 100644
05bba0
--- a/block/qcow2-refcount.c
05bba0
+++ b/block/qcow2-refcount.c
05bba0
@@ -663,6 +663,11 @@ static int64_t alloc_clusters_noref(BlockDriverState *bs, uint64_t size)
05bba0
     uint64_t i, nb_clusters;
05bba0
     int refcount;
05bba0
 
05bba0
+    /* We can't allocate clusters if they may still be queued for discard. */
05bba0
+    if (s->cache_discards) {
05bba0
+        qcow2_process_discards(bs, 0);
05bba0
+    }
05bba0
+
05bba0
     nb_clusters = size_to_clusters(s, size);
05bba0
 retry:
05bba0
     for(i = 0; i < nb_clusters; i++) {
05bba0
-- 
05bba0
1.8.3.1
05bba0