Skip to contentSkip to conversation

fs-ext4-use-try_cmpxchg-in-ext4_update_bh_state.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Feb 3, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: fs/ext4: use try_cmpxchg in ext4_update_bh_state
has been removed from the -mm tree. Its filename was
fs-ext4-use-try_cmpxchg-in-ext4_update_bh_state.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Uros Bizjak <[email protected]>
Subject: fs/ext4: use try_cmpxchg in ext4_update_bh_state
Date: Wed, 2 Nov 2022 08:11:47 +0100

Use try_cmpxchg instead of cmpxchg (*ptr, old, new) == old in ext4_update_bh_state. x86 CMPXCHG instruction returns success in ZF flag, so this change saves a compare after cmpxchg (and related move instruction in front of cmpxchg).

Also, try_cmpxchg implicitly assigns old *ptr value to "old" when cmpxchg fails. There is no need to re-read the value in the loop.

No functional change intended.

---

fs/ext4/inode.c renamed from fs/ext4/inode.c~fs-ext4-use-try_cmpxchg-in-ext4_update_bh_state +2 -3
@@ -786,11 +786,10 @@ static void ext4_update_bh_state(struct
 	 * once we get rid of using bh as a container for mapping information
 	 * to pass to / from get_block functions, this can go away.
 	 */
+	old_state = READ_ONCE(bh->b_state);
 	do {
-		old_state = READ_ONCE(bh->b_state);
 		new_state = (old_state & ~EXT4_MAP_FLAGS) | flags;
-	} while (unlikely(
-		 cmpxchg(&bh->b_state, old_state, new_state) != old_state));
+	} while (unlikely(!try_cmpxchg(&bh->b_state, &old_state, new_state)));
 }
 
 static int _ext4_get_block(struct inode *inode, sector_t iblock,

_

Patches currently in -mm which might be from [email protected] are