Skip to contentSkip to conversation

ring_buffer: Use try_cmpxchg instead of cmpxchg in rb_insert_pages

PATCH New Uros Bizjak 1 participant 1 message Sep 14, 2023

Subsystems (2)
Tracing Tracing ring buffer
lore
Share & tools
lore

Uros Bizjak

author
#0 lore raw

PATCH 1/1 ring_buffer: Use try_cmpxchg instead of cmpxchg in rb_insert_pages

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

No functional change intended.

Cc Steven Rostedt <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Signed-off-by Uros Bizjak <[email protected]>
---
 kernel/trace/ring_buffer.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/trace/ring_buffer.c +4 -4
index a1651edc48d5..3e2a6478425c 100644
@@ -2048,7 +2048,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer)
 	retries = 10;
 	success = false;
 	while (retries--) {
-		struct list_head *head_page, *prev_page, *r;
+		struct list_head *head_page, *prev_page;
 		struct list_head *last_page, *first_page;
 		struct list_head *head_page_with_bit;
 		struct buffer_page *hpage = rb_set_head_page(cpu_buffer);

@@ -2067,9 +2067,9 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer)
 		last_page->next = head_page_with_bit;
 		first_page->prev = prev_page;
 
-		r = cmpxchg(&prev_page->next, head_page_with_bit, first_page);
-
-		if (r == head_page_with_bit) {
+		/* caution: head_page_with_bit gets updated on cmpxchg failure */
+		if (try_cmpxchg(&prev_page->next,
+				&head_page_with_bit, first_page)) {
 			/*
 			 * yay, we replaced the page pointer to our new list,
 			 * now, we just have to update to head page's prev
Signature · 1 line
2.41.0