Skip to contentSkip to conversation

fs/btrfs: Use atomic_try_cmpxchg in free_extent_buffer

PATCH In review Uros Bizjak 3 participants 3 messages Aug 9, 2022 – Aug 18, 2022 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fs/btrfs: Use atomic_try_cmpxchg in free_extent_buffer

Use atomic_try_cmpxchg(ptr, &old, new) instead of atomic_cmpxchg(ptr, old, new) == old in free_extent_buffer. This has two benefits:

- The x86 cmpxchg instruction returns success in the ZF flag, so this change saves a compare after cmpxchg, as well as a related move instruction in the front of cmpxchg.

- atomic_try_cmpxchg implicitly assigns the *ptr value to &old when cmpxchg fails, enabling further code simplifications.

This patch has no functional change.

Cc Chris Mason <[email protected]>
Cc Josef Bacik <[email protected]>
Cc David Sterba <[email protected]>
---
 fs/btrfs/extent_io.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
fs/btrfs/extent_io.c +2 -4
index bfae67c593c5..15ff196cbd6d 100644
@@ -6328,18 +6328,16 @@ static int release_extent_buffer(struct extent_buffer *eb)
 void free_extent_buffer(struct extent_buffer *eb)
 {
 	int refs;
-	int old;
 	if (!eb)
 		return;
 
+	refs = atomic_read(&eb->refs);
 	while (1) {
-		refs = atomic_read(&eb->refs);
 		if ((!test_bit(EXTENT_BUFFER_UNMAPPED, &eb->bflags) && refs <= 3)
 		    || (test_bit(EXTENT_BUFFER_UNMAPPED, &eb->bflags) &&
 			refs == 1))
 			break;
-		old = atomic_cmpxchg(&eb->refs, refs, refs - 1);
-		if (old == refs)
+		if (atomic_try_cmpxchg(&eb->refs, &refs, refs - 1))
 			return;
 	}
 
Signature · 1 line
2.37.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Uros Bizjak

Use atomic_try_cmpxchg(ptr, &old, new) instead of atomic_cmpxchg(ptr, old, new) == old in free_extent_buffer. This has two benefits:

- The x86 cmpxchg instruction returns success in the ZF flag, so this change saves a compare after cmpxchg, as well as a related move instruction in the front of cmpxchg.

- atomic_try_cmpxchg implicitly assigns the *ptr value to &old when cmpxchg fails, enabling further code simplifications.

Quoted 6 lines

This patch has no functional change.

Cc Chris Mason <[email protected]>
Cc Josef Bacik <[email protected]>
Cc David Sterba <[email protected]>
Quoted 32 lines
---
 fs/btrfs/extent_io.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
fs/btrfs/extent_io.c +2 -4
index bfae67c593c5..15ff196cbd6d 100644
@@ -6328,18 +6328,16 @@ static int release_extent_buffer(struct extent_buffer *eb)
 void free_extent_buffer(struct extent_buffer *eb)
 {
 	int refs;
-	int old;
 	if (!eb)
 		return;
 
+	refs = atomic_read(&eb->refs);
 	while (1) {
-		refs = atomic_read(&eb->refs);
 		if ((!test_bit(EXTENT_BUFFER_UNMAPPED, &eb->bflags) && refs <= 3)
 		    || (test_bit(EXTENT_BUFFER_UNMAPPED, &eb->bflags) &&
 			refs == 1))
 			break;
-		old = atomic_cmpxchg(&eb->refs, refs, refs - 1);
-		if (old == refs)
+		if (atomic_try_cmpxchg(&eb->refs, &refs, refs - 1))
 			return;
 	}
 
Signature · 1 line
2.37.1
#2 lore raw
In reply to Uros Bizjak
Quoted 11 lines · Uros Bizjak

Use atomic_try_cmpxchg(ptr, &old, new) instead of atomic_cmpxchg(ptr, old, new) == old in free_extent_buffer. This has two benefits:

- The x86 cmpxchg instruction returns success in the ZF flag, so this change saves a compare after cmpxchg, as well as a related move instruction in the front of cmpxchg.

- atomic_try_cmpxchg implicitly assigns the *ptr value to &old when cmpxchg fails, enabling further code simplifications.

Quoted 6 lines

This patch has no functional change.

Cc Chris Mason <[email protected]>
Cc Josef Bacik <[email protected]>
Cc David Sterba <[email protected]>

It's not in a performance critical code but resulting code is slightly more efficient. Added to misc-next, thanks.