Skip to content

Commit

Permalink
perf/ring_buffer: Use local_try_cmpxchg in __perf_output_begin
Browse files Browse the repository at this point in the history
Use local_try_cmpxchg instead of local_cmpxchg (*ptr, old, new) == old
in __perf_output_begin.  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.

Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20230708090048.63046-2-ubizjak@gmail.com
  • Loading branch information
Uros Bizjak authored and Peter Zijlstra committed Jul 10, 2023
1 parent d6b4548 commit 1af61ad
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions kernel/events/ring_buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,10 @@ __perf_output_begin(struct perf_output_handle *handle,

perf_output_get_handle(handle);

offset = local_read(&rb->head);
do {
head = offset;
tail = READ_ONCE(rb->user_page->data_tail);
offset = head = local_read(&rb->head);
if (!rb->overwrite) {
if (unlikely(!ring_buffer_has_space(head, tail,
perf_data_size(rb),
Expand All @@ -217,7 +218,7 @@ __perf_output_begin(struct perf_output_handle *handle,
head += size;
else
head -= size;
} while (local_cmpxchg(&rb->head, offset, head) != offset);
} while (!local_try_cmpxchg(&rb->head, &offset, head));

if (backward) {
offset = head;
Expand Down

0 comments on commit 1af61ad

Please sign in to comment.