1 files changed, 48 insertions, 17 deletions

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 84dd4a8980c5..60c47b417a4b 100644
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 #include <linux/sched/mm.h>
 #include <linux/log2.h>
+#include <crypto/hash.h>
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"
@@ -42,6 +43,22 @@ const char* btrfs_compress_type2str(enum btrfs_compression_type type)
         return NULL;
 }
 
+bool btrfs_compress_is_valid_type(const char *str, size_t len)
+{
+        int i;
+
+        for (i = 1; i < ARRAY_SIZE(btrfs_compress_types); i++) {
+                size_t comp_len = strlen(btrfs_compress_types[i]);
+
+                if (len < comp_len)
+                        continue;
+
+                if (!strncmp(btrfs_compress_types[i], str, comp_len))
+                        return true;
+        }
+        return false;
+}
+
 static int btrfs_decompress_bio(struct compressed_bio *cb);
 
 static inline int compressed_bio_size(struct btrfs_fs_info *fs_info,
@@ -57,32 +74,37 @@ static int check_compressed_csum(struct btrfs_inode *inode,
                                  struct compressed_bio *cb,
                                  u64 disk_start)
 {
+        struct btrfs_fs_info *fs_info = inode->root->fs_info;
+        SHASH_DESC_ON_STACK(shash, fs_info->csum_shash);
+        const u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);
         int ret;
         struct page *page;
         unsigned long i;
         char *kaddr;
-        u32 csum;
-        u32 *cb_sum = &cb->sums;
+        u8 csum[BTRFS_CSUM_SIZE];
+        u8 *cb_sum = cb->sums;
 
         if (inode->flags & BTRFS_INODE_NODATASUM)
                 return 0;
 
+        shash->tfm = fs_info->csum_shash;
+
         for (i = 0; i < cb->nr_pages; i++) {
                 page = cb->compressed_pages[i];
-                csum = ~(u32)0;
 
+                crypto_shash_init(shash);
                 kaddr = kmap_atomic(page);
-                csum = btrfs_csum_data(kaddr, csum, PAGE_SIZE);
-                btrfs_csum_final(csum, (u8 *)&csum);
+                crypto_shash_update(shash, kaddr, PAGE_SIZE);
                 kunmap_atomic(kaddr);
+                crypto_shash_final(shash, (u8 *)&csum);
 
-                if (csum != *cb_sum) {
-                        btrfs_print_data_csum_error(inode, disk_start, csum,
-                                        *cb_sum, cb->mirror_num);
+                if (memcmp(&csum, cb_sum, csum_size)) {
+                        btrfs_print_data_csum_error(inode, disk_start,
+                                        csum, cb_sum, cb->mirror_num);
                         ret = -EIO;
                         goto fail;
                 }
-                cb_sum++;
+                cb_sum += csum_size;
 
         }
         ret = 0;
@@ -318,7 +340,8 @@ blk_status_t btrfs_submit_compressed_write(struct inode *inode, u64 start,
 
         bdev = fs_info->fs_devices->latest_bdev;
 
-        bio = btrfs_bio_alloc(bdev, first_byte);
+        bio = btrfs_bio_alloc(first_byte);
+        bio_set_dev(bio, bdev);
         bio->bi_opf = REQ_OP_WRITE | write_flags;
         bio->bi_private = cb;
         bio->bi_end_io = end_compressed_bio_write;
@@ -360,7 +383,8 @@ blk_status_t btrfs_submit_compressed_write(struct inode *inode, u64 start,
                                 bio_endio(bio);
                         }
 
-                        bio = btrfs_bio_alloc(bdev, first_byte);
+                        bio = btrfs_bio_alloc(first_byte);
+                        bio_set_dev(bio, bdev);
                         bio->bi_opf = REQ_OP_WRITE | write_flags;
                         bio->bi_private = cb;
                         bio->bi_end_io = end_compressed_bio_write;
@@ -536,7 +560,8 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
         struct extent_map *em;
         blk_status_t ret = BLK_STS_RESOURCE;
         int faili = 0;
-        u32 *sums;
+        const u16 csum_size = btrfs_super_csum_size(fs_info->super_copy);
+        u8 *sums;
 
         em_tree = &BTRFS_I(inode)->extent_tree;
 
@@ -558,7 +583,7 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
         cb->errors = 0;
         cb->inode = inode;
         cb->mirror_num = mirror_num;
-        sums = &cb->sums;
+        sums = cb->sums;
 
         cb->start = em->orig_start;
         em_len = em->len;
@@ -597,7 +622,8 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
         /* include any pages we added in add_ra-bio_pages */
         cb->len = bio->bi_iter.bi_size;
 
-        comp_bio = btrfs_bio_alloc(bdev, cur_disk_byte);
+        comp_bio = btrfs_bio_alloc(cur_disk_byte);
+        bio_set_dev(comp_bio, bdev);
         comp_bio->bi_opf = REQ_OP_READ;
         comp_bio->bi_private = cb;
         comp_bio->bi_end_io = end_compressed_bio_read;
@@ -617,6 +643,8 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
                 page->mapping = NULL;
                 if (submit || bio_add_page(comp_bio, page, PAGE_SIZE, 0) <
                     PAGE_SIZE) {
+                        unsigned int nr_sectors;
+
                         ret = btrfs_bio_wq_end_io(fs_info, comp_bio,
                                                   BTRFS_WQ_ENDIO_DATA);
                         BUG_ON(ret); /* -ENOMEM */
@@ -634,8 +662,10 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
                                                             sums);
                                 BUG_ON(ret); /* -ENOMEM */
                         }
-                        sums += DIV_ROUND_UP(comp_bio->bi_iter.bi_size,
-                                             fs_info->sectorsize);
+
+                        nr_sectors = DIV_ROUND_UP(comp_bio->bi_iter.bi_size,
+                                                  fs_info->sectorsize);
+                        sums += csum_size * nr_sectors;
 
                         ret = btrfs_map_bio(fs_info, comp_bio, mirror_num, 0);
                         if (ret) {
@@ -643,7 +673,8 @@ blk_status_t btrfs_submit_compressed_read(struct inode *inode, struct bio *bio,
                                 bio_endio(comp_bio);
                         }
 
-                        comp_bio = btrfs_bio_alloc(bdev, cur_disk_byte);
+                        comp_bio = btrfs_bio_alloc(cur_disk_byte);
+                        bio_set_dev(comp_bio, bdev);
                         comp_bio->bi_opf = REQ_OP_READ;
                         comp_bio->bi_private = cb;
                         comp_bio->bi_end_io = end_compressed_bio_read;