aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUros Bizjak <ubizjak@gmail.com>2023-08-07 16:51:14 +0200
committerIngo Molnar <mingo@kernel.org>2023-10-03 21:13:23 +0200
commit1ce19bf90bd55bf54f9ed75d594029db63d395b0 (patch)
treed31c6e817c98c5ef749295fb146b1b7e16b0a084
parentMerge tag 'v6.6-rc4' into perf/core, to pick up fixes (diff)
downloadwireguard-linux-1ce19bf90bd55bf54f9ed75d594029db63d395b0.tar.xz
wireguard-linux-1ce19bf90bd55bf54f9ed75d594029db63d395b0.zip
perf/x86/rapl: Stop doing cpu_relax() in the local64_cmpxchg() loop in rapl_event_update()
According to the following commit: f5fe24ef17b5 ("lockref: stop doing cpu_relax in the cmpxchg loop") "On the x86-64 architecture even a failing cmpxchg grants exclusive access to the cacheline, making it preferable to retry the failed op immediately instead of stalling with the pause instruction." Based on the above observation, remove cpu_relax() from the local64_cmpxchg() loop of rapl_event_update(). Signed-off-by: Uros Bizjak <ubizjak@gmail.com> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: "H. Peter Anvin" <hpa@zytor.com> Link: https://lore.kernel.org/r/20230807145134.3176-1-ubizjak@gmail.com
-rw-r--r--arch/x86/events/rapl.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c
index 1579429846cc..e8f53b2590a5 100644
--- a/arch/x86/events/rapl.c
+++ b/arch/x86/events/rapl.c
@@ -184,10 +184,8 @@ again:
rdmsrl(event->hw.event_base, new_raw_count);
if (local64_cmpxchg(&hwc->prev_count, prev_raw_count,
- new_raw_count) != prev_raw_count) {
- cpu_relax();
+ new_raw_count) != prev_raw_count)
goto again;
- }
/*
* Now we have the new raw value and have updated the prev