diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2023-04-13 18:06:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-04-29 09:09:31 +0200 |
| commit | ec570320b09f76d52819e60abdccf372658216b6 (patch) | |
| tree | 84f20c89e91ee82eab626f0d510a63a335149dc5 /scripts/atomic | |
| parent | locking/x86: Define arch_try_cmpxchg_local() (diff) | |
| download | linux-ec570320b09f76d52819e60abdccf372658216b6.tar.xz linux-ec570320b09f76d52819e60abdccf372658216b6.zip | |
locking/atomic: Correct (cmp)xchg() instrumentation
All xchg() and cmpxchg() ops are atomic RMWs, but currently we
instrument these with instrument_atomic_write() rather than
instrument_atomic_read_write(), missing the read aspect.
Similarly, all try_cmpxchg() ops are non-atomic RMWs on *oldp, but we
instrument these accesses with instrument_atomic_write() rather than
instrument_read_write(), missing the read aspect and erroneously marking
these as atomic.
Fix the instrumentation for both points.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lkml.kernel.org/r/20230413160644.490976-1-mark.rutland@arm.com
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'scripts/atomic')
| -rwxr-xr-x | scripts/atomic/gen-atomic-instrumented.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/atomic/gen-atomic-instrumented.sh b/scripts/atomic/gen-atomic-instrumented.sh index c8165e9431bf..d9ffd74f73ca 100755 --- a/scripts/atomic/gen-atomic-instrumented.sh +++ b/scripts/atomic/gen-atomic-instrumented.sh @@ -104,8 +104,8 @@ cat <<EOF EOF [ -n "$kcsan_barrier" ] && printf "\t${kcsan_barrier}; \\\\\n" cat <<EOF - instrument_atomic_write(__ai_ptr, ${mult}sizeof(*__ai_ptr)); \\ - instrument_atomic_write(__ai_oldp, ${mult}sizeof(*__ai_oldp)); \\ + instrument_atomic_read_write(__ai_ptr, ${mult}sizeof(*__ai_ptr)); \\ + instrument_read_write(__ai_oldp, ${mult}sizeof(*__ai_oldp)); \\ arch_${xchg}${order}(__ai_ptr, __ai_oldp, __VA_ARGS__); \\ }) EOF @@ -119,7 +119,7 @@ cat <<EOF EOF [ -n "$kcsan_barrier" ] && printf "\t${kcsan_barrier}; \\\\\n" cat <<EOF - instrument_atomic_write(__ai_ptr, ${mult}sizeof(*__ai_ptr)); \\ + instrument_atomic_read_write(__ai_ptr, ${mult}sizeof(*__ai_ptr)); \\ arch_${xchg}${order}(__ai_ptr, __VA_ARGS__); \\ }) EOF |