Commit 8ddc3197 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David Sterba

btrfs: reduce stack usage for btrfsic_process_written_block

btrfsic_process_written_block() cals btrfsic_process_metablock(),
which has a fairly large stack usage due to the btrfsic_stack_frame
variable. It also calls btrfsic_test_for_metadata(), which now
needs several hundreds of bytes for its SHASH_DESC_ON_STACK().

In some configurations, we end up with both functions on the
same stack, and gcc warns about the excessive stack usage that
might cause the available stack space to run out:

fs/btrfs/check-integrity.c:1743:13: error: stack frame size of 1152 bytes in function 'btrfsic_process_written_block' [-Werror,-Wframe-larger-than=]

Marking both child functions as noinline_for_stack helps because
this guarantees that the large variables are not on the same
stack frame.

Fixes: d5178578 ("btrfs: directly call into crypto framework for checksumming")
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 99fccf33
...@@ -940,7 +940,7 @@ static void btrfsic_stack_frame_free(struct btrfsic_stack_frame *sf) ...@@ -940,7 +940,7 @@ static void btrfsic_stack_frame_free(struct btrfsic_stack_frame *sf)
kfree(sf); kfree(sf);
} }
static int btrfsic_process_metablock( static noinline_for_stack int btrfsic_process_metablock(
struct btrfsic_state *state, struct btrfsic_state *state,
struct btrfsic_block *const first_block, struct btrfsic_block *const first_block,
struct btrfsic_block_data_ctx *const first_block_ctx, struct btrfsic_block_data_ctx *const first_block_ctx,
...@@ -1706,7 +1706,8 @@ static void btrfsic_dump_database(struct btrfsic_state *state) ...@@ -1706,7 +1706,8 @@ static void btrfsic_dump_database(struct btrfsic_state *state)
* Test whether the disk block contains a tree block (leaf or node) * Test whether the disk block contains a tree block (leaf or node)
* (note that this test fails for the super block) * (note that this test fails for the super block)
*/ */
static int btrfsic_test_for_metadata(struct btrfsic_state *state, static noinline_for_stack int btrfsic_test_for_metadata(
struct btrfsic_state *state,
char **datav, unsigned int num_pages) char **datav, unsigned int num_pages)
{ {
struct btrfs_fs_info *fs_info = state->fs_info; struct btrfs_fs_info *fs_info = state->fs_info;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment