cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
218e99
From 2a46f74bc62cd8affeb7516d1adf5dd855f3ed5a Mon Sep 17 00:00:00 2001
218e99
From: Paolo Bonzini <pbonzini@redhat.com>
218e99
Date: Fri, 18 Oct 2013 08:14:26 +0200
218e99
Subject: [PATCH 01/81] cow: make reads go at a decent speed
218e99
218e99
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
218e99
Message-id: <1382084091-16636-2-git-send-email-pbonzini@redhat.com>
218e99
Patchwork-id: 54983
218e99
O-Subject: [RHEL 7.0 qemu-kvm PATCH 01/26] cow: make reads go at a decent speed
218e99
Bugzilla: 989646
218e99
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
218e99
RH-Acked-by: Max Reitz <mreitz@redhat.com>
218e99
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
218e99
218e99
Do not do two reads for each sector; load each sector of the bitmap
218e99
and use bitmap operations to process it.
218e99
218e99
Writes are still dog slow!
218e99
218e99
Reviewed-by: Eric Blake <eblake@redhat.com>
218e99
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
218e99
(cherry picked from commit 276cbc7f2fc1bd3810887995dbc9cbb739c975bf)
218e99
---
218e99
 block/cow.c | 54 ++++++++++++++++++++++++++++++++----------------------
218e99
 1 file changed, 32 insertions(+), 22 deletions(-)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 block/cow.c |   54 ++++++++++++++++++++++++++++++++----------------------
218e99
 1 files changed, 32 insertions(+), 22 deletions(-)
218e99
218e99
diff --git a/block/cow.c b/block/cow.c
218e99
index 9f94599..c12088b 100644
218e99
--- a/block/cow.c
218e99
+++ b/block/cow.c
218e99
@@ -126,18 +126,31 @@ static inline int cow_set_bit(BlockDriverState *bs, int64_t bitnum)
218e99
     return 0;
218e99
 }
218e99
 
218e99
-static inline int is_bit_set(BlockDriverState *bs, int64_t bitnum)
218e99
+#define BITS_PER_BITMAP_SECTOR (512 * 8)
218e99
+
218e99
+/* Cannot use bitmap.c on big-endian machines.  */
218e99
+static int cow_test_bit(int64_t bitnum, const uint8_t *bitmap)
218e99
 {
218e99
-    uint64_t offset = sizeof(struct cow_header_v2) + bitnum / 8;
218e99
-    uint8_t bitmap;
218e99
-    int ret;
218e99
+    return (bitmap[bitnum / 8] & (1 << (bitnum & 7))) != 0;
218e99
+}
218e99
 
218e99
-    ret = bdrv_pread(bs->file, offset, &bitmap, sizeof(bitmap));
218e99
-    if (ret < 0) {
218e99
-       return ret;
218e99
+static int cow_find_streak(const uint8_t *bitmap, int value, int start, int nb_sectors)
218e99
+{
218e99
+    int streak_value = value ? 0xFF : 0;
218e99
+    int last = MIN(start + nb_sectors, BITS_PER_BITMAP_SECTOR);
218e99
+    int bitnum = start;
218e99
+    while (bitnum < last) {
218e99
+        if ((bitnum & 7) == 0 && bitmap[bitnum / 8] == streak_value) {
218e99
+            bitnum += 8;
218e99
+            continue;
218e99
+        }
218e99
+        if (cow_test_bit(bitnum, bitmap) == value) {
218e99
+            bitnum++;
218e99
+            continue;
218e99
+        }
218e99
+        break;
218e99
     }
218e99
-
218e99
-    return !!(bitmap & (1 << (bitnum % 8)));
218e99
+    return MIN(bitnum, last) - start;
218e99
 }
218e99
 
218e99
 /* Return true if first block has been changed (ie. current version is
218e99
@@ -146,23 +159,20 @@ static inline int is_bit_set(BlockDriverState *bs, int64_t bitnum)
218e99
 static int coroutine_fn cow_co_is_allocated(BlockDriverState *bs,
218e99
         int64_t sector_num, int nb_sectors, int *num_same)
218e99
 {
218e99
+    int64_t bitnum = sector_num + sizeof(struct cow_header_v2) * 8;
218e99
+    uint64_t offset = (bitnum / 8) & -BDRV_SECTOR_SIZE;
218e99
+    uint8_t bitmap[BDRV_SECTOR_SIZE];
218e99
+    int ret;
218e99
     int changed;
218e99
 
218e99
-    if (nb_sectors == 0) {
218e99
-	*num_same = nb_sectors;
218e99
-	return 0;
218e99
-    }
218e99
-
218e99
-    changed = is_bit_set(bs, sector_num);
218e99
-    if (changed < 0) {
218e99
-        return 0; /* XXX: how to return I/O errors? */
218e99
-    }
218e99
-
218e99
-    for (*num_same = 1; *num_same < nb_sectors; (*num_same)++) {
218e99
-	if (is_bit_set(bs, sector_num + *num_same) != changed)
218e99
-	    break;
218e99
+    ret = bdrv_pread(bs->file, offset, &bitmap, sizeof(bitmap));
218e99
+    if (ret < 0) {
218e99
+        return ret;
218e99
     }
218e99
 
218e99
+    bitnum &= BITS_PER_BITMAP_SECTOR - 1;
218e99
+    changed = cow_test_bit(bitnum, bitmap);
218e99
+    *num_same = cow_find_streak(bitmap, changed, bitnum, nb_sectors);
218e99
     return changed;
218e99
 }
218e99
 
218e99
-- 
218e99
1.7.1
218e99