btrfs: remove on-stack paddrs[] array usage

Since the bs > ps support, we have to handle cases where a data block is
inside several discontiguous pages.

Thus we need a local paddrs[] array to assemble a data block for bs > ps
cases.

However to handle all possible bs/ps combinations, we have to declare
such array using the max block size vs page size, no matter the current
block size and page size.

This adds 128 bytes on-stack memory usage for several call sites, and
also introduced several duplicated helpers to calculate checksum for a
data block:

- btrfs_calculate_block_csum_folio()
- btrfs_calculate_block_csum_pages()
- btrfs_check_block_csum()

The differences are mostly in how the data is passed.
The first one accepts a contiguous paddr range.
The second one accepts an array of paddrs[].
The last one is just a simple wrapper of the first one.

However the most common interface to iterate a data block is through
bio, and we have already converted most callers to use the bio based
interface, e.g. btrfs_bio_data_csum_ok() and btrfs_csum_one_bio_block().

Convert the remaining two call sites to address the remaining paddrs[]
usage:

- btrfs_calculate_block_csum_pages() inside verify_bio_data_sectors()
  This can be switched to btrfs_csum_one_bio_block().

  This removes the 128 bytes on-stack memory usage.

- btrfs_calculate_block_csum_pages() inside verify_one_sector()
  This call site doesn't use on-stack memory for paddrs[], but reuses
  the existing btrfs_raid_bio::bio_paddrs[] or
  btrfs_raid_bio::stripe_paddrs[].

  So implement a local version called calculate_block_csum_paddrs().

Now there is no fixed on-stack paddrs[] usage anymore.

Reviewed-by: Boris Burkov <boris@bur.io>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index e137a99151bd070dc3a67724c16006aad86d80d0..89e5e9c0c904f6b4c5db62a578b2f7b378e91cc8 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -507,12 +507,6 @@ static inline void btrfs_set_inode_mapping_order(struct btrfs_inode *inode)
                                      inode->root->fs_info->block_max_order);
 }
 
-void btrfs_calculate_block_csum_folio(struct btrfs_fs_info *fs_info,
-                                     const phys_addr_t paddr, u8 *dest);
-void btrfs_calculate_block_csum_pages(struct btrfs_fs_info *fs_info,
-                                     const phys_addr_t paddrs[], u8 *dest);
-int btrfs_check_block_csum(struct btrfs_fs_info *fs_info, phys_addr_t paddr, u8 *csum,
-                          const u8 * const csum_expected);
 bool btrfs_bio_data_csum_ok(struct btrfs_bio *bbio, const struct bvec_iter *orig_iter,
                            struct btrfs_device *dev);
 void btrfs_csum_one_bio_block(struct btrfs_fs_info *fs_info, struct bio *bio,

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 11f8aad8601f509b1db0b1a7423fc37c83fd97a7..2967a307d8f066369db2d2a4ff15030c8f6a95ab 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3456,81 +3456,6 @@ int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered)
        return btrfs_finish_one_ordered(ordered);
 }
 
-/*
- * Calculate the checksum of an fs block at physical memory address @paddr,
- * and save the result to @dest.
- *
- * The folio containing @paddr must be large enough to contain a full fs block.
- */
-void btrfs_calculate_block_csum_folio(struct btrfs_fs_info *fs_info,
-                                     const phys_addr_t paddr, u8 *dest)
-{
-       struct folio *folio = page_folio(phys_to_page(paddr));
-       const u32 blocksize = fs_info->sectorsize;
-       const u32 step = min(blocksize, PAGE_SIZE);
-       const u32 nr_steps = blocksize / step;
-       phys_addr_t paddrs[BTRFS_MAX_BLOCKSIZE / PAGE_SIZE];
-
-       /* The full block must be inside the folio. */
-       ASSERT(offset_in_folio(folio, paddr) + blocksize <= folio_size(folio));
-
-       for (int i = 0; i < nr_steps; i++) {
-               u32 pindex = offset_in_folio(folio, paddr + i * step) >> PAGE_SHIFT;
-
-               /*
-                * For bs <= ps cases, we will only run the loop once, so the offset
-                * inside the page will only added to paddrs[0].
-                *
-                * For bs > ps cases, the block must be page aligned, thus offset
-                * inside the page will always be 0.
-                */
-               paddrs[i] = page_to_phys(folio_page(folio, pindex)) + offset_in_page(paddr);
-       }
-       return btrfs_calculate_block_csum_pages(fs_info, paddrs, dest);
-}
-
-/*
- * Calculate the checksum of a fs block backed by multiple noncontiguous pages
- * at @paddrs[] and save the result to @dest.
- *
- * The folio containing @paddr must be large enough to contain a full fs block.
- */
-void btrfs_calculate_block_csum_pages(struct btrfs_fs_info *fs_info,
-                                     const phys_addr_t paddrs[], u8 *dest)
-{
-       const u32 blocksize = fs_info->sectorsize;
-       const u32 step = min(blocksize, PAGE_SIZE);
-       const u32 nr_steps = blocksize / step;
-       struct btrfs_csum_ctx csum;
-
-       btrfs_csum_init(&csum, fs_info->csum_type);
-       for (int i = 0; i < nr_steps; i++) {
-               const phys_addr_t paddr = paddrs[i];
-               void *kaddr;
-
-               ASSERT(offset_in_page(paddr) + step <= PAGE_SIZE);
-               kaddr = kmap_local_page(phys_to_page(paddr)) + offset_in_page(paddr);
-               btrfs_csum_update(&csum, kaddr, step);
-               kunmap_local(kaddr);
-       }
-       btrfs_csum_final(&csum, dest);
-}
-
-/*
- * Verify the checksum for a single sector without any extra action that depend
- * on the type of I/O.
- *
- * @kaddr must be a properly kmapped address.
- */
-int btrfs_check_block_csum(struct btrfs_fs_info *fs_info, phys_addr_t paddr, u8 *csum,
-                          const u8 * const csum_expected)
-{
-       btrfs_calculate_block_csum_folio(fs_info, paddr, csum);
-       if (unlikely(memcmp(csum, csum_expected, fs_info->csum_size) != 0))
-               return -EIO;
-       return 0;
-}
-
 /* Generate data checksum for a single fs block, pointed to by @orig_iter. */
 void btrfs_csum_one_bio_block(struct btrfs_fs_info *fs_info, struct bio *bio,
                              const struct bvec_iter *orig_iter, u8 *csum)

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c
index 1ee52a9dcee36f90578363fb62990c44defda4fb..a5d0ef09d92abbaf32632ab0709fd3da1fff3d7b 100644 (file)
--- a/fs/btrfs/raid56.c
+++ b/fs/btrfs/raid56.c
@@ -1652,12 +1652,7 @@ static void verify_bio_data_sectors(struct btrfs_raid_bio *rbio,
                                    struct bio *bio)
 {
        struct btrfs_fs_info *fs_info = rbio->bioc->fs_info;
-       const u32 step = min(fs_info->sectorsize, PAGE_SIZE);
-       const u32 nr_steps = rbio->sector_nsteps;
        int total_sector_nr = get_bio_sector_nr(rbio, bio);
-       u32 offset = 0;
-       phys_addr_t paddrs[BTRFS_MAX_BLOCKSIZE / PAGE_SIZE];
-       phys_addr_t paddr;
 
        /* No data csum for the whole stripe, no need to verify. */
        if (!rbio->csum_bitmap || !rbio->csum_buf)
@@ -1667,28 +1662,20 @@ static void verify_bio_data_sectors(struct btrfs_raid_bio *rbio,
        if (total_sector_nr >= rbio->nr_data * rbio->stripe_nsectors)
                return;
 
-       btrfs_bio_for_each_block_all(paddr, bio, step) {
+       for (struct bvec_iter iter = init_bvec_iter_for_bio(bio);
+            iter.bi_size;
+            bio_advance_iter(bio, &iter, fs_info->sectorsize), total_sector_nr++) {
                u8 csum_buf[BTRFS_CSUM_SIZE];
                u8 *expected_csum;
 
-               paddrs[(offset / step) % nr_steps] = paddr;
-               offset += step;
-
-               /* Not yet covering the full fs block, continue to the next step. */
-               if (!IS_ALIGNED(offset, fs_info->sectorsize))
-                       continue;
-
                /* No csum for this sector, skip to the next sector. */
-               if (!test_bit(total_sector_nr, rbio->csum_bitmap)) {
-                       total_sector_nr++;
+               if (!test_bit(total_sector_nr, rbio->csum_bitmap))
                        continue;
-               }
 
                expected_csum = rbio->csum_buf + total_sector_nr * fs_info->csum_size;
-               btrfs_calculate_block_csum_pages(fs_info, paddrs, csum_buf);
+               btrfs_csum_one_bio_block(fs_info, bio, &iter, csum_buf);
                if (unlikely(memcmp(csum_buf, expected_csum, fs_info->csum_size) != 0))
                        set_bit(total_sector_nr, rbio->error_bitmap);
-               total_sector_nr++;
        }
 }
 
@@ -1879,6 +1866,27 @@ void raid56_parity_write(struct bio *bio, struct btrfs_io_context *bioc)
        start_async_work(rbio, rmw_rbio_work);
 }
 
+static void calculate_block_csum_paddrs(struct btrfs_fs_info *fs_info,
+                                       const phys_addr_t paddrs[], u8 *dest)
+{
+       const u32 blocksize = fs_info->sectorsize;
+       const u32 step = min(blocksize, PAGE_SIZE);
+       const u32 nr_steps = blocksize / step;
+       struct btrfs_csum_ctx csum;
+
+       btrfs_csum_init(&csum, fs_info->csum_type);
+       for (int i = 0; i < nr_steps; i++) {
+               const phys_addr_t paddr = paddrs[i];
+               void *kaddr;
+
+               ASSERT(offset_in_page(paddr) + step <= PAGE_SIZE);
+               kaddr = kmap_local_page(phys_to_page(paddr)) + offset_in_page(paddr);
+               btrfs_csum_update(&csum, kaddr, step);
+               kunmap_local(kaddr);
+       }
+       btrfs_csum_final(&csum, dest);
+}
+
 static int verify_one_sector(struct btrfs_raid_bio *rbio,
                             int stripe_nr, int sector_nr)
 {
@@ -1906,7 +1914,7 @@ static int verify_one_sector(struct btrfs_raid_bio *rbio,
        csum_expected = rbio->csum_buf +
                        (stripe_nr * rbio->stripe_nsectors + sector_nr) *
                        fs_info->csum_size;
-       btrfs_calculate_block_csum_pages(fs_info, paddrs, csum_buf);
+       calculate_block_csum_paddrs(fs_info, paddrs, csum_buf);
        if (unlikely(memcmp(csum_buf, csum_expected, fs_info->csum_size) != 0))
                return -EIO;
        return 0;