btrfs: trivial changes to btree lock functions
cover btrfs: trivial changes to btree lock functions
From: Filipe Manana <[email protected]>
Some trivial changes to btree lock functions. Details in the change logs.
Filipe Manana (2):
btrfs: inline btrfs_tree_lock() and btrfs_tree_read_lock()
btrfs: rename __btrfs_tree_lock() and __btrfs_tree_read_lock()
fs/btrfs/ctree.c | 12 ++++++------ fs/btrfs/extent-tree.c | 2 +- fs/btrfs/locking.c | 16 +++------------- fs/btrfs/locking.h | 18 ++++++++++++++---- 4 files changed, 24 insertions(+), 24 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/2 btrfs: inline btrfs_tree_lock() and btrfs_tree_read_lock()
From: Filipe Manana <[email protected]>
The functions btrfs_tree_lock() and btrfs_tree_read_lock() are very trivial so that can be made inline and avoid call overhead, as they are very often called inside critical sections (when searching a btree for example, attempting to lock a child node/leaf while holding a lock on the parent).
So make them static inline, which even reduces the size of the btrfs module a little bit.
Before this change:
$ size fs/btrfs/btrfs.ko
text data bss dec hex filename
1718786 156276 16920 1891982 1cde8e fs/btrfs/btrfs.koAfter this change:
$ size fs/btrfs/btrfs.ko
text data bss dec hex filename
1718650 156260 16920 1891830 1cddf6 fs/btrfs/btrfs.koRunning fs_mark also showed a tiny improvement with this script:
$ cat test.sh #!/bin/bash
DEV=/dev/nullb0
MNT=/mnt/nullb0
FILES=100000
THREADS=$(nproc --all)
echo "performance" | \
tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor umount $DEV &> /dev/null
mkfs.btrfs -f $DEV
mount $DEV $MNT
OPTS="-S 0 -L 5 -n $FILES -s 0 -t $THREADS -k"
for ((i = 1; i <= $THREADS; i++)); do
OPTS="$OPTS -d $MNT/d$i"
done
fs_mark $OPTS
umount $MNT
Before this change:
FSUse% Count Size Files/sec App Overhead
10 1200000 0 180894.0 10705410
16 2400000 0 228211.4 10765738
23 3600000 0 215969.6 11011072
30 4800000 0 199077.1 11145587
46 6000000 0 176624.1 11658470After this change:
FSUse% Count Size Files/sec App Overhead
10 1200000 0 185312.3 10708377
16 2400000 0 229320.4 10858013
23 3600000 0 217958.7 11006167
30 4800000 0 205122.9 11112899
46 6000000 0 178039.1 11438852--- fs/btrfs/locking.c | 10 ---------- fs/btrfs/locking.h | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 12 deletions(-)
fs/btrfs/locking.c +0 -10
@@ -147,11 +147,6 @@ void __btrfs_tree_read_lock(struct extent_buffer *eb, enum btrfs_lock_nesting netrace_btrfs_tree_read_lock (eb, start_ns); } -void btrfs_tree_read_lock (struct extent_buffer *eb) -{ -__btrfs_tree_read_lock (eb,BTRFS_NESTING_NORMAL ); -} -/* * Try-lock for read. *
@@ -211,11 +206,6 @@ void __btrfs_tree_lock(struct extent_buffer *eb, enum btrfs_lock_nesting nest)trace_btrfs_tree_lock (eb, start_ns); } -void btrfs_tree_lock (struct extent_buffer *eb) -{ -__btrfs_tree_lock (eb,BTRFS_NESTING_NORMAL ); -} -/* * Release the write lock. */
fs/btrfs/locking.h +12 -2
@@ -164,11 +164,21 @@ static_assert(BTRFS_NESTING_MAX <= MAX_LOCKDEP_SUBCLASSES, "too many lock subclasses defined");void __btrfs_tree_lock (struct extent_buffer *eb,enum btrfs_lock_nesting nest); -void btrfs_tree_lock (struct extent_buffer *eb); + +static inline void btrfs_tree_lock (struct extent_buffer *eb) +{ +__btrfs_tree_lock (eb,BTRFS_NESTING_NORMAL ); +} +void btrfs_tree_unlock (struct extent_buffer *eb);void __btrfs_tree_read_lock (struct extent_buffer *eb,enum btrfs_lock_nesting nest); -void btrfs_tree_read_lock (struct extent_buffer *eb); + +static inline void btrfs_tree_read_lock (struct extent_buffer *eb) +{ +__btrfs_tree_read_lock (eb,BTRFS_NESTING_NORMAL ); +} +void btrfs_tree_read_unlock (struct extent_buffer *eb);int btrfs_try_tree_read_lock (struct extent_buffer *eb);int btrfs_try_tree_write_lock (struct extent_buffer *eb);
Signature · 1 line
2.43.0
PATCH 2/2 btrfs: rename __btrfs_tree_lock() and __btrfs_tree_read_lock()
In reply to [email protected]From: Filipe Manana <[email protected]>
The __btrfs_tree_lock() and __btrfs_tree_read_lock() are using a naming with a double underscore prefix, which is specially not proper for exported functions. Rename the double underscore from their name and add the "_nested" prefix.
--- fs/btrfs/ctree.c | 12 ++++++------ fs/btrfs/extent-tree.c | 2 +- fs/btrfs/locking.c | 6 +++--- fs/btrfs/locking.h | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-)
fs/btrfs/ctree.c +6 -6
@@ -1003,7 +1003,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, goto out; } -__btrfs_tree_lock (left,BTRFS_NESTING_LEFT ); +btrfs_tree_lock_nested (left,BTRFS_NESTING_LEFT ); wret =btrfs_cow_block (trans, root, left, parent, pslot -1 , &left,BTRFS_NESTING_LEFT_COW );
@@ -1021,7 +1021,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, goto out; } -__btrfs_tree_lock (right,BTRFS_NESTING_RIGHT ); +btrfs_tree_lock_nested (right,BTRFS_NESTING_RIGHT ); wret =btrfs_cow_block (trans, root, right, parent, pslot +1 , &right,BTRFS_NESTING_RIGHT_COW );
@@ -1205,7 +1205,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,if (IS_ERR (left))return PTR_ERR (left); -__btrfs_tree_lock (left,BTRFS_NESTING_LEFT ); +btrfs_tree_lock_nested (left,BTRFS_NESTING_LEFT ); left_nr =btrfs_header_nritems (left);if (left_nr >=BTRFS_NODEPTRS_PER_BLOCK (fs_info) -1 ) {
@@ -1265,7 +1265,7 @@ static noinline int push_nodes_for_insert(struct btrfs_trans_handle *trans,if (IS_ERR (right))return PTR_ERR (right); -__btrfs_tree_lock (right,BTRFS_NESTING_RIGHT ); +btrfs_tree_lock_nested (right,BTRFS_NESTING_RIGHT ); right_nr =btrfs_header_nritems (right);if (right_nr >=BTRFS_NODEPTRS_PER_BLOCK (fs_info) -1 ) {
@@ -3267,7 +3267,7 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_rootif (IS_ERR (right))return PTR_ERR (right); -__btrfs_tree_lock (right,BTRFS_NESTING_RIGHT ); +btrfs_tree_lock_nested (right,BTRFS_NESTING_RIGHT ); free_space =btrfs_leaf_free_space (right);if (free_space < data_size)
@@ -3483,7 +3483,7 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_rootif (IS_ERR (left))return PTR_ERR (left); -__btrfs_tree_lock (left,BTRFS_NESTING_LEFT ); +btrfs_tree_lock_nested (left,BTRFS_NESTING_LEFT ); free_space =btrfs_leaf_free_space (left);if (free_space < data_size) {
fs/btrfs/extent-tree.c +1 -1
@@ -5093,7 +5093,7 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,*/ btrfs_set_buffer_lockdep_class (lockdep_owner, buf, level); -__btrfs_tree_lock (buf, nest); +btrfs_tree_lock_nested (buf, nest);btrfs_clear_buffer_dirty (trans, buf);clear_bit (EXTENT_BUFFER_STALE , &buf->bflags);clear_bit (EXTENT_BUFFER_ZONED_ZEROOUT , &buf->bflags);
fs/btrfs/locking.c +3 -3
@@ -129,14 +129,14 @@ static void btrfs_set_eb_lock_owner(struct extent_buffer *eb, pid_t owner) { }*/ /* -* __btrfs_tree_read_lock - lock extent buffer for read +* btrfs_tree_read_lock_nested - lock extent buffer for read * @eb: the eb to be locked * @nest: the nesting level to be used for lockdep * * This takes the read lock on the extent buffer, using the specified nesting * level for lockdep purposes. */ -void __btrfs_tree_read_lock (struct extent_buffer *eb,enum btrfs_lock_nesting nest) +void btrfs_tree_read_lock_nested (struct extent_buffer *eb,enum btrfs_lock_nesting nest) {u64 start_ns =0 ;
@@ -193,7 +193,7 @@ void btrfs_tree_read_unlock(struct extent_buffer *eb)* * Returns with the eb->lock write locked. */ -void __btrfs_tree_lock (struct extent_buffer *eb,enum btrfs_lock_nesting nest) +void btrfs_tree_lock_nested (struct extent_buffer *eb,enum btrfs_lock_nesting nest) __acquires(&eb->lock) {u64 start_ns =0 ;
fs/btrfs/locking.h +4 -4
@@ -163,20 +163,20 @@ enum btrfs_lockdep_trans_states {static_assert (BTRFS_NESTING_MAX <=MAX_LOCKDEP_SUBCLASSES ,"too many lock subclasses defined" ); -void __btrfs_tree_lock (struct extent_buffer *eb,enum btrfs_lock_nesting nest); +void btrfs_tree_lock_nested (struct extent_buffer *eb,enum btrfs_lock_nesting nest);static inline void btrfs_tree_lock (struct extent_buffer *eb) { -__btrfs_tree_lock (eb,BTRFS_NESTING_NORMAL ); +btrfs_tree_lock_nested (eb,BTRFS_NESTING_NORMAL ); }void btrfs_tree_unlock (struct extent_buffer *eb); -void __btrfs_tree_read_lock (struct extent_buffer *eb,enum btrfs_lock_nesting nest); +void btrfs_tree_read_lock_nested (struct extent_buffer *eb,enum btrfs_lock_nesting nest);static inline void btrfs_tree_read_lock (struct extent_buffer *eb) { -__btrfs_tree_read_lock (eb,BTRFS_NESTING_NORMAL ); +btrfs_tree_read_lock_nested (eb,BTRFS_NESTING_NORMAL ); }void btrfs_tree_read_unlock (struct extent_buffer *eb);
Signature · 1 line
2.43.0
Quoted 8 lines · On 3/15/24 18:25, [email protected] wrote:
From: Filipe Manana <[email protected]>
Some trivial changes to btree lock functions. Details in the change logs.
Filipe Manana (2):
btrfs: inlinebtrfs_tree_lock()andbtrfs_tree_read_lock()
btrfs: rename__btrfs_tree_lock()and__btrfs_tree_read_lock()
Looks good.
Quoted 6 lines
fs/btrfs/ctree.c | 12 ++++++------ fs/btrfs/extent-tree.c | 2 +- fs/btrfs/locking.c | 16 +++------------- fs/btrfs/locking.h | 18 ++++++++++++++---- 4 files changed, 24 insertions(+), 24 deletions(-)
Looks good,
Quoted 3 lines · 在 2024/3/15 23:25, [email protected] 写道:
From: Filipe Manana <[email protected]>
Some trivial changes to btree lock functions. Details in the change logs.
Thanks,
Qu
Quoted 11 lines
Filipe Manana (2):
btrfs: inlinebtrfs_tree_lock()andbtrfs_tree_read_lock()
btrfs: rename__btrfs_tree_lock()and__btrfs_tree_read_lock()fs/btrfs/ctree.c | 12 ++++++------ fs/btrfs/extent-tree.c | 2 +- fs/btrfs/locking.c | 16 +++------------- fs/btrfs/locking.h | 18 ++++++++++++++---- 4 files changed, 24 insertions(+), 24 deletions(-)