fs: Use try_cmpxchg() in start_dir_add()
PATCH 1/1 fs: Use try_cmpxchg() in start_dir_add()
Use try_cmpxchg() instead of cmpxchg(*ptr, old, new) == old.
The x86 CMPXCHG instruction returns success in the ZF flag, so this change saves a compare after CMPXCHG (and related move instruction in front of CMPXCHG).
Note that the value from *ptr should be read using READ_ONCE() to prevent the compiler from merging, refetching or reordering the read.
No functional change intended.
--- fs/dcache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/dcache.c +2 -2
@@ -2509,8 +2509,8 @@ static inline unsigned start_dir_add(struct inode *dir) {preempt_disable_nested ();for (;;) { -unsigned n = dir->i_dir_seq; -if (!(n &1 ) &&cmpxchg (&dir->i_dir_seq, n, n +1 ) == n) +unsigned n =READ_ONCE (dir->i_dir_seq); +if (!(n &1 ) &&try_cmpxchg (&dir->i_dir_seq, &n, n +1 ))return n;cpu_relax (); }
Signature · 1 line
2.50.1
Quoted 9 lines · Uros Bizjak
Use
try_cmpxchg()instead ofcmpxchg(*ptr, old, new)== old.The x86 CMPXCHG instruction returns success in the ZF flag, so this change saves a compare after CMPXCHG (and related move instruction in front of CMPXCHG).
Note that the value from *ptr should be read using
READ_ONCE()to prevent the compiler from merging, refetching or reordering the read.
Quoted 6 lines
No functional change intended.
Signed-off-by Uros Bizjak <[email protected]>Cc Alexander Viro <[email protected]>Cc Christian Brauner <[email protected]>Cc Jan Kara <[email protected]>
Looks good. Feel free to add:
Honza
Quoted 22 lines
--- fs/dcache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)fs/dcache.c +2
-2@@ -2509,8 +2509,8 @@ static inline unsigned start_dir_add(struct inode *dir) {preempt_disable_nested ();for (;;) { -unsigned n = dir->i_dir_seq; -if (!(n &1 ) &&cmpxchg (&dir->i_dir_seq, n, n +1 ) == n) +unsigned n =READ_ONCE (dir->i_dir_seq); +if (!(n &1 ) &&try_cmpxchg (&dir->i_dir_seq, &n, n +1 ))return n;cpu_relax (); }Signature · 1 line
2.50.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 10 lines · Uros Bizjak
Use
try_cmpxchg()instead ofcmpxchg(*ptr, old, new)== old.The x86 CMPXCHG instruction returns success in the ZF flag, so this change saves a compare after CMPXCHG (and related move instruction in front of CMPXCHG).
Note that the value from *ptr should be read using
READ_ONCE()to prevent the compiler from merging, refetching or reordering the read.[...]
Applied to the vfs-6.18.misc branch of the vfs/vfs.git tree. Patches in the vfs-6.18.misc branch should appear in linux-next soon.
Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it.
It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated.
Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch.
tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs-6.18.misc
[1/1] fs: Use try_cmpxchg() in start_dir_add()
https://git.kernel.org/vfs/vfs/c/14498ca7e0f1