btrfs: make NOCOW checks for existence of checksums in a range more efficient

Before deciding if we can do a NOCOW write into a range, one of the things
we have to do is check if there are checksum items for that range. We do
that through the btrfs_lookup_csums_list() function, which searches for
checksums and adds them to a list supplied by the caller.

But all we need is to check if there is any checksum, we don't need to
look for all of them and collect them into a list, which requires more
search time in the checksums tree, allocating memory for checksums items
to add to the list, copy checksums from a leaf into those list items,
then free that memory, etc. This is all unnecessary overhead, wasting
mostly CPU time, and perhaps some occasional IO if we need to read from
disk any extent buffers.

So change btrfs_lookup_csums_list() to allow to return immediately in
case it finds any checksum, without the need to add it to a list and read
it from a leaf. This is accomplished by allowing a NULL list parameter and
making the function return 1 if it found any checksum, 0 if it didn't
found any, and a negative value in case of an error.

The following test with fio was used to measure performance:

  $ cat test.sh
  #!/bin/bash

  DEV=/dev/nullb0
  MNT=/mnt/nullb0

  cat <<EOF > /tmp/fio-job.ini
  [global]
  name=fio-rand-write
  filename=$MNT/fio-rand-write
  rw=randwrite
  bssplit=4k/20:8k/20:16k/20:32k/20:64k/20
  direct=1
  numjobs=16
  fallocate=posix
  time_based
  runtime=300

  [file1]
  size=8G
  ioengine=io_uring
  iodepth=16
  EOF

  umount $MNT &> /dev/null
  mkfs.btrfs -f $DEV
  mount -o ssd $DEV $MNT

  fio /tmp/fio-job.ini
  umount $MNT

The test was run on a release kernel (Debian's default kernel config).

The results before this patch:

  WRITE: bw=139MiB/s (146MB/s), 8204KiB/s-9504KiB/s (8401kB/s-9732kB/s), io=17.0GiB (18.3GB), run=125317-125344msec

The results after this patch:

  WRITE: bw=153MiB/s (160MB/s), 9241KiB/s-10.0MiB/s (9463kB/s-10.5MB/s), io=17.0GiB (18.3GB), run=114054-114071msec

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index 231abcc87f63af0433755ced3a1daa20673c342e..1ea1ed44fe4250e4ec9b290019f48ea9c95014aa 100644 (file)
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -457,9 +457,12 @@ blk_status_t btrfs_lookup_bio_sums(struct btrfs_bio *bbio)
  * @start:             Logical address of target checksum range.
  * @end:               End offset (inclusive) of the target checksum range.
  * @list:              List for adding each checksum that was found.
+ *                     Can be NULL in case the caller only wants to check if
+ *                     there any checksums for the range.
  * @nowait:            Indicate if the search must be non-blocking or not.
  *
- * Return < 0 on error and 0 on success.
+ * Return < 0 on error, 0 if no checksums were found, or 1 if checksums were
+ * found.
  */
 int btrfs_lookup_csums_list(struct btrfs_root *root, u64 start, u64 end,
                            struct list_head *list, bool nowait)
@@ -471,6 +474,7 @@ int btrfs_lookup_csums_list(struct btrfs_root *root, u64 start, u64 end,
        struct btrfs_ordered_sum *sums;
        struct btrfs_csum_item *item;
        int ret;
+       bool found_csums = false;
 
        ASSERT(IS_ALIGNED(start, fs_info->sectorsize) &&
               IS_ALIGNED(end + 1, fs_info->sectorsize));
@@ -544,6 +548,10 @@ int btrfs_lookup_csums_list(struct btrfs_root *root, u64 start, u64 end,
                        continue;
                }
 
+               found_csums = true;
+               if (!list)
+                       goto out;
+
                csum_end = min(csum_end, end + 1);
                item = btrfs_item_ptr(path->nodes[0], path->slots[0],
                                      struct btrfs_csum_item);
@@ -575,17 +583,20 @@ int btrfs_lookup_csums_list(struct btrfs_root *root, u64 start, u64 end,
                }
                path->slots[0]++;
        }
-       ret = 0;
 out:
+       btrfs_free_path(path);
        if (ret < 0) {
-               struct btrfs_ordered_sum *tmp_sums;
+               if (list) {
+                       struct btrfs_ordered_sum *tmp_sums;
 
-               list_for_each_entry_safe(sums, tmp_sums, list, list)
-                       kfree(sums);
+                       list_for_each_entry_safe(sums, tmp_sums, list, list)
+                               kfree(sums);
+               }
+
+               return ret;
        }
 
-       btrfs_free_path(path);
-       return ret;
+       return found_csums ? 1 : 0;
 }
 
 /*

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index f4c54596c5c4c79b13c2700d737635e1ac8079d0..99816d5d605bc21b95aa01410ebd031f1ef13767 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1740,23 +1740,9 @@ static noinline int csum_exist_in_range(struct btrfs_fs_info *fs_info,
                                        u64 bytenr, u64 num_bytes, bool nowait)
 {
        struct btrfs_root *csum_root = btrfs_csum_root(fs_info, bytenr);
-       struct btrfs_ordered_sum *sums;
-       int ret;
-       LIST_HEAD(list);
-
-       ret = btrfs_lookup_csums_list(csum_root, bytenr, bytenr + num_bytes - 1,
-                                     &list, nowait);
-       if (ret == 0 && list_empty(&list))
-               return 0;
 
-       while (!list_empty(&list)) {
-               sums = list_entry(list.next, struct btrfs_ordered_sum, list);
-               list_del(&sums->list);
-               kfree(sums);
-       }
-       if (ret < 0)
-               return ret;
-       return 1;
+       return btrfs_lookup_csums_list(csum_root, bytenr, bytenr + num_bytes - 1,
+                                      NULL, nowait);
 }
 
 static int fallback_to_cow(struct btrfs_inode *inode, struct page *locked_page,

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 516c6e4610d704a48c6e98daf31e92b84078c565..ca70b62163d8874710baeb7cab8fc81c50d06b93 100644 (file)
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -4447,7 +4447,7 @@ int btrfs_reloc_clone_csums(struct btrfs_ordered_extent *ordered)
        ret = btrfs_lookup_csums_list(csum_root, disk_bytenr,
                                      disk_bytenr + ordered->num_bytes - 1,
                                      &list, false);
-       if (ret)
+       if (ret < 0)
                return ret;
 
        while (!list_empty(&list)) {

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 079fd0288d9c92611de51b53399c04035fff0b39..201141eb2a8b45f7f9773c7c8be4936203c6e30c 100644 (file)
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -798,8 +798,9 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans,
                        ret = btrfs_lookup_csums_list(root->log_root,
                                                csum_start, csum_end - 1,
                                                &ordered_sums, false);
-                       if (ret)
+                       if (ret < 0)
                                goto out;
+                       ret = 0;
                        /*
                         * Now delete all existing cums in the csum root that
                         * cover our range. We do this because we can have an
@@ -4461,8 +4462,9 @@ static noinline int copy_items(struct btrfs_trans_handle *trans,
                ret = btrfs_lookup_csums_list(csum_root, disk_bytenr,
                                              disk_bytenr + extent_num_bytes - 1,
                                              &ordered_sums, false);
-               if (ret)
+               if (ret < 0)
                        goto out;
+               ret = 0;
 
                list_for_each_entry_safe(sums, sums_next, &ordered_sums, list) {
                        if (!ret)
@@ -4656,8 +4658,9 @@ static int log_extent_csums(struct btrfs_trans_handle *trans,
        ret = btrfs_lookup_csums_list(csum_root, em->block_start + csum_offset,
                                      em->block_start + csum_offset +
                                      csum_len - 1, &ordered_sums, false);
-       if (ret)
+       if (ret < 0)
                return ret;
+       ret = 0;
 
        while (!list_empty(&ordered_sums)) {
                struct btrfs_ordered_sum *sums = list_entry(ordered_sums.next,