Btrfs: improve the performance of the csums lookup

It is very likely that there are several blocks in bio, it is very
inefficient if we get their csums one by one. This patch improves
this problem by getting the csums in batch.

According to the result of the following test, the execute time of
__btrfs_lookup_bio_sums() is down by ~28%(300us -> 217us).

 # dd if=<mnt>/file of=/dev/null bs=1M count=1024

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>

1 files changed, 30 insertions, 19 deletions

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index ad3cd8614d29..18f12aab6ebf 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -177,7 +177,8 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
                                    struct inode *inode, struct bio *bio,
                                    u64 logical_offset, u32 *dst, int dio)
 {
-        u32 sum;
+        u32 sum[16];
+        int len;
         struct bio_vec *bvec = bio->bi_io_vec;
         int bio_index = 0;
         u64 offset = 0;
@@ -186,7 +187,7 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
         u64 disk_bytenr;
         u32 diff;
         u16 csum_size = btrfs_super_csum_size(root->fs_info->super_copy);
-        int ret;
+        int count;
         struct btrfs_path *path;
         struct btrfs_csum_item *item = NULL;
         struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;
@@ -214,10 +215,12 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
         if (dio)
                 offset = logical_offset;
         while (bio_index < bio->bi_vcnt) {
+                len = min_t(int, ARRAY_SIZE(sum), bio->bi_vcnt - bio_index);
                 if (!dio)
                         offset = page_offset(bvec->bv_page) + bvec->bv_offset;
-                ret = btrfs_find_ordered_sum(inode, offset, disk_bytenr, &sum);
-                if (ret == 0)
+                count = btrfs_find_ordered_sum(inode, offset, disk_bytenr, sum,
+                                               len);
+                if (count)
                         goto found;
 
                 if (!item || disk_bytenr < item_start_offset ||
@@ -230,10 +233,8 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
                         item = btrfs_lookup_csum(NULL, root->fs_info->csum_root,
                                                  path, disk_bytenr, 0);
                         if (IS_ERR(item)) {
-                                ret = PTR_ERR(item);
-                                if (ret == -ENOENT || ret == -EFBIG)
-                                        ret = 0;
-                                sum = 0;
+                                count = 1;
+                                sum[0] = 0;
                                 if (BTRFS_I(inode)->root->root_key.objectid ==
                                     BTRFS_DATA_RELOC_TREE_OBJECTID) {
                                         set_extent_bits(io_tree, offset,
@@ -269,19 +270,29 @@ static int __btrfs_lookup_bio_sums(struct btrfs_root *root,
                 diff = disk_bytenr - item_start_offset;
                 diff = diff / root->sectorsize;
                 diff = diff * csum_size;
-
-                read_extent_buffer(path->nodes[0], &sum,
+                count = min_t(int, len, (item_last_offset - disk_bytenr) >>
+                                        inode->i_sb->s_blocksize_bits);
+                read_extent_buffer(path->nodes[0], sum,
                                    ((unsigned long)item) + diff,
-                                   csum_size);
+                                   csum_size * count);
 found:
-                if (dst)
-                        *dst++ = sum;
-                else
-                        set_state_private(io_tree, offset, sum);
-                disk_bytenr += bvec->bv_len;
-                offset += bvec->bv_len;
-                bio_index++;
-                bvec++;
+                if (dst) {
+                        memcpy(dst, sum, count * csum_size);
+                        dst += count;
+                } else {
+                        if (dio)
+                                extent_cache_csums_dio(io_tree, offset, sum,
+                                                       count);
+                        else
+                                extent_cache_csums(io_tree, bio, bio_index, sum,
+                                            count);
+                }
+                while (count--) {
+                        disk_bytenr += bvec->bv_len;
+                        offset += bvec->bv_len;
+                        bio_index++;
+                        bvec++;
+                }
         }
         btrfs_free_path(path);
         return 0;