| Message ID | 20180110142851.27624-1-dsterba@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jan 10, 2018 at 03:28:51PM +0100, David Sterba wrote: > I've noticed that the updated item checker stack consumption increased > dramatically in 542f5385e20cf97447 ("btrfs: tree-checker: Add checker > for dir item") > > tree-checker.c:check_leaf +552 (176 -> 728) > > The array is 255 bytes long, dynamic allocation would slow down the > sanity checks so it's more reasonable to keep it on-stack. Moving the > variable to the scope of use reduces the stack usage again > > tree-checker.c:check_leaf -264 (728 -> 464) > > Signed-off-by: David Sterba <dsterba@suse.com> Reviewed-by: Josef Bacik <jbacik@fb.com> Thanks, Josef -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2018年01月10日 22:28, David Sterba wrote: > I've noticed that the updated item checker stack consumption increased > dramatically in 542f5385e20cf97447 ("btrfs: tree-checker: Add checker > for dir item") > > tree-checker.c:check_leaf +552 (176 -> 728) > > The array is 255 bytes long, dynamic allocation would slow down the > sanity checks so it's more reasonable to keep it on-stack. Moving the > variable to the scope of use reduces the stack usage again > > tree-checker.c:check_leaf -264 (728 -> 464) > > Signed-off-by: David Sterba <dsterba@suse.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Thanks, Qu > --- > fs/btrfs/tree-checker.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c > index 7c55e3ba5a6c..c3c8d48f6618 100644 > --- a/fs/btrfs/tree-checker.c > +++ b/fs/btrfs/tree-checker.c > @@ -259,7 +259,6 @@ static int check_dir_item(struct btrfs_root *root, > > di = btrfs_item_ptr(leaf, slot, struct btrfs_dir_item); > while (cur < item_size) { > - char namebuf[max(BTRFS_NAME_LEN, XATTR_NAME_MAX)]; > u32 name_len; > u32 data_len; > u32 max_name_len; > @@ -342,6 +341,8 @@ static int check_dir_item(struct btrfs_root *root, > */ > if (key->type == BTRFS_DIR_ITEM_KEY || > key->type == BTRFS_XATTR_ITEM_KEY) { > + char namebuf[max(BTRFS_NAME_LEN, XATTR_NAME_MAX)]; > + > read_extent_buffer(leaf, namebuf, > (unsigned long)(di + 1), name_len); > name_hash = btrfs_name_hash(namebuf, name_len); >
diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c index 7c55e3ba5a6c..c3c8d48f6618 100644 --- a/fs/btrfs/tree-checker.c +++ b/fs/btrfs/tree-checker.c @@ -259,7 +259,6 @@ static int check_dir_item(struct btrfs_root *root, di = btrfs_item_ptr(leaf, slot, struct btrfs_dir_item); while (cur < item_size) { - char namebuf[max(BTRFS_NAME_LEN, XATTR_NAME_MAX)]; u32 name_len; u32 data_len; u32 max_name_len; @@ -342,6 +341,8 @@ static int check_dir_item(struct btrfs_root *root, */ if (key->type == BTRFS_DIR_ITEM_KEY || key->type == BTRFS_XATTR_ITEM_KEY) { + char namebuf[max(BTRFS_NAME_LEN, XATTR_NAME_MAX)]; + read_extent_buffer(leaf, namebuf, (unsigned long)(di + 1), name_len); name_hash = btrfs_name_hash(namebuf, name_len);
I've noticed that the updated item checker stack consumption increased dramatically in 542f5385e20cf97447 ("btrfs: tree-checker: Add checker for dir item") tree-checker.c:check_leaf +552 (176 -> 728) The array is 255 bytes long, dynamic allocation would slow down the sanity checks so it's more reasonable to keep it on-stack. Moving the variable to the scope of use reduces the stack usage again tree-checker.c:check_leaf -264 (728 -> 464) Signed-off-by: David Sterba <dsterba@suse.com> --- fs/btrfs/tree-checker.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)