[Qemu-devel] [PATCH 3/4] qcow2: Align I/O access to l2 table and refcount block.

[Laurent Vivier]

pièce jointe document texte brut
(0003-Align-I-O-access-to-l2-table-and-refcount-block.patch)
When used with O_DIRECT, to align I/O access (memory and offset)
avoids to have to do a read before doing a write at the block-raw
level (to align access at this level).

Signed-off-by: Laurent Vivier <address@hidden>
---
 block-qcow2.c |   40 +++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

Index: qemu/block-qcow2.c
===================================================================
--- qemu.orig/block-qcow2.c     2008-11-06 16:40:54.000000000 +0100
+++ qemu/block-qcow2.c  2008-11-06 16:41:09.000000000 +0100
@@ -255,7 +255,8 @@ static int qcow_open(BlockDriverState *b
         be64_to_cpus(&s->l1_table[i]);
     }
     /* alloc L2 cache */
-    s->l2_cache = qemu_malloc(s->l2_size * L2_CACHE_SIZE * sizeof(uint64_t));
+    s->l2_cache = qemu_memalign(512,
+                                s->l2_size * L2_CACHE_SIZE * sizeof(uint64_t));
     if (!s->l2_cache)
         goto fail;
     s->cluster_cache = qemu_malloc(s->cluster_size);
@@ -865,7 +866,7 @@ static uint64_t alloc_cluster_offset(Blo
                                      int *num)
 {
     BDRVQcowState *s = bs->opaque;
-    int l2_index, ret;
+    int l2_index, ret, aligned_index, aligned_size;
     uint64_t l2_offset, *l2_table, cluster_offset;
     int nb_available, nb_clusters, i, j;
     uint64_t start_sect, current;
@@ -988,11 +989,18 @@ static uint64_t alloc_cluster_offset(Blo
                                              (i << s->cluster_bits)) |
                                              QCOW_OFLAG_COPIED);
 
+    /* l2 table is part of l2_cache
+     * size of l2_cache is s->l2_size * L2_CACHE_SIZE * sizeof(uint64_t)
+     * and s->l2_bits is (s->cluster_bits - 3) = 12 - 3 = 9;
+     * and s->l2_size = 1 << s->l2_bits, so l2_cache is aligned on 512 
boundary.
+     */
+    aligned_index = l2_index & ~63;
+    aligned_size = (l2_index - aligned_index + nb_clusters + 63) & ~63ULL;
+    aligned_size *= sizeof(uint64_t);
     if (bdrv_pwrite(s->hd,
-                    l2_offset + l2_index * sizeof(uint64_t),
-                    l2_table + l2_index,
-                    nb_clusters * sizeof(uint64_t)) !=
-                    nb_clusters * sizeof(uint64_t))
+                    l2_offset + aligned_index * sizeof(uint64_t),
+                    l2_table + aligned_index,
+                    aligned_size) != aligned_size)
         return 0;
 
 out:
@@ -2137,7 +2145,7 @@ static int refcount_init(BlockDriverStat
     BDRVQcowState *s = bs->opaque;
     int ret, refcount_table_size2, i;
 
-    s->refcount_block_cache = qemu_malloc(s->cluster_size);
+    s->refcount_block_cache = qemu_memalign(512, s->cluster_size);
     if (!s->refcount_block_cache)
         goto fail;
     refcount_table_size2 = s->refcount_table_size * sizeof(uint64_t);
@@ -2398,6 +2406,7 @@ static int update_cluster_refcount(Block
     int ret, refcount_table_index, refcount_table_last_index, block_index, 
refcount;
     int nb_block_index;
     int refcount_cache_size;
+    int aligned_index, aligned_size;
 
     if (nb_clusters == 0)
         return 0;
@@ -2454,11 +2463,20 @@ static int update_cluster_refcount(Block
             nb_block_index++;
             nb_clusters--;
         }
+        /*
+         * size of refcount_block_cache is s->cluster_size (4096)
+         * so we can align access on a 512 boundary
+         */
+        aligned_index = block_index & ~((512 >> REFCOUNT_SHIFT) - 1);
+        aligned_size = (block_index - aligned_index + nb_block_index + 
+                        ((512 >> REFCOUNT_SHIFT) - 1)) &
+                        ~((512 >> REFCOUNT_SHIFT) - 1);
+        aligned_size *= sizeof(uint16_t);
         if (bdrv_pwrite(s->hd,
-                        refcount_block_offset + (block_index << 
REFCOUNT_SHIFT),
-                        s->refcount_block_cache + block_index,
-                        nb_block_index * sizeof(uint16_t)) !=
-                        nb_block_index * sizeof(uint16_t))
+                        refcount_block_offset +
+                        (aligned_index << REFCOUNT_SHIFT),
+                        s->refcount_block_cache + aligned_index,
+                        aligned_size) != aligned_size)
             return -EIO;
     }
     return refcount;

--