public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] lib/genalloc: use try_cmpxchg in {set,clear}_bits_ll
@ 2023-01-18 15:07 Uros Bizjak
  2023-01-18 21:18 ` Andrew Morton
  0 siblings, 1 reply; 18+ messages in thread
From: Uros Bizjak @ 2023-01-18 15:07 UTC (permalink / raw)
  To: linux-kernel; +Cc: Uros Bizjak, Andrew Morton

Use try_cmpxchg instead of cmpxchg (*ptr, old, new) == old in
{set,clear}_bits_ll.  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.

Note that the value from *ptr should be read using READ_ONCE to prevent
the compiler from merging, refetching or reordering the read.

The patch also declares these two functions inline, to ensure inlining.

No functional change intended.

Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
---
 lib/genalloc.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/genalloc.c b/lib/genalloc.c
index 00fc50d0a640..0c883d6fbd44 100644
--- a/lib/genalloc.c
+++ b/lib/genalloc.c
@@ -40,32 +40,30 @@ static inline size_t chunk_size(const struct gen_pool_chunk *chunk)
 	return chunk->end_addr - chunk->start_addr + 1;
 }
 
-static int set_bits_ll(unsigned long *addr, unsigned long mask_to_set)
+static inline int
+set_bits_ll(unsigned long *addr, unsigned long mask_to_set)
 {
-	unsigned long val, nval;
+	unsigned long val = READ_ONCE(*addr);
 
-	nval = *addr;
 	do {
-		val = nval;
 		if (val & mask_to_set)
 			return -EBUSY;
 		cpu_relax();
-	} while ((nval = cmpxchg(addr, val, val | mask_to_set)) != val);
+	} while (!try_cmpxchg(addr, &val, val | mask_to_set));
 
 	return 0;
 }
 
-static int clear_bits_ll(unsigned long *addr, unsigned long mask_to_clear)
+static inline int
+clear_bits_ll(unsigned long *addr, unsigned long mask_to_clear)
 {
-	unsigned long val, nval;
+	unsigned long val = READ_ONCE(*addr);
 
-	nval = *addr;
 	do {
-		val = nval;
 		if ((val & mask_to_clear) != mask_to_clear)
 			return -EBUSY;
 		cpu_relax();
-	} while ((nval = cmpxchg(addr, val, val & ~mask_to_clear)) != val);
+	} while (!try_cmpxchg(addr, &val, val & ~mask_to_clear));
 
 	return 0;
 }
-- 
2.39.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2023-01-27 19:25 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-18 15:07 [PATCH] lib/genalloc: use try_cmpxchg in {set,clear}_bits_ll Uros Bizjak
2023-01-18 21:18 ` Andrew Morton
2023-01-18 21:47   ` Uros Bizjak
2023-01-18 21:55     ` Uros Bizjak
2023-01-18 22:01       ` Uros Bizjak
2023-01-19 12:47       ` David Laight
2023-01-23 15:04         ` Uros Bizjak
2023-01-23 15:42           ` David Laight
2023-01-23 15:59           ` Mateusz Guzik
2023-01-23 19:36             ` Linus Torvalds
2023-01-24  0:11               ` Mateusz Guzik
2023-01-24  1:51                 ` Linus Torvalds
2023-01-24  6:48                   ` Mateusz Guzik
2023-01-24  8:54                 ` David Laight
2023-01-24 16:58                   ` Linus Torvalds
2023-01-24 17:32                     ` David Laight
2023-01-27  3:54               ` Al Viro
2023-01-27 19:25                 ` Linus Torvalds

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox