btrfs: reduce kmap_atomic time for checksumming

[linux-2.6-block.git] / fs / btrfs / file-item.c

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index 920bf3b4b0ef5e5296d3cec2c2e82a8ab78dc0ac..6fccac9eab969393bb19a93d42e6a62ad3c72bd4 100644 (file)
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -7,6 +7,7 @@
 #include <linux/slab.h>
 #include <linux/pagemap.h>
 #include <linux/highmem.h>
+#include <linux/sched/mm.h>
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"
@@ -427,9 +428,13 @@ blk_status_t btrfs_csum_one_bio(struct inode *inode, struct bio *bio,
        unsigned long this_sum_bytes = 0;
        int i;
        u64 offset;
+       unsigned nofs_flag;
+
+       nofs_flag = memalloc_nofs_save();
+       sums = kvzalloc(btrfs_ordered_sum_size(fs_info, bio->bi_iter.bi_size),
+                      GFP_KERNEL);
+       memalloc_nofs_restore(nofs_flag);
 
-       sums = kzalloc(btrfs_ordered_sum_size(fs_info, bio->bi_iter.bi_size),
-                      GFP_NOFS);
        if (!sums)
                return BLK_STS_RESOURCE;
 
@@ -453,8 +458,6 @@ blk_status_t btrfs_csum_one_bio(struct inode *inode, struct bio *bio,
                        BUG_ON(!ordered); /* Logic error */
                }
 
-               data = kmap_atomic(bvec.bv_page);
-
                nr_sectors = BTRFS_BYTES_TO_BLKS(fs_info,
                                                 bvec.bv_len + fs_info->sectorsize
                                                 - 1);
@@ -464,7 +467,6 @@ blk_status_t btrfs_csum_one_bio(struct inode *inode, struct bio *bio,
                                offset < ordered->file_offset) {
                                unsigned long bytes_left;
 
-                               kunmap_atomic(data);
                                sums->len = this_sum_bytes;
                                this_sum_bytes = 0;
                                btrfs_add_ordered_sum(inode, ordered, sums);
@@ -472,8 +474,10 @@ blk_status_t btrfs_csum_one_bio(struct inode *inode, struct bio *bio,
 
                                bytes_left = bio->bi_iter.bi_size - total_bytes;
 
-                               sums = kzalloc(btrfs_ordered_sum_size(fs_info, bytes_left),
-                                              GFP_NOFS);
+                               nofs_flag = memalloc_nofs_save();
+                               sums = kvzalloc(btrfs_ordered_sum_size(fs_info,
+                                                     bytes_left), GFP_KERNEL);
+                               memalloc_nofs_restore(nofs_flag);
                                BUG_ON(!sums); /* -ENOMEM */
                                sums->len = bytes_left;
                                ordered = btrfs_lookup_ordered_extent(inode,
@@ -482,16 +486,16 @@ blk_status_t btrfs_csum_one_bio(struct inode *inode, struct bio *bio,
                                sums->bytenr = ((u64)bio->bi_iter.bi_sector << 9)
                                        + total_bytes;
                                index = 0;
-
-                               data = kmap_atomic(bvec.bv_page);
                        }
 
                        sums->sums[index] = ~(u32)0;
+                       data = kmap_atomic(bvec.bv_page);
                        sums->sums[index]
                                = btrfs_csum_data(data + bvec.bv_offset
                                                + (i * fs_info->sectorsize),
                                                sums->sums[index],
                                                fs_info->sectorsize);
+                       kunmap_atomic(data);
                        btrfs_csum_final(sums->sums[index],
                                        (char *)(sums->sums + index));
                        index++;
@@ -500,7 +504,6 @@ blk_status_t btrfs_csum_one_bio(struct inode *inode, struct bio *bio,
                        total_bytes += fs_info->sectorsize;
                }
 
-               kunmap_atomic(data);
        }
        this_sum_bytes = 0;
        btrfs_add_ordered_sum(inode, ordered, sums);