3 misc patches
cover 3 misc patches
Here are 3 misc patches. First one is an optimsation to prevent issuing discards for reserved but not written extents. The other 2 simply get rid of __btrfs_free_reserved_extent by moving its relevant parts to the two wrappers.
Nikolay Borisov (3):
btrfs: Don't discard unwritten extents
btrfs: Open code __btrfs_free_reserved_extent in
btrfs_free_reserved_extent
btrfs: Rename __btrfs_free_reserved_extent to
btrfs_pin_reserved_extent
fs/btrfs/ctree.h | 4 ++-- fs/btrfs/extent-tree.c | 44 ++++++++++++++++++------------------------ fs/btrfs/inode.c | 7 ++++++- fs/btrfs/tree-log.c | 12 +++++------- 4 files changed, 32 insertions(+), 35 deletions(-)
--
2.17.1
PATCH 1/3 btrfs: Don't discard unwritten extents
All callers of btrfs_free_reserved_extent (respectively __btrfs_free_reserved_extent with in set to 0) pass in extents which have only been reserved but not yet written to. Namely,
* In cow_file_range that function is called only if create_io_em fails or btrfs_add_ordered_extent fail, both of which happen _before_ any IO is submitted to the newly reserved range.
* In submit_compressed_extents the code flow is similar - out_free_reserve can be called only before btrfs_submit_compressed_write which is where any writes to the range could occur.
* btrfs_new_extent_direct also calls btrfs_free_reserved_extent only if extent_map fails, before any IO is issued.
* __btrfs_prealloc_file_range also calls btrfs_free_reserved_extent in case insertion of the metadata fails.
* btrfs_alloc_tree_block again can only be called in case in-memory operations fail, before any IO is submitted.
* btrfs_finish_ordered_io - this is the only caller where discarding the extent could have a material effect, since it can be called for an extent which was partially written.
With this change the submission of discards is optimised since discards are now not being created for extents which are known to not have been touched on disk.
--- fs/btrfs/extent-tree.c | 2 -- fs/btrfs/inode.c | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-)
fs/btrfs/extent-tree.c +0 -2
@@ -4169,8 +4169,6 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,if (ret) goto out; }else { -if (btrfs_test_opt (fs_info,DISCARD )) - ret =btrfs_discard_extent (fs_info, start, len,NULL );btrfs_add_free_space (cache, start, len);btrfs_free_reserved_bytes (cache, len, delalloc);trace_btrfs_reserved_extent_free (fs_info, start, len);
fs/btrfs/inode.c +6 -1
@@ -3250,10 +3250,15 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)if ((ret || !logical_len) && clear_reserved_extent && !test_bit (BTRFS_ORDERED_NOCOW , &ordered_extent->flags) && - !test_bit (BTRFS_ORDERED_PREALLOC , &ordered_extent->flags)) + !test_bit (BTRFS_ORDERED_PREALLOC , &ordered_extent->flags)) {btrfs_free_reserved_extent (fs_info, ordered_extent->start, ordered_extent->disk_len,1 ); +if (ret &&btrfs_test_opt (fs_info,DISCARD )) +btrfs_discard_extent (fs_info, + ordered_extent->start, ordered_extent->disk_len, +NULL ); + } }
Signature · 1 line
2.17.1
Re: [PATCH 1/3] btrfs: Don't discard unwritten extents
Quoted 18 lines · Nikolay Borisov
fs/btrfs/extent-tree.c +0
-2@@ -4169,8 +4169,6 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,if (ret) goto out; }else { -if (btrfs_test_opt (fs_info,DISCARD )) - ret =btrfs_discard_extent (fs_info, start, len,NULL );btrfs_add_free_space (cache, start, len);btrfs_free_reserved_bytes (cache, len, delalloc);trace_btrfs_reserved_extent_free (fs_info, start, len);fs/btrfs/inode.c +0
-0@@ -3250,10 +3250,15 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) if ((ret || !logical_len) && clear_reserved_extent &&
fs/btrfs/inode.c static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) · line 3260
Quoted 10 lines
fs/btrfs/inode.c +5
-1!test_bit(BTRFS_ORDERED_NOCOW, &ordered_extent->flags) && - !test_bit(BTRFS_ORDERED_PREALLOC, &ordered_extent->flags)) + !test_bit(BTRFS_ORDERED_PREALLOC, &ordered_extent->flags)) {btrfs_free_reserved_extent (fs_info, ordered_extent->start, ordered_extent->disk_len,1 ); +if (ret &&btrfs_test_opt (fs_info,DISCARD )) +btrfs_discard_extent (fs_info, + ordered_extent->start, ordered_extent->disk_len, +NULL );
This brings back vague memories of misplaced discard (in finish_ordered_io), that was quite hard to catch. I can't find the fix though. Filipe, is it the same issue?
Re: [PATCH 1/3] btrfs: Don't discard unwritten extents
Quoted 25 lines · David Sterba
Quoted 24 lines · Nikolay Borisov
fs/btrfs/extent-tree.c +0
-2@@ -4169,8 +4169,6 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,if (ret) goto out; }else { -if (btrfs_test_opt (fs_info,DISCARD )) - ret =btrfs_discard_extent (fs_info, start, len,NULL );btrfs_add_free_space (cache, start, len);btrfs_free_reserved_bytes (cache, len, delalloc);trace_btrfs_reserved_extent_free (fs_info, start, len);fs/btrfs/inode.c +1
-1@@ -3250,10 +3250,15 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)if ((ret || !logical_len) && clear_reserved_extent && !test_bit (BTRFS_ORDERED_NOCOW , &ordered_extent->flags) && - !test_bit (BTRFS_ORDERED_PREALLOC , &ordered_extent->flags)) + !test_bit (BTRFS_ORDERED_PREALLOC , &ordered_extent->flags)) {btrfs_free_reserved_extent (fs_info, ordered_extent->start, ordered_extent->disk_len,1 );
Quoted 8 lines
fs/btrfs/inode.c static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) · line 3260
Quoted 4 lines
fs/btrfs/inode.c +4
-0+if (ret &&btrfs_test_opt (fs_info,DISCARD )) +btrfs_discard_extent (fs_info, + ordered_extent->start, ordered_extent->disk_len, +NULL );This brings back vague memories of misplaced discard (in
finish_ordered_io), that was quite hard to catch. I can't find the fix though. Filipe, is it the same issue?
Closest to what I thought are dcc82f4783ad9 "Btrfs: fix log tree corruption when fs mounted with -o discard" or 678886bdc6378 "Btrfs: fix fs corruption on transaction abort if device supports discard".
Re: [PATCH 1/3] btrfs: Don't discard unwritten extents
Quoted 35 lines · David Sterba
Quoted 25 lines · David Sterba
Quoted 24 lines · Nikolay Borisov
fs/btrfs/extent-tree.c +0
-2@@ -4169,8 +4169,6 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,if (ret) goto out; }else { -if (btrfs_test_opt (fs_info,DISCARD )) - ret =btrfs_discard_extent (fs_info, start, len,NULL );btrfs_add_free_space (cache, start, len);btrfs_free_reserved_bytes (cache, len, delalloc);trace_btrfs_reserved_extent_free (fs_info, start, len);fs/btrfs/inode.c +1
-1@@ -3250,10 +3250,15 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)if ((ret || !logical_len) && clear_reserved_extent && !test_bit (BTRFS_ORDERED_NOCOW , &ordered_extent->flags) && - !test_bit (BTRFS_ORDERED_PREALLOC , &ordered_extent->flags)) + !test_bit (BTRFS_ORDERED_PREALLOC , &ordered_extent->flags)) {btrfs_free_reserved_extent (fs_info, ordered_extent->start, ordered_extent->disk_len,1 );Quoted 8 lines
fs/btrfs/inode.c static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) · line 3260
Quoted 4 lines
fs/btrfs/inode.c +4
-0+if (ret &&btrfs_test_opt (fs_info,DISCARD )) +btrfs_discard_extent (fs_info, + ordered_extent->start, ordered_extent->disk_len, +NULL );This brings back vague memories of misplaced discard (in
finish_ordered_io), that was quite hard to catch. I can't find the fix though. Filipe, is it the same issue?
Quoted 4 lines
Closest to what I thought are
dcc82f4783ad9"Btrfs: fix log tree corruption when fs mounted with -o discard" or678886bdc6378"Btrfs: fix fs corruption on transaction abort if device supports discard".
Pinned extents are discarded when btrfs_finish_extent_commit is called from transaction commit. If you look closer you'd see btrfs_Free_Reserved_extent here means we call into __btrfs_Free_Reserved_extent with pin equal to false, so the original code would have gone to the else {} clause where the discard was. By predicating on (ret) I only handle the case where an ordered extent (which only applies to data) is potentially partially written.
Filipe Manana
Reviewed-byRe: [PATCH 1/3] btrfs: Don't discard unwritten extents
In reply to David SterbaQuoted 26 lines · David Sterba
Quoted 24 lines · Nikolay Borisov
fs/btrfs/extent-tree.c +0
-2@@ -4169,8 +4169,6 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,if (ret) goto out; }else { -if (btrfs_test_opt (fs_info,DISCARD )) - ret =btrfs_discard_extent (fs_info, start, len,NULL );btrfs_add_free_space (cache, start, len);btrfs_free_reserved_bytes (cache, len, delalloc);trace_btrfs_reserved_extent_free (fs_info, start, len);fs/btrfs/inode.c +1
-1@@ -3250,10 +3250,15 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)if ((ret || !logical_len) && clear_reserved_extent && !test_bit (BTRFS_ORDERED_NOCOW , &ordered_extent->flags) && - !test_bit (BTRFS_ORDERED_PREALLOC , &ordered_extent->flags)) + !test_bit (BTRFS_ORDERED_PREALLOC , &ordered_extent->flags)) {btrfs_free_reserved_extent (fs_info, ordered_extent->start, ordered_extent->disk_len,1 );
Quoted 8 lines
fs/btrfs/inode.c static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) · line 3260
Quoted 4 lines
fs/btrfs/inode.c +4
-0+if (ret &&btrfs_test_opt (fs_info,DISCARD )) +btrfs_discard_extent (fs_info, + ordered_extent->start, ordered_extent->disk_len, +NULL );This brings back vague memories of misplaced discard (in
finish_ordered_io), that was quite hard to catch. I can't find the fix though. Filipe, is it the same issue?
It's different (as you identified already in another reply). Even though this is rarely hit on a healthy system, it looks fine to me.
thanks
Signature · 3 lines
Filipe David Manana, “Whether you think you can, or you think you can't — you're right.”
PATCH 2/3 btrfs: Open code __btrfs_free_reserved_extent in btrfs_free_reserved_extent
In reply to Nikolay Borisov__btrfs_free_reserved_extent performs 2 entirely different operations depending on whether its 'pin' argument is true or false. This patch lifts the 2nd case (pin is false) into it's sole caller btrfs_free_reserved_extent. No semantics changes.
--- fs/btrfs/extent-tree.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
fs/btrfs/extent-tree.c +16 -12
@@ -4164,17 +4164,7 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,return -ENOSPC ; } -if (pin) { - ret =pin_down_extent (cache, start, len,1 ); -if (ret) - goto out; - }else { -btrfs_add_free_space (cache, start, len); -btrfs_free_reserved_bytes (cache, len, delalloc); -trace_btrfs_reserved_extent_free (fs_info, start, len); - } - -out: + ret =pin_down_extent (cache, start, len,1 );btrfs_put_block_group (cache);return ret; }
@@ -4182,7 +4172,21 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,int btrfs_free_reserved_extent (struct btrfs_fs_info *fs_info,u64 start,u64 len,int delalloc) { -return __btrfs_free_reserved_extent (fs_info, start, len,0 , delalloc); +struct btrfs_block_group *cache; + + cache =btrfs_lookup_block_group (fs_info, start); +if (!cache) { +btrfs_err (fs_info,"Unable to find block group for %llu" , + start); +return -ENOSPC ; + } + +btrfs_add_free_space (cache, start, len); +btrfs_free_reserved_bytes (cache, len, delalloc); +trace_btrfs_reserved_extent_free (fs_info, start, len); + +btrfs_put_block_group (cache); +return 0 ; } int btrfs_free_and_pin_reserved_extent(struct btrfs_fs_info *fs_info,
Signature · 1 line
2.17.1
Re: [PATCH 2/3] btrfs: Open code __btrfs_free_reserved_extent in btrfs_free_reserved_extent
Quoted 34 lines · Nikolay Borisov
__btrfs_free_reserved_extentperforms 2 entirely different operations depending on whether its 'pin' argument is true or false. This patch lifts the 2nd case (pin is false) into it's sole callerbtrfs_free_reserved_extent. No semantics changes.Signed-off-by Nikolay Borisov <[email protected]>--- fs/btrfs/extent-tree.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)fs/btrfs/extent-tree.c +1
-11@@ -4164,17 +4164,7 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,return -ENOSPC ; } -if (pin) { - ret =pin_down_extent (cache, start, len,1 ); -if (ret) - goto out; - }else { -btrfs_add_free_space (cache, start, len); -btrfs_free_reserved_bytes (cache, len, delalloc); -trace_btrfs_reserved_extent_free (fs_info, start, len); - } - -out: + ret =pin_down_extent (cache, start, len,1 );btrfs_put_block_group (cache);return ret; }
fs/btrfs/extent-tree.c static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, · line 4180
Quoted 10 lines
fs/btrfs/extent-tree.c +6
-1@@ -4182,7 +4172,21 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,int btrfs_free_reserved_extent (struct btrfs_fs_info *fs_info,u64 start,u64 len,int delalloc) { -return __btrfs_free_reserved_extent (fs_info, start, len,0 , delalloc); +struct btrfs_block_group *cache; + + cache =btrfs_lookup_block_group (fs_info, start); +if (!cache) { +btrfs_err (fs_info,"Unable to find block group for %llu" , + start);
I think the error message should be either removed or at least hidden under enospc_debug. This has little value to a normal user and also the function can be indirectly called many times, spamming logs.
Re: [PATCH 2/3] btrfs: Open code __btrfs_free_reserved_extent in btrfs_free_reserved_extent
Quoted 41 lines · David Sterba
Quoted 40 lines · Nikolay Borisov
__btrfs_free_reserved_extentperforms 2 entirely different operations depending on whether its 'pin' argument is true or false. This patch lifts the 2nd case (pin is false) into it's sole callerbtrfs_free_reserved_extent. No semantics changes.Signed-off-by Nikolay Borisov <[email protected]>--- fs/btrfs/extent-tree.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)fs/btrfs/extent-tree.c +3
-12@@ -4164,17 +4164,7 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,return -ENOSPC ; } -if (pin) { - ret =pin_down_extent (cache, start, len,1 ); -if (ret) - goto out; - }else { -btrfs_add_free_space (cache, start, len); -btrfs_free_reserved_bytes (cache, len, delalloc); -trace_btrfs_reserved_extent_free (fs_info, start, len); - } - -out: + ret =pin_down_extent (cache, start, len,1 );btrfs_put_block_group (cache);return ret; }@@ -4182,7 +4172,21 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,int btrfs_free_reserved_extent (struct btrfs_fs_info *fs_info,u64 start,u64 len,int delalloc) { -return __btrfs_free_reserved_extent (fs_info, start, len,0 , delalloc); +struct btrfs_block_group *cache; +
Quoted 8 lines
fs/btrfs/extent-tree.c static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, · line 4180
Quoted 4 lines
fs/btrfs/extent-tree.c +4
-0+ cache =btrfs_lookup_block_group (fs_info, start); +if (!cache) { +btrfs_err (fs_info,"Unable to find block group for %llu" , + start);I think the error message should be either removed or at least hidden under
enospc_debug. This has little value to a normal user and also the function can be indirectly called many times, spamming logs.
True but in general this should never happen because if we are freeing an extent then it must have been reserved from a particular block group. So if this triggers then we know something is awfully amiss.
Quoted 1 line
PATCH 3/3 btrfs: Rename __btrfs_free_reserved_extent to btrfs_pin_reserved_extent
In reply to Nikolay Borisov__btrfs_free_reserved_extent now performs the actions of btrfs_free_and_pin_reserved_extent. But this name is a bit of a misnomer , since the extent is not really freed but just pinned. Reflect this in the new name. No semantics changes.
--- fs/btrfs/ctree.h | 4 ++-- fs/btrfs/extent-tree.c | 30 +++++++++++------------------- fs/btrfs/tree-log.c | 12 +++++------- 3 files changed, 18 insertions(+), 28 deletions(-)
fs/btrfs/ctree.h +2 -2
@@ -2445,8 +2445,8 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_ref *ref);int btrfs_free_reserved_extent (struct btrfs_fs_info *fs_info,u64 start,u64 len,int delalloc); -int btrfs_free_and_pin_reserved_extent (struct btrfs_fs_info *fs_info, -u64 start,u64 len); +int btrfs_pin_reserved_extent (struct btrfs_fs_info *fs_info,u64 start, +u64 len);void btrfs_prepare_extent_commit (struct btrfs_fs_info *fs_info);int btrfs_finish_extent_commit (struct btrfs_trans_handle *trans); int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,
fs/btrfs/extent-tree.c +11 -19
@@ -4150,12 +4150,10 @@ int btrfs_reserve_extent(struct btrfs_root *root, u64 ram_bytes,return ret; } -static int __btrfs_free_reserved_extent (struct btrfs_fs_info *fs_info, -u64 start,u64 len, -int pin,int delalloc) +int btrfs_free_reserved_extent (struct btrfs_fs_info *fs_info, +u64 start,u64 len,int delalloc) {struct btrfs_block_group *cache; -int ret =0 ; cache =btrfs_lookup_block_group (fs_info, start);if (!cache) {
@@ -4164,15 +4162,18 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,return -ENOSPC ; } - ret =pin_down_extent (cache, start, len,1 ); +btrfs_add_free_space (cache, start, len); +btrfs_free_reserved_bytes (cache, len, delalloc); +trace_btrfs_reserved_extent_free (fs_info, start, len); +btrfs_put_block_group (cache); -return ret; +return 0 ; } -int btrfs_free_reserved_extent (struct btrfs_fs_info *fs_info, -u64 start,u64 len,int delalloc) +int btrfs_pin_reserved_extent (struct btrfs_fs_info *fs_info,u64 start,u64 len) {struct btrfs_block_group *cache; +int ret =0 ; cache =btrfs_lookup_block_group (fs_info, start);if (!cache) {
@@ -4181,18 +4182,9 @@ int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,return -ENOSPC ; } -btrfs_add_free_space (cache, start, len); -btrfs_free_reserved_bytes (cache, len, delalloc); -trace_btrfs_reserved_extent_free (fs_info, start, len); - + ret =pin_down_extent (cache, start, len,1 );btrfs_put_block_group (cache); -return 0 ; -} - -int btrfs_free_and_pin_reserved_extent (struct btrfs_fs_info *fs_info, -u64 start,u64 len) -{ -return __btrfs_free_reserved_extent (fs_info, start, len,1 ,0 ); +return ret; } static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans,
fs/btrfs/tree-log.c +5 -7
@@ -2731,9 +2731,8 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans,WARN_ON (root_owner !=BTRFS_TREE_LOG_OBJECTID ); - ret =btrfs_free_and_pin_reserved_extent ( - fs_info, bytenr, - blocksize); + ret =btrfs_pin_reserved_extent (fs_info, + bytenr, blocksize);if (ret) {free_extent_buffer (next);return ret;
@@ -2814,8 +2813,7 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans, }WARN_ON (root_owner !=BTRFS_TREE_LOG_OBJECTID ); - ret =btrfs_free_and_pin_reserved_extent ( - fs_info, + ret =btrfs_pin_reserved_extent (fs_info, path->nodes[*level]->start, path->nodes[*level]->len);if (ret)
@@ -2897,8 +2895,8 @@ static int walk_log_tree(struct btrfs_trans_handle *trans,WARN_ON (log->root_key.objectid !=BTRFS_TREE_LOG_OBJECTID ); - ret =btrfs_free_and_pin_reserved_extent (fs_info, - next->start, next->len); + ret =btrfs_pin_reserved_extent (fs_info, next->start, + next->len);if (ret) goto out; }
Signature · 1 line
2.17.1
Re: [PATCH 3/3] btrfs: Rename __btrfs_free_reserved_extent to btrfs_pin_reserved_extent
fs/btrfs/extent-tree.c static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, · line 4167
Quoted 4 lines · Nikolay Borisov
fs/btrfs/extent-tree.c +3
-1- ret =pin_down_extent (cache, start, len,1 ); +btrfs_add_free_space (cache, start, len); +btrfs_free_reserved_bytes (cache, len, delalloc); +trace_btrfs_reserved_extent_free (fs_info, start, len);
Unrelated, this patch is only moving existing code, but btrfs_add_free_space and btrfs_free_reserved_bytes don't have their errors handled. In many other places too.
Quoted 10 lines · Nikolay Borisov
Here are 3 misc patches. First one is an optimsation to prevent issuing discards for reserved but not written extents. The other 2 simply get rid of
__btrfs_free_reserved_extentby moving its relevant parts to the two wrappers.Nikolay Borisov (3):
btrfs: Don't discard unwritten extents
btrfs: Open code__btrfs_free_reserved_extentin
btrfs_free_reserved_extent
btrfs: Rename__btrfs_free_reserved_extentto
btrfs_pin_reserved_extent
Added to misc-next, thanks.