btrfs: skip clearing EXTENT_DEFRAG for nocow ordered extents
PATCH 1/1 btrfs: skip clearing EXTENT_DEFRAG for nocow ordered extents
In btrfs_finish_one_ordered(), clear_bits is unconditionally initialized with EXTENT_DEFRAG. For nocow ordered extents this is always a no-op because should_nocow() already forces the COW path when EXTENT_DEFRAG is set, so a nocow ordered extent can never have EXTENT_DEFRAG on its range.
Although harmless, the unconditional btrfs_clear_extent_bit() call still performs a cold rbtree lookup under the io tree spinlock on every nocow write completion. Avoid this by only adding EXTENT_DEFRAG to clear_bits for non-nocow ordered extents, and skip the call entirely when there are no bits to clear.
--- fs/btrfs/inode.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
fs/btrfs/inode.c +7 -3
@@ -3203,7 +3203,7 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)bool freespace_inode;bool truncated = false;bool clear_reserved_extent = true; -unsigned int clear_bits =EXTENT_DEFRAG ; +unsigned int clear_bits =0 ; start = ordered_extent->file_offset; end = start + ordered_extent->num_bytes -1 ;
@@ -3214,6 +3214,9 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent) !test_bit(BTRFS_ORDERED_ENCODED, &ordered_extent->flags)) clear_bits |=EXTENT_DELALLOC_NEW ; +if (!test_bit (BTRFS_ORDERED_NOCOW , &ordered_extent->flags)) + clear_bits |=EXTENT_DEFRAG ; + freespace_inode =btrfs_is_free_space_inode (inode);if (!freespace_inode)btrfs_lockdep_acquire (fs_info, btrfs_ordered_extent);
@@ -3345,8 +3348,9 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent) goto out; } out: -btrfs_clear_extent_bit (&inode->io_tree, start, end, clear_bits, - &cached_state); +if (clear_bits) +btrfs_clear_extent_bit (&inode->io_tree, start, end, clear_bits, + &cached_state);if (trans)btrfs_end_transaction (trans);
Signature · 4 lines
2.43.0 Disclaimer: The contents of this e-mail message and any attachments are confidential and are intended solely for addressee. The information may also be legally privileged. This transmission is sent in trust, for the sole purpose of delivery to the intended recipient. If you have received this transmission in error, any use, reproduction or dissemination of this transmission is strictly prohibited. If you are not the intended recipient, please immediately notify the sender by reply e-mail or phone and delete this message and its attachments, if any.
Quoted 6 lines · Dave Chen
In
btrfs_finish_one_ordered(),clear_bitsis unconditionally initialized withEXTENT_DEFRAG. For nocow ordered extents this is always a no-op becauseshould_nocow()already forces the COW path whenEXTENT_DEFRAGis set, so a nocow ordered extent can never haveEXTENT_DEFRAGon its range.
Quoted 8 lines
Although harmless, the unconditional
btrfs_clear_extent_bit()call still performs a cold rbtree lookup under the io tree spinlock on every nocow write completion. Avoid this by only addingEXTENT_DEFRAGtoclear_bitsfor non-nocow ordered extents, and skip the call entirely when there are no bits to clear.Signed-off-by Dave Chen <[email protected]>Signed-off-by Robbie Ko <[email protected]>
Looks good. Pushed it to the github for-next branch, thanks.
Quoted 45 lines
--- fs/btrfs/inode.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)fs/btrfs/inode.c +7
-4@@ -3203,7 +3203,7 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent)bool freespace_inode;bool truncated = false;bool clear_reserved_extent = true; -unsigned int clear_bits =EXTENT_DEFRAG ; +unsigned int clear_bits =0 ; start = ordered_extent->file_offset; end = start + ordered_extent->num_bytes -1 ;@@ -3214,6 +3214,9 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent) !test_bit(BTRFS_ORDERED_ENCODED, &ordered_extent->flags)) clear_bits |=EXTENT_DELALLOC_NEW ; +if (!test_bit (BTRFS_ORDERED_NOCOW , &ordered_extent->flags)) + clear_bits |=EXTENT_DEFRAG ; + freespace_inode =btrfs_is_free_space_inode (inode);if (!freespace_inode)btrfs_lockdep_acquire (fs_info, btrfs_ordered_extent);@@ -3345,8 +3348,9 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent) goto out; } out: -btrfs_clear_extent_bit (&inode->io_tree, start, end, clear_bits, - &cached_state); +if (clear_bits) +btrfs_clear_extent_bit (&inode->io_tree, start, end, clear_bits, + &cached_state);if (trans)btrfs_end_transaction (trans); --2.43.0
Disclaimer: The contents of this e-mail message and any attachments are confidential and are intended solely for addressee. The information may also be legally privileged. This transmission is sent in trust, for the sole purpose of delivery to the intended recipient. If you have received this transmission in error, any use, reproduction or dissemination of this transmission is strictly prohibited. If you are not the intended recipient, please immediately notify the sender by reply e-mail or phone and delete this message and its attachments, if any.