tools/perf: Adopt kernel compiler-context-analysis.h annotations
Subsystems (2)
Ian Rogers
reviewercover tools/perf: Adopt kernel compiler-context-analysis.h annotations
The perf tool previously added Clang thread-safety annotations in tools/perf/util/mutex.h (GUARDED_BY, LOCKABLE, EXCLUSIVE_LOCK_FUNCTION, UNLOCK_FUNCTION, etc.). Since then, the Linux kernel has adopted a unified set of static context analysis macros and attributes in include/linux/compiler-context-analysis.h (context_lock_struct, __guarded_by, __acquires, __releases, __must_hold, etc.).
This series makes tools/include/linux/compiler-context-analysis.h functional by synchronizing it and the required compiler_types.h helpers with the kernel headers, converts tools/perf from its custom mutex.h macros to the kernel-style compiler-context-analysis.h annotations, and expands context analysis coverage across comm, dso/dsos, thread/threads, config, intel-tpebs, env, and maps. In the process, it fixes an unlocked __dsos__add() call in __machine__addnew_vdso(), an unlocked read of tpebs_reader_thread in tpebs_stop(), and adds a read-lock fast path to dsos__findnew_id().
Ian Rogers (10):
compiler-context-analysis: Avoid unused parameter warning in
_context_unsafe_alias()
tools headers compiler: Synchronize compiler_types.h with the kernel
sources
tools headers: Synchronize linux/compiler-context-analysis.h with the
kernel sources
perf mutex: Use kernel style compiler-context-analysis.h annotations perf build: Enable additional Clang thread-safety flags perf comm: Add __guarded_by annotations to struct comm_strs perf dso: Fix unlocked __dsos__add() in vdso and expand lock
annotations
perf thread: Expand context analysis annotations to threads and
namespaces_lock
perf config, intel-tpebs, env: Add __guarded_by and __must_hold
annotations
perf maps: Add context analysis annotations
include/linux/compiler-context-analysis.h | 2 +- .../include/linux/compiler-context-analysis.h | 518 ++++++++++++++++-- tools/include/linux/compiler-gcc.h | 55 +- tools/include/linux/compiler.h | 50 +- tools/include/linux/compiler_types.h | 206 ++++++- tools/perf/Makefile.config | 5 +- tools/perf/builtin-sched.c | 16 +- tools/perf/builtin-top.c | 4 +- tools/perf/check-headers.sh | 1 + tools/perf/tests/dso-data.c | 4 + tools/perf/util/annotate.c | 4 +- tools/perf/util/annotate.h | 8 +- tools/perf/util/bpf-event.h | 5 +- tools/perf/util/comm.c | 10 +- tools/perf/util/config.c | 39 +- tools/perf/util/dso.c | 89 ++- tools/perf/util/dso.h | 12 +- tools/perf/util/dsos.c | 29 +- tools/perf/util/dsos.h | 9 +- tools/perf/util/env.c | 1 + tools/perf/util/env.h | 19 +- tools/perf/util/intel-tpebs.c | 86 ++- tools/perf/util/libbfd.c | 4 +- tools/perf/util/maps.c | 122 +++-- tools/perf/util/mutex.c | 4 +- tools/perf/util/mutex.h | 90 +-- tools/perf/util/rwsem.c | 8 +- tools/perf/util/rwsem.h | 10 +- tools/perf/util/thread.c | 10 +- tools/perf/util/thread.h | 30 +- tools/perf/util/threads.c | 4 + tools/perf/util/threads.h | 6 +- tools/perf/util/vdso.c | 2 +- 33 files changed, 1050 insertions(+), 412 deletions(-)
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
Ian Rogers
reviewerPATCH 1/10 compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias()
_context_unsafe_alias() does not use its parameter 'p', which triggers -Wunused-parameter when building code that enables -Wextra (such as tools/perf, tools/lib/perf, tools/lib/subcmd, and tools/lib/symbol). Explicitly cast 'p' to void to silence the warning, matching __assume_ctx_lock() and __assume_shared_ctx_lock().
--- include/linux/compiler-context-analysis.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/compiler-context-analysis.h +1 -1
@@ -243,7 +243,7 @@* alias as a function argument). */ #define context_unsafe_alias (p) _context_unsafe_alias((void **)&(p)) -static inline void _context_unsafe_alias (void **p) { } +static inline void _context_unsafe_alias (void **p) { (void )p; }/** * token_context_lock() - declare an abstract global context lock instance
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v1 01/10] compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias()
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 8 lines
_context_unsafe_alias()does not use its parameter 'p', which triggers -Wunused-parameter when building code that enables -Wextra (such astools/perf,tools/lib/perf,tools/lib/subcmd, andtools/lib/symbol). Explicitly cast 'p' to void to silence the warning, matching__assume_ctx_lock()and__assume_shared_ctx_lock().Assisted-by Antigravity:gemini-3.1-proSigned-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Bart Van Assche
reviewerRe: [PATCH v1 01/10] compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias()
In reply to Ian RogersQuoted 7 lines · Ian Rogers
_context_unsafe_alias()does not use its parameter 'p', which triggers -Wunused-parameter when building code that enables -Wextra (such astools/perf,tools/lib/perf,tools/lib/subcmd, andtools/lib/symbol). Explicitly cast 'p' to void to silence the warning, matching__assume_ctx_lock()and__assume_shared_ctx_lock().Assisted-by Antigravity:gemini-3.1-pro
I think this should be changed into Gemini 3.1 Pro. I don't think that the "Antigravity" part should occur in the Assisted-by tag.
include/linux/compiler-context-analysis.h line 246
Quoted 10 lines
include/linux/compiler-context-analysis.h +1
-1@@ -243,7 +243,7 @@* alias as a function argument). */ #define context_unsafe_alias (p) _context_unsafe_alias((void **)&(p)) -static inline void _context_unsafe_alias (void **p) { } +static inline void _context_unsafe_alias (void **p) { (void )p; }
Why a void cast instead of __attribute__((unused))?
Bart.
Ian Rogers
reviewerRe: [PATCH v1 01/10] compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias()
Quoted 13 lines · Bart Van Assche
Quoted 7 lines · Ian Rogers
_context_unsafe_alias()does not use its parameter 'p', which triggers -Wunused-parameter when building code that enables -Wextra (such astools/perf,tools/lib/perf,tools/lib/subcmd, andtools/lib/symbol). Explicitly cast 'p' to void to silence the warning, matching__assume_ctx_lock()and__assume_shared_ctx_lock().Assisted-by Antigravity:gemini-3.1-proI think this should be changed into Gemini 3.1 Pro. I don't think that the "Antigravity" part should occur in the Assisted-by tag.
Quoted 12 lines
include/linux/compiler-context-analysis.h line 246
Quoted 10 lines
include/linux/compiler-context-analysis.h +1
-1@@ -243,7 +243,7 @@* alias as a function argument). */ #define context_unsafe_alias (p) _context_unsafe_alias((void **)&(p)) -static inline void _context_unsafe_alias (void **p) { } +static inline void _context_unsafe_alias (void **p) { (void )p; }Why a void cast instead of __attribute__((unused))?
I agree; unfortunately, the macro isn't declared before this header change needs it and I wanted to minimize the change.
Thanks,
Ian
Quoted 1 line
Bart.
Bart Van Assche
reviewerRe: [PATCH v1 01/10] compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias()
Quoted 15 lines · Ian Rogers
Quoted 13 lines · Bart Van Assche
include/linux/compiler-context-analysis.h line 246
Quoted 10 lines · Ian Rogers
include/linux/compiler-context-analysis.h +1
-1@@ -243,7 +243,7 @@* alias as a function argument). */ #define context_unsafe_alias (p) _context_unsafe_alias((void **)&(p)) -static inline void _context_unsafe_alias (void **p) { } +static inline void _context_unsafe_alias (void **p) { (void )p; }Why a void cast instead of __attribute__((unused))?
Quoted 2 lines
I agree; unfortunately, the macro isn't declared before this header change needs it and I wanted to minimize the change.
Hmm ... as far as I know __attribute__() is not a macro.
Thanks,
Bart.
Ian Rogers
reviewerRe: [PATCH v1 01/10] compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias()
Quoted 17 lines · Bart Van Assche
Quoted 15 lines · Ian Rogers
Quoted 13 lines · Bart Van Assche
include/linux/compiler-context-analysis.h line 246
Quoted 10 lines · Ian Rogers
include/linux/compiler-context-analysis.h +1
-1@@ -243,7 +243,7 @@* alias as a function argument). */ #define context_unsafe_alias (p) _context_unsafe_alias((void **)&(p)) -static inline void _context_unsafe_alias (void **p) { } +static inline void _context_unsafe_alias (void **p) { (void )p; }Why a void cast instead of __attribute__((unused))?
Quoted 4 lines
Quoted 2 lines
I agree; unfortunately, the macro isn't declared before this header change needs it and I wanted to minimize the change.
Hmm ... as far as I know
__attribute__()is not a macro.
The kernel use generally comes from the macros in include/linux/compiler_attributes.h. You can see similar unused variable warnings being avoided in the __assume_ctx_lock and __assume_shared_ctx_lock macros declared in this file for the !WARN_CONTEXT_ANALYSIS case.
Thanks,
Ian
Bart Van Assche
reviewerRe: [PATCH v1 01/10] compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias()
In reply to Bart Van AsscheQuoted 5 lines · Bart Van Assche
Quoted 1 line · Ian Rogers
Assisted-by Antigravity:gemini-3.1-proI think this should be changed into Gemini 3.1 Pro. I don't think that the "Antigravity" part should occur in the Assisted-by tag.
Has this feedback been noticed?
Bart.
Ian Rogers
reviewerRe: [PATCH v1 01/10] compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias()
Quoted 9 lines · Bart Van Assche
Quoted 5 lines · Bart Van Assche
Quoted 1 line · Ian Rogers
Assisted-by Antigravity:gemini-3.1-proI think this should be changed into Gemini 3.1 Pro. I don't think that the "Antigravity" part should occur in the Assisted-by tag.
Has this feedback been noticed?
It was noticed but it was clearly wrong. The assisted-by line was expected to be AGENT_NAME:MODEL_VERSION but in:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/Documentation/process/coding-assistants.rst?id=816d9992d9ed434ec52cfbd63080d518e535a41b
it is now requested to just put LLM. I can update this in v3.
Thanks,
Ian
Quoted 1 line
Bart.
Peter Zijlstra
maintainerRe: [PATCH v1 01/10] compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias()
Quoted 9 lines · Ian Rogers
Quoted 8 lines · Bart Van Assche
Quoted 5 lines · Bart Van Assche
Quoted 1 line · Ian Rogers
Assisted-by Antigravity:gemini-3.1-proI think this should be changed into Gemini 3.1 Pro. I don't think that the "Antigravity" part should occur in the Assisted-by tag.
Quoted 6 lines
Quoted 1 line
Has this feedback been noticed?
It was noticed but it was clearly wrong. The assisted-by line was expected to be AGENT_NAME:MODEL_VERSION but in:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/Documentation/process/coding-assistants.rst?id=816d9992d9ed434ec52cfbd63080d518e535a41b
it is now requested to just put LLM. I can update this in v3.
The tag is going away.
Ian Rogers
reviewerPATCH 2/10 tools headers compiler: Synchronize compiler_types.h with the kernel sources
In reply to Ian RogersSynchronize the non-__KERNEL__ sections of tools/include/linux/compiler_types.h and tools/include/linux/compiler-gcc.h with the kernel sources (including ___PASTE/__PASTE, BTF_TYPE_TAG, object-size helpers, asm_goto_output, ASM_INPUT_*, asm_inline, __typeof_unqual__/__unqual_scalar_typeof, __signed_scalar_typeof, __native_word, compiletime_assert, and the __diag pragma helpers required by compiler-context-analysis.h), and remove the duplicated definitions from tools/include/linux/compiler.h.
--- tools/include/linux/compiler-gcc.h | 55 ++++++- tools/include/linux/compiler.h | 50 +------ tools/include/linux/compiler_types.h | 206 ++++++++++++++++++++++++++- 3 files changed, 258 insertions(+), 53 deletions(-)
tools/include/linux/compiler-gcc.h +52 -3
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _TOOLS_LINUX_COMPILER_H_ +#ifndef __LINUX_COMPILER_TYPES_H#error "Please do not include <linux/compiler-gcc.h> directly, include <linux/compiler.h> instead." -#endif +#endif /* __LINUX_COMPILER_TYPES_H */ /* * Common definitions for all gcc versions go here.
@@ -33,10 +33,59 @@#define __packed __attribute__((packed))#endif #ifndef __noreturn -#define __noreturn __attribute__((noreturn)) +#define __noreturn __attribute__((__noreturn__))#endif #ifndef __aligned#define __aligned (x) __attribute__((aligned(x)))#endif #define __printf (a, b) __attribute__((format(printf, a, b)))#define __scanf (a, b) __attribute__((format(scanf, a, b))) + +/* +* Turn individual warnings and errors on and off locally, depending +* on version. +*/ +#define __diag_str1 (s) #s +#define __diag_str (s) __diag_str1(s) + +#ifdef __clang__ +#define __diag_clang (version, severity, s) \ + __diag_clang_ ## version(__diag_clang_ ## severity s) + +/* Severity used in pragma directives */ +#define __diag_clang_ignore ignored +#define __diag_clang_warn warning +#define __diag_clang_error error + +#define __diag (s) _Pragma(__diag_str(clang diagnostic s)) + +#define __diag_clang_all (s) __diag(s) + +#define __diag_ignore_all (option, comment) \ + __diag_clang(all, ignore, option) + +#define CC_HAS_TYPEOF_UNQUAL (__clang_major__ > 19 || (__clang_major__ == 19 && __clang_minor__ > 0)) +#else /* !__clang__ */ +#define __diag_GCC (version, severity, s) \ + __diag_GCC_ ## version(__diag_GCC_ ## severity s) + +/* Severity used in pragma directives */ +#define __diag_GCC_ignore ignored +#define __diag_GCC_warn warning +#define __diag_GCC_error error + +#define __diag (s) _Pragma(__diag_str(GCC diagnostic s)) + +#if GCC_VERSION >=80000 +#define __diag_GCC_8 (s) __diag(s) +#else +#define __diag_GCC_8 (s) +#endif + +#define __diag_GCC_all (s) __diag(s) + +#define __diag_ignore_all (option, comment) \ + __diag(__diag_GCC_ignore option) + +#define CC_HAS_TYPEOF_UNQUAL (__GNUC__ >= 14) +#endif /* __clang__ */
tools/include/linux/compiler.h +3 -47
80 lines not on this page · raw message
tools/include/linux/compiler_types.h +203 -3
236 lines not on this page · raw message
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v1 02/10] tools headers compiler: Synchronize compiler_types.h with the kernel sources
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 11 lines
Synchronize the non-__KERNEL__ sections of
tools/include/linux/compiler_types.handtools/include/linux/compiler-gcc.hwith the kernel sources (including ___PASTE/__PASTE,BTF_TYPE_TAG, object-size helpers,asm_goto_output, ASM_INPUT_*,asm_inline, __typeof_unqual__/__unqual_scalar_typeof,__signed_scalar_typeof,__native_word,compiletime_assert, and the__diagpragma helpers required bycompiler-context-analysis.h), and remove the duplicated definitions fromtools/include/linux/compiler.h.Assisted-by Antigravity:gemini-3.1-proSigned-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
Ian Rogers
reviewerPATCH 3/10 tools headers: Synchronize linux/compiler-context-analysis.h with the kernel sources
In reply to Ian RogersReplace the no-op stub tools/include/linux/compiler-context-analysis.h with the full kernel implementation from include/linux/compiler-context-analysis.h and add it to tools/perf/check-headers.sh so future changes are tracked.
--- .../include/linux/compiler-context-analysis.h | 518 ++++++++++++++++-- tools/perf/check-headers.sh | 1 + 2 files changed, 480 insertions(+), 39 deletions(-)
tools/include/linux/compiler-context-analysis.h +479 -39
@@ -1,42 +1,482 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _TOOLS_LINUX_COMPILER_CONTEXT_ANALYSIS_H -#define _TOOLS_LINUX_COMPILER_CONTEXT_ANALYSIS_H -/* * Macros and attributes for compiler-based static context analysis. -* No-op stubs for tools. -*/ - -#define __guarded_by (...) -#define __pt_guarded_by (...) - -#define context_lock_struct (name, ...) struct __VA_ARGS__ name - -#define __no_context_analysis -#define __context_unsafe (comment) -#define context_unsafe (...) ({ __VA_ARGS__; }) -#define context_unsafe_alias (p) -#define disable_context_analysis () -#define enable_context_analysis () - -#define __must_hold (...) -#define __must_not_hold (...) -#define __acquires (...) -#define __cond_acquires (ret, x) -#define __releases (...) -#define __acquire (x) (void)0 -#define __release (x) (void)0 - -#define __must_hold_shared (...) -#define __acquires_shared (...) -#define __cond_acquires_shared (ret, x) -#define __releases_shared (...) -#define __acquire_shared (x) (void)0 -#define __release_shared (x) (void)0 - -#define __acquire_ret (call, expr) (call) -#define __acquire_shared_ret (call, expr) (call) -#define __acquires_ret -#define __acquires_shared_ret - -#endif /* _TOOLS_LINUX_COMPILER_CONTEXT_ANALYSIS_H */ +*/ + +#ifndef _LINUX_COMPILER_CONTEXT_ANALYSIS_H +#define _LINUX_COMPILER_CONTEXT_ANALYSIS_H + +#if defined(WARN_CONTEXT_ANALYSIS ) && !defined(__CHECKER__) && !defined(__GENKSYMS__) + +/* +* These attributes define new context lock (Clang: capability) types. +* Internal only. +*/ +# define __ctx_lock_type (name) __attribute__((capability(#name))) +# define __reentrant_ctx_lock __attribute__((reentrant_capability)) +# define __acquires_ctx_lock (...) __attribute__((acquire_capability(__VA_ARGS__))) +# define __acquires_shared_ctx_lock (...) __attribute__((acquire_shared_capability(__VA_ARGS__))) +# define __try_acquires_ctx_lock (ret, var) __attribute__((try_acquire_capability(ret, var))) +# define __try_acquires_shared_ctx_lock (ret, var) __attribute__((try_acquire_shared_capability(ret, var))) +# define __releases_ctx_lock (...) __attribute__((release_capability(__VA_ARGS__))) +# define __releases_shared_ctx_lock (...) __attribute__((release_shared_capability(__VA_ARGS__))) +# define __returns_ctx_lock (var) __attribute__((lock_returned(var))) + +/* +* The below are used to annotate code being checked. Internal only. +*/ +# define __excludes_ctx_lock (...) __attribute__((locks_excluded(__VA_ARGS__))) +# define __requires_ctx_lock (...) __attribute__((requires_capability(__VA_ARGS__))) +# define __requires_shared_ctx_lock (...) __attribute__((requires_shared_capability(__VA_ARGS__))) + +/* +* The "assert_capability" attribute is a bit confusingly named. It does not +* generate a check. Instead, it tells the analysis to *assume* the capability +* is held. This is used for augmenting runtime assertions, that can then help +* with patterns beyond the compiler's static reasoning abilities. +*/ +# define __assumes_ctx_lock (...) __attribute__((assert_capability(__VA_ARGS__))) +# define __assumes_shared_ctx_lock (...) __attribute__((assert_shared_capability(__VA_ARGS__))) + +/** +* __guarded_by() - struct member and globals attribute, declares variable +* only accessible within active context +* @...: context lock instance pointer(s) +* +* Declares that the struct member or global variable is only accessible within +* the context entered by the given context lock(s). Read operations on the data +* require shared access to at least one of the context locks, while write +* operations require exclusive access to all listed context locks. +* +* .. code-block:: c +* +* struct some_state { +* spinlock_t lock; +* long counter __guarded_by(&lock); +* }; +* +* struct some_state { +* spinlock_t lock1, lock2; +* long counter __guarded_by(&lock1, &lock2); +* }; +*/ +# define __guarded_by (...) __attribute__((guarded_by(__VA_ARGS__))) + +/** +* __pt_guarded_by() - struct member and globals attribute, declares pointed-to +* data only accessible within active context +* @...: context lock instance pointer(s) +* +* Declares that the data pointed to by the struct member pointer or global +* pointer is only accessible within the context entered by the given context +* lock(s). Read operations on the data require shared access to at least one +* of the context locks, while write operations require exclusive access to all +* listed context locks. +* +* .. code-block:: c +* +* struct some_state { +* spinlock_t lock; +* long *counter __pt_guarded_by(&lock); +* }; +* +* struct some_state { +* spinlock_t lock1, lock2; +* long *counter __pt_guarded_by(&lock1, &lock2); +* }; +*/ +# define __pt_guarded_by (...) __attribute__((pt_guarded_by(__VA_ARGS__))) + +/** +* context_lock_struct() - declare or define a context lock struct +* @name: struct name +* +* Helper to declare or define a struct type that is also a context lock. +* +* .. code-block:: c +* +* context_lock_struct(my_handle) { +* int foo; +* long bar; +* }; +* +* struct some_state { +* ... +* }; +* // ... declared elsewhere ... +* context_lock_struct(some_state); +* +* Note: The implementation defines several helper functions that can acquire +* and release the context lock. +*/ +# define context_lock_struct (name, ...) \ + struct __ctx_lock_type(name) __VA_ARGS__ name; \ + static __always_inline void __acquire_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __no_context_analysis __acquires_ctx_lock(var) { } \ + static __always_inline void __acquire_shared_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __no_context_analysis __acquires_shared_ctx_lock(var) { } \ + static __always_inline bool __try_acquire_ctx_lock(const struct name *var, bool ret) \ + __attribute__((overloadable)) __no_context_analysis __try_acquires_ctx_lock(1, var) \ + { return ret; } \ + static __always_inline bool __try_acquire_shared_ctx_lock(const struct name *var, bool ret) \ + __attribute__((overloadable)) __no_context_analysis __try_acquires_shared_ctx_lock(1, var) \ + { return ret; } \ + static __always_inline void __release_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __no_context_analysis __releases_ctx_lock(var) { } \ + static __always_inline void __release_shared_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __no_context_analysis __releases_shared_ctx_lock(var) { } \ + static __always_inline void __assume_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __assumes_ctx_lock(var) { } \ + static __always_inline void __assume_shared_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __assumes_shared_ctx_lock(var) { } \ + struct name + +/** +* disable_context_analysis() - disables context analysis +* +* Disables context analysis. Must be paired with a later +* enable_context_analysis(). +*/ +# define disable_context_analysis () \ + __diag_push(); \ + __diag_ignore_all("-Wunknown-warning-option", "") \ + __diag_ignore_all("-Wthread-safety", "") \ + __diag_ignore_all("-Wthread-safety-pointer", "") + +/** +* enable_context_analysis() - re-enables context analysis +* +* Re-enables context analysis. Must be paired with a prior +* disable_context_analysis(). +*/ +# define enable_context_analysis () __diag_pop() + +/** +* __no_context_analysis - function attribute, disables context analysis +* +* Function attribute denoting that context analysis is disabled for the +* whole function. Prefer use of `context_unsafe()` where possible. +*/ +# define __no_context_analysis __attribute__((no_thread_safety_analysis)) + +#else /* !WARN_CONTEXT_ANALYSIS */ + +# define __ctx_lock_type (name) +# define __reentrant_ctx_lock +# define __acquires_ctx_lock (...) +# define __acquires_shared_ctx_lock (...) +# define __try_acquires_ctx_lock (ret, var) +# define __try_acquires_shared_ctx_lock (ret, var) +# define __releases_ctx_lock (...) +# define __releases_shared_ctx_lock (...) +# define __assumes_ctx_lock (...) +# define __assumes_shared_ctx_lock (...) +# define __returns_ctx_lock (var) +# define __guarded_by (...) +# define __pt_guarded_by (...) +# define __excludes_ctx_lock (...) +# define __requires_ctx_lock (...) +# define __requires_shared_ctx_lock (...) +# define __acquire_ctx_lock (var) do { } while (0) +# define __acquire_shared_ctx_lock (var) do { } while (0) +# define __try_acquire_ctx_lock (var, ret) (ret) +# define __try_acquire_shared_ctx_lock (var, ret) (ret) +# define __release_ctx_lock (var) do { } while (0) +# define __release_shared_ctx_lock (var) do { } while (0) +# define __assume_ctx_lock (var) do { (void)(var); } while (0) +# define __assume_shared_ctx_lock (var) do { (void)(var); } while (0) +# define context_lock_struct (name, ...) struct __VA_ARGS__ name +# define disable_context_analysis () +# define enable_context_analysis () +# define __no_context_analysis + +#endif /* WARN_CONTEXT_ANALYSIS */ + +/** +* context_unsafe() - disable context checking for contained code +* +* Disables context checking for contained statements or expression. +* +* .. code-block:: c +* +* struct some_data { +* spinlock_t lock; +* int counter __guarded_by(&lock); +* }; +* +* int foo(struct some_data *d) +* { +* // ... +* // other code that is still checked ... +* // ... +* return context_unsafe(d->counter); +* } +*/ +#define context_unsafe (...) \ +({ \ + disable_context_analysis(); \ + __VA_ARGS__; \ + enable_context_analysis() \ +}) + +/** +* __context_unsafe() - function attribute, disable context checking +* @comment: comment explaining why opt-out is safe +* +* Function attribute denoting that context analysis is disabled for the +* whole function. Forces adding an inline comment as argument. +*/ +#define __context_unsafe (comment) __no_context_analysis + +/** +* context_unsafe_alias() - helper to insert a context lock "alias barrier" +* @p: pointer aliasing a context lock or object containing context locks +* +* No-op function that acts as a "context lock alias barrier", where the +* analysis rightfully detects that we're switching aliases, but the switch is +* considered safe but beyond the analysis reasoning abilities. +* +* This should be inserted before the first use of such an alias. +* +* Implementation Note: The compiler ignores aliases that may be reassigned but +* their value cannot be determined (e.g. when passing a non-const pointer to an +* alias as a function argument). +*/ +#define context_unsafe_alias (p) _context_unsafe_alias((void **)&(p)) +static inline void _context_unsafe_alias (void **p) { (void )p; } + +/** +* token_context_lock() - declare an abstract global context lock instance +* @name: token context lock name +* +* Helper that declares an abstract global context lock instance @name, but not +* backed by a real data structure (linker error if accidentally referenced). +* The type name is `__ctx_lock_@name`. +*/ +#define token_context_lock (name, ...) \ + context_lock_struct(__ctx_lock_##name, ##__VA_ARGS__) {}; \ + extern const struct __ctx_lock_##name *name + +/** +* token_context_lock_instance() - declare another instance of a global context lock +* @ctx: token context lock previously declared with token_context_lock() +* @name: name of additional global context lock instance +* +* Helper that declares an additional instance @name of the same token context +* lock class @ctx. This is helpful where multiple related token contexts are +* declared, to allow using the same underlying type (`__ctx_lock_@ctx`) as +* function arguments. +*/ +#define token_context_lock_instance (ctx, name) \ + extern const struct __ctx_lock_##ctx *name + +/* +* Common keywords for static context analysis. +*/ + +/** +* __must_hold() - function attribute, caller must hold exclusive context lock +* +* Function attribute declaring that the caller must hold the given context +* lock instance(s) exclusively. +*/ +#define __must_hold (...) __requires_ctx_lock(__VA_ARGS__) + +/** +* __must_not_hold() - function attribute, caller must not hold context lock +* +* Function attribute declaring that the caller must not hold the given context +* lock instance(s). +*/ +#define __must_not_hold (...) __excludes_ctx_lock(__VA_ARGS__) + +/** +* __acquires() - function attribute, function acquires context lock exclusively +* +* Function attribute declaring that the function acquires the given context +* lock instance(s) exclusively, but does not release them. +*/ +#define __acquires (...) __acquires_ctx_lock(__VA_ARGS__) + +/* +* Clang's analysis does not care precisely about the value, only that it is +* either zero or non-zero. So the __cond_acquires() interface might be +* misleading if we say that @ret is the value returned if acquired. Instead, +* provide symbolic variants which we translate. +*/ +#define __cond_acquires_impl_true (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_false (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_nonzero (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_0 (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_nonnull (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_NULL (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) + +/** +* __cond_acquires() - function attribute, function conditionally +* acquires a context lock exclusively +* @ret: abstract value returned by function if context lock acquired +* @x: context lock instance pointer +* +* Function attribute declaring that the function conditionally acquires the +* given context lock instance @x exclusively, but does not release it. The +* function return value @ret denotes when the context lock is acquired. +* +* @ret may be one of: true, false, nonzero, 0, nonnull, NULL. +*/ +#define __cond_acquires (ret, x) __cond_acquires_impl_##ret(x) + +/** +* __releases() - function attribute, function releases a context lock exclusively +* +* Function attribute declaring that the function releases the given context +* lock instance(s) exclusively. The associated context(s) must be active on +* entry. +*/ +#define __releases (...) __releases_ctx_lock(__VA_ARGS__) + +/* +* Clang's analysis does not care precisely about the value, only that it is +* either zero or non-zero. So the __cond_acquires() interface might be +* misleading if we say that @ret is the value returned if acquired. Instead, +* provide symbolic variants which we translate. +*/ +#define __cond_acquires_impl_not_true (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_not_false (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_not_nonzero (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_not_0 (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_not_nonnull (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_not_NULL (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) + +/** +* __cond_releases() - function attribute, function conditionally +* releases a context lock exclusively +* @ret: abstract value returned by function if context lock releases +* @x: context lock instance pointer +* +* Function attribute declaring that the function conditionally releases the +* given context lock instance @x exclusively. The associated context(s) must +* be active on entry. The function return value @ret denotes when the context +* lock is released. +* +* @ret may be one of: true, false, nonzero, 0, nonnull, NULL. +* +* NOTE: clang does not have a native attribute for this; instead implement +* it as an unconditional release and a conditional acquire for the +* inverted condition -- which is semantically equivalent. +*/ +#define __cond_releases (ret, x) __releases(x) __cond_acquires_impl_not_##ret(x) + +/** +* __acquire() - function to acquire context lock exclusively +* @x: context lock instance pointer +* +* No-op function that acquires the given context lock instance @x exclusively. +*/ +#define __acquire (x) __acquire_ctx_lock(x) + +/** +* __release() - function to release context lock exclusively +* @x: context lock instance pointer +* +* No-op function that releases the given context lock instance @x. +*/ +#define __release (x) __release_ctx_lock(x) + +/** +* __must_hold_shared() - function attribute, caller must hold shared context lock +* +* Function attribute declaring that the caller must hold the given context +* lock instance(s) with shared access. +*/ +#define __must_hold_shared (...) __requires_shared_ctx_lock(__VA_ARGS__) + +/** +* __acquires_shared() - function attribute, function acquires context lock shared +* +* Function attribute declaring that the function acquires the given +* context lock instance(s) with shared access, but does not release them. +*/ +#define __acquires_shared (...) __acquires_shared_ctx_lock(__VA_ARGS__) + +/** +* __cond_acquires_shared() - function attribute, function conditionally +* acquires a context lock shared +* @ret: abstract value returned by function if context lock acquired +* @x: context lock instance pointer +* +* Function attribute declaring that the function conditionally acquires the +* given context lock instance @x with shared access, but does not release it. +* The function return value @ret denotes when the context lock is acquired. +* +* @ret may be one of: true, false, nonzero, 0, nonnull, NULL. +*/ +#define __cond_acquires_shared (ret, x) __cond_acquires_impl_##ret(x, _shared) + +/** +* __releases_shared() - function attribute, function releases a +* context lock shared +* +* Function attribute declaring that the function releases the given context +* lock instance(s) with shared access. The associated context(s) must be +* active on entry. +*/ +#define __releases_shared (...) __releases_shared_ctx_lock(__VA_ARGS__) + +/** +* __acquire_shared() - function to acquire context lock shared +* @x: context lock instance pointer +* +* No-op function that acquires the given context lock instance @x with shared +* access. +*/ +#define __acquire_shared (x) __acquire_shared_ctx_lock(x) + +/** +* __release_shared() - function to release context lock shared +* @x: context lock instance pointer +* +* No-op function that releases the given context lock instance @x with shared +* access. +*/ +#define __release_shared (x) __release_shared_ctx_lock(x) + +/** +* __acquire_ret() - helper to acquire context lock of return value +* @call: call expression +* @ret_expr: acquire expression that uses __ret +*/ +#define __acquire_ret (call, ret_expr) \ + ({ \ + __auto_type __ret = call; \ + __acquire(ret_expr); \ + __ret; \ + }) + +/** +* __acquire_shared_ret() - helper to acquire context lock shared of return value +* @call: call expression +* @ret_expr: acquire shared expression that uses __ret +*/ +#define __acquire_shared_ret (call, ret_expr) \ + ({ \ + __auto_type __ret = call; \ + __acquire_shared(ret_expr); \ + __ret; \ + }) + +/* +* Attributes to mark functions returning acquired context locks. +* +* This is purely cosmetic to help readability, and should be used with the +* above macros as follows: +* +* struct foo { spinlock_t lock; ... }; +* ... +* #define myfunc(...) __acquire_ret(_myfunc(__VA_ARGS__), &__ret->lock) +* struct foo *_myfunc(int bar) __acquires_ret; +* ... +*/ +#define __acquires_ret __no_context_analysis +#define __acquires_shared_ret __no_context_analysis + +#endif /* _LINUX_COMPILER_CONTEXT_ANALYSIS_H */
tools/perf/check-headers.sh +1 -0
@@ -23,6 +23,7 @@ declare -a FILES=( "include/linux/bits.h" "include/vdso/bits.h" "include/linux/cfi_types.h" + "include/linux/compiler-context-analysis.h" "include/linux/const.h" "include/vdso/const.h" "include/vdso/unaligned.h"
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v1 03/10] tools headers: Synchronize linux/compiler-context-analysis.h with the kernel sources
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 7 lines
Replace the no-op stub
tools/include/linux/compiler-context-analysis.hwith the full kernel implementation frominclude/linux/compiler-context-analysis.hand add it totools/perf/check-headers.shso future changes are tracked.Assisted-by Antigravity:gemini-3.1-proSigned-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
Ian Rogers
reviewerPATCH 4/10 perf mutex: Use kernel style compiler-context-analysis.h annotations
In reply to Ian RogersEnable -DWARN_CONTEXT_ANALYSIS alongside -Wthread-safety for Clang builds in tools/perf/Makefile.config, replace the custom lock safety macros in tools/perf with the kernel's compiler-context-analysis.h annotations (context_lock_struct, __guarded_by, __acquires, __acquires_shared, __releases, __releases_shared, __cond_acquires, __must_hold, __must_hold_shared, __must_not_hold, __returns_ctx_lock, __no_context_analysis, and __context_unsafe), and remove the redundant macro definitions from tools/perf/util/mutex.h.
--- tools/perf/Makefile.config | 2 +- tools/perf/builtin-sched.c | 16 +++---- tools/perf/builtin-top.c | 4 +- tools/perf/util/annotate.c | 4 +- tools/perf/util/annotate.h | 8 ++-- tools/perf/util/comm.c | 4 +- tools/perf/util/dso.c | 26 +++++----- tools/perf/util/dso.h | 8 ++-- tools/perf/util/dsos.c | 6 +-- tools/perf/util/intel-tpebs.c | 6 +-- tools/perf/util/libbfd.c | 4 +- tools/perf/util/mutex.c | 4 +- tools/perf/util/mutex.h | 90 +++-------------------------------- tools/perf/util/rwsem.c | 8 ++-- tools/perf/util/rwsem.h | 10 ++-- tools/perf/util/thread.c | 8 ++-- tools/perf/util/thread.h | 2 +- 17 files changed, 66 insertions(+), 144 deletions(-)
tools/perf/Makefile.config +1 -1
@@ -64,7 +64,7 @@ ifeq ($(CC_NO_CLANG), 0) endif # Enabled Wthread-safety analysis for clang builds. - CFLAGS += -Wthread-safety + CFLAGS += -Wthread-safety -DWARN_CONTEXT_ANALYSIS endif include $(srctree)/tools/scripts/Makefile.arch
tools/perf/builtin-sched.c +8 -8
@@ -828,8 +828,8 @@ static void *thread_func(void *ctx) }static void create_tasks (struct perf_sched *sched) - EXCLUSIVE_LOCK_FUNCTION(sched->start_work_mutex) - EXCLUSIVE_LOCK_FUNCTION(sched->work_done_wait_mutex) + __acquires(&sched->start_work_mutex) + __acquires(&sched->work_done_wait_mutex) {struct task_desc *task;pthread_attr_t attr;
@@ -858,8 +858,8 @@ static void create_tasks(struct perf_sched *sched) }static void destroy_tasks (struct perf_sched *sched) - UNLOCK_FUNCTION(sched->start_work_mutex) - UNLOCK_FUNCTION(sched->work_done_wait_mutex) + __releases(&sched->start_work_mutex) + __releases(&sched->work_done_wait_mutex) {struct task_desc *task;unsigned long i;
@@ -878,8 +878,8 @@ static void destroy_tasks(struct perf_sched *sched) }static void wait_for_tasks (struct perf_sched *sched) - EXCLUSIVE_LOCKS_REQUIRED(sched->work_done_wait_mutex) - EXCLUSIVE_LOCKS_REQUIRED(sched->start_work_mutex) + __must_hold(&sched->work_done_wait_mutex) + __must_hold(&sched->start_work_mutex) {u64 cpu_usage_0, cpu_usage_1;struct task_desc *task;
@@ -930,8 +930,8 @@ static void wait_for_tasks(struct perf_sched *sched) }static void run_one_test (struct perf_sched *sched) - EXCLUSIVE_LOCKS_REQUIRED(sched->work_done_wait_mutex) - EXCLUSIVE_LOCKS_REQUIRED(sched->start_work_mutex) + __must_hold(&sched->work_done_wait_mutex) + __must_hold(&sched->start_work_mutex) {u64 T0 ,T1 , delta, avg_delta, fluct;
tools/perf/builtin-top.c +2 -2
@@ -201,7 +201,7 @@ static void perf_top__record_precise_ip(struct perf_top *top,struct hist_entry *he, struct perf_sample *sample, u64 ip) - EXCLUSIVE_LOCKS_REQUIRED(he->hists->lock) + __must_hold(&he->hists->lock) { struct annotation *notes;struct symbol *sym = he->ms.sym;
@@ -730,7 +730,7 @@ static void *display_thread(void *arg)static int hist_iter__top_callback (struct hist_entry_iter *iter,struct addr_location *al,bool single,void *arg) - EXCLUSIVE_LOCKS_REQUIRED(iter->he->hists->lock) + __must_hold(&iter->he->hists->lock) {struct perf_top *top = arg;
tools/perf/util/annotate.c +2 -2
@@ -655,7 +655,7 @@ static struct mutex *annotation__get_mutex(const struct annotation *notes) }void annotation__lock (struct annotation *notes) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {struct mutex *mutex =annotation__get_mutex (notes);
@@ -664,7 +664,7 @@ void annotation__lock(struct annotation *notes) }void annotation__unlock (struct annotation *notes) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {struct mutex *mutex =annotation__get_mutex (notes);
tools/perf/util/annotate.h +4 -4
@@ -369,7 +369,7 @@ struct annotated_branch {u64 *br_cntr; }; -struct LOCKABLE annotation { +context_lock_struct (annotation) {struct annotated_source *src;struct annotated_branch *branch; };
@@ -379,9 +379,9 @@ static inline void annotation__init(struct annotation *notes __maybe_unused) }void annotation__exit (struct annotation *notes); -void annotation__lock(struct annotation *notes) EXCLUSIVE_LOCK_FUNCTION(*notes); -void annotation__unlock(struct annotation *notes) UNLOCK_FUNCTION(*notes); -bool annotation__trylock(struct annotation *notes) EXCLUSIVE_TRYLOCK_FUNCTION(true, *notes); +void annotation__lock(struct annotation *notes) __acquires(notes); +void annotation__unlock(struct annotation *notes) __releases(notes); +bool annotation__trylock(struct annotation *notes) __cond_acquires(true, notes);static inline int annotation__cycles_width (struct annotation *notes) {
tools/perf/util/comm.c +2 -2
@@ -24,7 +24,7 @@ static struct comm_strs {static void comm_strs__remove_if_last (struct comm_str *cs);static void comm_strs__init (void ) -NO_THREAD_SAFETY_ANALYSIS /* Inherently single threaded due to pthread_once. */ +__context_unsafe (/* Inherently single threaded due to pthread_once. */ ) {init_rwsem (&_comm_strs.lock); _comm_strs.capacity =16 ;
@@ -120,7 +120,7 @@ static void comm_strs__remove_if_last(struct comm_str *cs) }static struct comm_str *__comm_strs__find (struct comm_strs *comm_strs,const char *str) - SHARED_LOCKS_REQUIRED(comm_strs->lock) + __must_hold_shared(&comm_strs->lock) {struct comm_str **result;
tools/perf/util/dso.c +13 -13
@@ -525,14 +525,14 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,*/ struct mutex _dso__data_open_lock;static LIST_HEAD (dso__data_open); -static long dso__data_open_cnt GUARDED_BY (_dso__data_open_lock ); +static long dso__data_open_cnt __guarded_by(&_dso__data_open_lock);static void dso__data_open_lock_init (void ) {mutex_init (&_dso__data_open_lock); } -static struct mutex *dso__data_open_lock (void )LOCK_RETURNED (_dso__data_open_lock) +static struct mutex *dso__data_open_lock(void) __returns_ctx_lock(&_dso__data_open_lock) {static pthread_once_t data_open_lock_once =PTHREAD_ONCE_INIT ;
@@ -541,7 +541,7 @@ static struct mutex *dso__data_open_lock(void) LOCK_RETURNED(_dso__data_open_locreturn &_dso__data_open_lock; } -static void dso__list_add (struct dso *dso)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void dso__list_add(struct dso *dso) __must_hold(&_dso__data_open_lock) {list_add_tail (&dso__data (dso)->open_entry, &dso__data_open);#ifdef REFCNT_CHECKING
@@ -552,7 +552,7 @@ static void dso__list_add(struct dso *dso) EXCLUSIVE_LOCKS_REQUIRED(_dso__data_o dso__data_open_cnt++; } -static void dso__list_del (struct dso *dso)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void dso__list_del(struct dso *dso) __must_hold(&_dso__data_open_lock) {list_del_init (&dso__data (dso)->open_entry);#ifdef REFCNT_CHECKING
@@ -567,7 +567,7 @@ static void dso__list_del(struct dso *dso) EXCLUSIVE_LOCKS_REQUIRED(_dso__data_ostatic void close_first_dso (void ); -static int do_open (char *name)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static int do_open(char *name) __must_hold(&_dso__data_open_lock) { do { int fd = open(name, O_RDONLY|O_CLOEXEC);
@@ -670,7 +670,7 @@ void dso__put_filename(struct dso *dso __maybe_unused, char *filename, bool deco }static int __open_dso (struct dso *dso,struct machine *machine) -EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) + __must_hold(&_dso__data_open_lock) {int fd = -EINVAL ;char *name;
@@ -703,7 +703,7 @@ static void check_data_close(void);* list/count of open DSO objects. */ static int open_dso (struct dso *dso,struct machine *machine) -EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) + __must_hold(&_dso__data_open_lock) {int fd;struct nscookie nsc;
@@ -729,7 +729,7 @@ static int open_dso(struct dso *dso, struct machine *machine)return fd; } -static void close_data_fd (struct dso *dso)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void close_data_fd(struct dso *dso) __must_hold(&_dso__data_open_lock) {if (dso__data (dso)->fd >=0 ) {close (dso__data (dso)->fd);
@@ -746,12 +746,12 @@ static void close_data_fd(struct dso *dso) EXCLUSIVE_LOCKS_REQUIRED(_dso__data_o* Close @dso's data file descriptor and updates * list/count of open DSO objects. */ -static void close_dso (struct dso *dso)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void close_dso(struct dso *dso) __must_hold(&_dso__data_open_lock) {close_data_fd (dso); } -static void close_first_dso (void )EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void close_first_dso(void) __must_hold(&_dso__data_open_lock) {struct dso_data *dso_data;struct dso *dso;
@@ -796,7 +796,7 @@ void reset_fd_limit(void) fd_limit =0 ; } -static bool may_cache_fd (void )EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static bool may_cache_fd(void) __must_hold(&_dso__data_open_lock) {if (!fd_limit) fd_limit =get_fd_limit ();
@@ -812,7 +812,7 @@ static bool may_cache_fd(void) EXCLUSIVE_LOCKS_REQUIRED(_dso__data_open_lock)* for opened dso file descriptors. The limit is half * of the RLIMIT_NOFILE files opened. */ -static void check_data_close (void )EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void check_data_close(void) __must_hold(&_dso__data_open_lock) {bool cache_fd =may_cache_fd ();
@@ -834,7 +834,7 @@ void dso__data_close(struct dso *dso) }static void try_to_open_dso (struct dso *dso,struct machine *machine) -EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) + __must_hold(&_dso__data_open_lock) {enum dso_binary_type binary_type_data[] = {DSO_BINARY_TYPE__BUILD_ID_CACHE ,
tools/perf/util/dso.h +4 -4
@@ -808,7 +808,7 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id);int dso__name_len (const struct dso *dso);struct dso *dso__get (struct dso *dso); -void dso__put(struct dso *dso) LOCKS_EXCLUDED(_dso__data_open_lock); +void dso__put(struct dso *dso) __must_not_hold(&_dso__data_open_lock);static inline void __dso__zput (struct dso **dso) {
@@ -918,9 +918,9 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,* TODO */ bool dso__data_get_fd(struct dso *dso, struct machine *machine, int *fd) - EXCLUSIVE_TRYLOCK_FUNCTION(true, _dso__data_open_lock); -void dso__data_put_fd(struct dso *dso) UNLOCK_FUNCTION(_dso__data_open_lock); -void dso__data_close(struct dso *dso) LOCKS_EXCLUDED(_dso__data_open_lock); + __cond_acquires(true, &_dso__data_open_lock); +void dso__data_put_fd(struct dso *dso) __releases(&_dso__data_open_lock); +void dso__data_close(struct dso *dso) __must_not_hold(&_dso__data_open_lock);int dso__data_file_size (struct dso *dso,struct machine *machine);off_t dso__data_size (struct dso *dso,struct machine *machine);
tools/perf/util/dsos.c +3 -3
@@ -157,7 +157,7 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos, const char *name, const struct dso_id *id, bool write_locked) - SHARED_LOCKS_REQUIRED(dsos->lock) + __must_hold_shared(&dsos->lock) { struct dsos__key key = { .long_name = name,
@@ -266,7 +266,7 @@ static int dsos__find_id_cb(struct dso *dso, void *data)static struct dso *__dsos__find_id (struct dsos *dsos,const char *name,const struct dso_id *id,bool cmp_short,bool write_locked) - SHARED_LOCKS_REQUIRED(dsos->lock) + __must_hold_shared(&dsos->lock) {struct dso *res;
@@ -330,7 +330,7 @@ static struct dso *__dsos__addnew_id(struct dsos *dsos, const char *name, const }static struct dso *__dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) - SHARED_LOCKS_REQUIRED(dsos->lock) + __must_hold_shared(&dsos->lock) {struct dso *dso =__dsos__find_id (dsos, name, id, false,/*write_locked=*/ true);
tools/perf/util/intel-tpebs.c +3 -3
@@ -69,7 +69,7 @@ static struct mutex *tpebs_mtx_get(void) }static struct tpebs_retire_lat *tpebs_retire_lat__find (struct evsel *evsel) -EXCLUSIVE_LOCKS_REQUIRED (tpebs_mtx_get ()); +__must_hold (tpebs_mtx_get ());static int evsel__tpebs_start_perf_record (struct evsel *evsel) {
@@ -244,7 +244,7 @@ static void *__sample_reader(void *arg __maybe_unused)return NULL ; } -static int tpebs_send_record_cmd (const char *msg)EXCLUSIVE_LOCKS_REQUIRED (tpebs_mtx_get ()) +static int tpebs_send_record_cmd (const char *msg)__must_hold (tpebs_mtx_get ()) {struct pollfd pollfd = { .events =POLLIN , };int ret, len, retries =0 ;
@@ -321,7 +321,7 @@ static int tpebs_send_record_cmd(const char *msg) EXCLUSIVE_LOCKS_REQUIRED(tpebs/* * tpebs_stop - stop the sample data read thread and the perf record process. */ -static int tpebs_stop (void )EXCLUSIVE_LOCKS_REQUIRED (tpebs_mtx_get ()) +static int tpebs_stop (void )__must_hold (tpebs_mtx_get ()) {int ret =0 ;
tools/perf/util/libbfd.c +2 -2
@@ -51,13 +51,13 @@ struct a2l_data {asymbol **syms; }; -static bool perf_bfd_lock (void *bfd_mutex)NO_THREAD_SAFETY_ANALYSIS +static bool perf_bfd_lock (void *bfd_mutex) __no_context_analysis {mutex_lock (bfd_mutex);return true; } -static bool perf_bfd_unlock (void *bfd_mutex)NO_THREAD_SAFETY_ANALYSIS +static bool perf_bfd_unlock (void *bfd_mutex) __no_context_analysis {mutex_unlock (bfd_mutex);return true;
tools/perf/util/mutex.c +2 -2
@@ -56,13 +56,13 @@ void mutex_destroy(struct mutex *mtx) }void mutex_lock (struct mutex *mtx) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {CHECK_ERR (pthread_mutex_lock (&mtx->lock)); }void mutex_unlock (struct mutex *mtx) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {CHECK_ERR (pthread_mutex_unlock (&mtx->lock)); }
tools/perf/util/mutex.h +6 -84
114 lines not on this page · raw message
tools/perf/util/rwsem.c +4 -4
@@ -27,7 +27,7 @@ int exit_rwsem(struct rw_semaphore *sem) }int down_read (struct rw_semaphore *sem) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {#if RWS_ERRORCHECK mutex_lock (&sem->mtx);
@@ -38,7 +38,7 @@ int down_read(struct rw_semaphore *sem) }int up_read (struct rw_semaphore *sem) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {#if RWS_ERRORCHECK mutex_unlock (&sem->mtx);
@@ -49,7 +49,7 @@ int up_read(struct rw_semaphore *sem) }int down_write (struct rw_semaphore *sem) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {#if RWS_ERRORCHECK mutex_lock (&sem->mtx);
@@ -60,7 +60,7 @@ int down_write(struct rw_semaphore *sem) }int up_write (struct rw_semaphore *sem) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {#if RWS_ERRORCHECK mutex_unlock (&sem->mtx);
tools/perf/util/rwsem.h +5 -5
@@ -10,7 +10,7 @@*/ #define RWS_ERRORCHECK 0 -struct LOCKABLE rw_semaphore { +context_lock_struct (rw_semaphore) {#if RWS_ERRORCHECK struct mutex mtx;#else
@@ -21,10 +21,10 @@ struct LOCKABLE rw_semaphore {int init_rwsem (struct rw_semaphore *sem);int exit_rwsem (struct rw_semaphore *sem); -int down_read(struct rw_semaphore *sem) SHARED_LOCK_FUNCTION(sem); -int up_read(struct rw_semaphore *sem) UNLOCK_FUNCTION(sem); +int down_read(struct rw_semaphore *sem) __acquires_shared(sem); +int up_read(struct rw_semaphore *sem) __releases_shared(sem); -int down_write(struct rw_semaphore *sem) EXCLUSIVE_LOCK_FUNCTION(sem); -int up_write(struct rw_semaphore *sem) UNLOCK_FUNCTION(sem); +int down_write(struct rw_semaphore *sem) __acquires(sem); +int up_write(struct rw_semaphore *sem) __releases(sem);#endif /* _PERF_RWSEM_H */
tools/perf/util/thread.c +4 -4
@@ -41,7 +41,7 @@ int thread__init_maps(struct thread *thread, struct machine *machine) }struct thread *thread__new (pid_t pid,pid_t tid) -NO_THREAD_SAFETY_ANALYSIS /* Allocation/creation is inherently single threaded. */ +__context_unsafe (/* Allocation/creation is inherently single threaded. */ ) {RC_STRUCT (thread) *_thread =zalloc (sizeof (*_thread));struct thread *thread;
@@ -203,7 +203,7 @@ int thread__set_namespaces(struct thread *thread, u64 timestamp, }static struct comm *__thread__comm (struct thread *thread) -SHARED_LOCKS_REQUIRED (thread__comm_lock (thread)) +__must_hold_shared (thread__comm_lock (thread)) {if (list_empty (thread__comm_list (thread)))return NULL ;
@@ -250,7 +250,7 @@ struct comm *thread__exec_comm(struct thread *thread)static int ____thread__set_comm (struct thread *thread,const char *str,u64 timestamp,bool exec) -EXCLUSIVE_LOCKS_REQUIRED (thread__comm_lock (thread)) +__must_hold (thread__comm_lock (thread)) {struct comm *new, *curr =__thread__comm (thread);
@@ -308,7 +308,7 @@ int thread__set_comm_from_proc(struct thread *thread) }static const char *__thread__comm_str (struct thread *thread) -SHARED_LOCKS_REQUIRED (thread__comm_lock (thread)) +__must_hold_shared (thread__comm_lock (thread)) {const struct comm *comm =__thread__comm (thread);
tools/perf/util/thread.h +1 -1
@@ -251,7 +251,7 @@ static inline struct rw_semaphore *thread__comm_lock(struct thread *thread) }static inline struct list_head *thread__comm_list (struct thread *thread) -SHARED_LOCKS_REQUIRED (thread__comm_lock (thread)) +__must_hold_shared (thread__comm_lock (thread)) {return &RC_CHK_ACCESS (thread)->comm_list; }
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v1 04/10] perf mutex: Use kernel style compiler-context-analysis.h annotations
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 11 lines
Enable -DWARN_CONTEXT_ANALYSIS alongside -Wthread-safety for Clang builds in
tools/perf/Makefile.config, replace the custom lock safety macros intools/perfwith the kernel'scompiler-context-analysis.hannotations (context_lock_struct,__guarded_by,__acquires,__acquires_shared,__releases,__releases_shared,__cond_acquires,__must_hold,__must_hold_shared,__must_not_hold,__returns_ctx_lock,__no_context_analysis, and__context_unsafe), and remove the redundant macro definitions fromtools/perf/util/mutex.h.Assisted-by Antigravity:gemini-3.1-proSigned-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=4
Ian Rogers
reviewerPATCH 5/10 perf build: Enable additional Clang thread-safety flags
In reply to Ian RogersAlign tools/perf's Clang thread-safety flags with the kernel's scripts/Makefile.context-analysis by adding -Wthread-safety-pointer, -Wthread-safety-beta, and (when supported by the compiler) -fexperimental-late-parse-attributes.
--- tools/perf/Makefile.config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/Makefile.config +4 -1
@@ -64,7 +64,10 @@ ifeq ($(CC_NO_CLANG), 0) endif # Enabled Wthread-safety analysis for clang builds. - CFLAGS += -Wthread-safety -DWARN_CONTEXT_ANALYSIS + CFLAGS += -DWARN_CONTEXT_ANALYSIS -Wthread-safety -Wthread-safety-pointer -Wthread-safety-beta + ifeq ($(shell $(CC) -Werror -fexperimental-late-parse-attributes -E -x c /dev/null >/dev/null 2>&1 && echo 1), 1) + CFLAGS += -fexperimental-late-parse-attributes + endif endif include $(srctree)/tools/scripts/Makefile.arch
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v1 05/10] perf build: Enable additional Clang thread-safety flags
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Medium] build: broken feature test using -E for parser flag --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] build: broken feature test using -E for parser flag
--
commit 0e33ca477acb734d0166b74d7f9ee83ae4860cb6
Author: Ian Rogers <[email protected]>
perf build: Enable additional Clang thread-safety flags
This commit adds additional Clang thread-safety flags (-Wthread-safety-pointer, -Wthread-safety-beta, and -fexperimental-late-parse-attributes) to the perf build to align with the kernel's context analysis.
tools/perf/Makefile.config ifeq ($(CC_NO_CLANG), 0) · line 68
Quoted 11 lines
tools/perf/Makefile.config +2
-1@@ -64,7 +64,10 @@ ifeq ($(CC_NO_CLANG), 0) endif # Enabled Wthread-safety analysis for clang builds. - CFLAGS += -Wthread-safety -DWARN_CONTEXT_ANALYSIS + CFLAGS += -DWARN_CONTEXT_ANALYSIS -Wthread-safety -Wthread-safety-pointer -Wthread-safety-beta + ifeq ($(shell $(CC) -Werror -fexperimental-late-parse-attributes -E -x c /dev/null >/dev/null 2>&1 && echo 1), 1)
[Severity: Medium]
Since -fexperimental-late-parse-attributes is a parsing flag, does passing it with -E (preprocess only) cause Clang to emit a -Wunused-command-line-argument warning? Due to -Werror, this warning gets promoted to a fatal error, which forces the shell command to exit with a non-zero status regardless of whether the compiler actually supports the flag.
As a result, the flag is never added to CFLAGS, preventing Clang from correctly parsing thread-safety annotations that reference struct members declared later in the same struct.
Should this feature test use -c rather than -E to avoid this issue?
Quoted 5 lines
tools/perf/Makefile.config +2
-0+ CFLAGS += -fexperimental-late-parse-attributes + endif endif include $(srctree)/tools/scripts/Makefile.arch
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=5
Ian Rogers
reviewerPATCH 6/10 perf comm: Add __guarded_by annotations to struct comm_strs
In reply to Ian RogersAnnotate strs, num_strs, and capacity in struct comm_strs with __guarded_by(&lock) and __pt_guarded_by(&lock) so Clang verifies all accesses hold comm_strs->lock.
--- tools/perf/util/comm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/comm.c +3 -3
@@ -16,9 +16,9 @@ DECLARE_RC_STRUCT(comm_str) {static struct comm_strs {struct rw_semaphore lock; -struct comm_str **strs; -int num_strs; -int capacity; + struct comm_str **strs __pt_guarded_by(&lock) __guarded_by(&lock); + int num_strs __guarded_by(&lock); + int capacity __guarded_by(&lock); } _comm_strs;static void comm_strs__remove_if_last (struct comm_str *cs);
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v1 06/10] perf comm: Add __guarded_by annotations to struct comm_strs
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 7 lines
Annotate strs,
num_strs, and capacity in structcomm_strswith__guarded_by(&lock)and__pt_guarded_by(&lock)so Clang verifies all accesses holdcomm_strs->lock.Assisted-by Antigravity:gemini-3.1-proSigned-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=6
Ian Rogers
reviewerPATCH 7/10 perf dso: Fix unlocked __dsos__add() in vdso and expand lock annotations
In reply to Ian Rogers__machine__addnew_vdso() called __dsos__add(&machine->dsos, dso) without holding machine->dsos.lock. Switch it to dsos__add() and make __dsos__add() static in util/dsos.c with __must_hold(&dsos->lock).
In dsos__findnew_id(), try finding the DSO under the read lock first and only acquire the write lock when a new DSO must be inserted or an existing DSO needs its ID updated (checked via dso__needs_improve_id()).
Also replace _dso__data_open_lock and its pthread_once() wrapper with DEFINE_MUTEX(dso__data_open_lock), annotate struct dsos fields with __guarded_by(&lock), add __returns_ctx_lock() to dso__lock(), annotate dso__data_open and fd_limit in util/dso.c with __guarded_by(&dso__data_open_lock), and tighten __dsos__findnew_id() and __dsos__addnew_id() from shared to exclusive lock requirements.
--- tools/perf/tests/dso-data.c | 4 ++ tools/perf/util/dso.c | 89 ++++++++++++++++++------------------- tools/perf/util/dso.h | 12 ++--- tools/perf/util/dsos.c | 25 +++++++++-- tools/perf/util/dsos.h | 9 ++-- tools/perf/util/vdso.c | 2 +- 6 files changed, 81 insertions(+), 60 deletions(-)
tools/perf/tests/dso-data.c +4 -0
@@ -116,12 +116,14 @@ static int dso__data_fd(struct dso *dso, struct machine *machine)static void dsos__delete (struct dsos *dsos) { +down_write (&dsos->lock);for (unsigned int i =0 ; i < dsos->cnt; i++) {struct dso *dso = dsos->dsos[i];dso__data_close (dso);unlink (dso__name (dso)); } +up_write (&dsos->lock);dsos__exit (dsos); }
@@ -247,6 +249,7 @@ static int set_fd_limit(int n) }static int test__dso_data_cache (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) +__context_unsafe (/* single-threaded test */ ) {struct machine machine;long nr_end, nr =open_files_cnt ();
@@ -317,6 +320,7 @@ static long new_limit(int count) }static int test__dso_data_reopen (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) +__context_unsafe (/* single-threaded test */ ) {struct machine machine;long nr_end, nr =open_files_cnt (), lim =new_limit (3 );
tools/perf/util/dso.c +44 -45
235 lines not on this page · raw message
tools/perf/util/dso.h +7 -5
@@ -356,7 +356,7 @@ DECLARE_RC_STRUCT(dso) {char name[]; }; -extern struct mutex _dso__data_open_lock; +extern struct mutex dso__data_open_lock;extern const struct dso_id dso_id_empty;int dso_id__cmp (const struct dso_id *a,const struct dso_id *b);
@@ -628,6 +628,7 @@ static inline void dso__set_loaded(struct dso *dso) }static inline struct mutex *dso__lock (struct dso *dso) + __returns_ctx_lock(&RC_CHK_ACCESS(dso)->lock) {return &RC_CHK_ACCESS (dso)->lock; }
@@ -803,12 +804,13 @@ void dso__delete(struct dso *dso);int dso__cmp_id (struct dso *a,struct dso *b);void dso__set_short_name (struct dso *dso,const char *name,bool name_allocated);void dso__set_long_name (struct dso *dso,const char *name,bool name_allocated); +bool dso__needs_improve_id (const struct dso *dso,const struct dso_id *id);void __dso__improve_id (struct dso *dso,const struct dso_id *id);int dso__name_len (const struct dso *dso);struct dso *dso__get (struct dso *dso); -void dso__put(struct dso *dso) __must_not_hold(&_dso__data_open_lock); +void dso__put(struct dso *dso) __must_not_hold(&dso__data_open_lock);static inline void __dso__zput (struct dso **dso) {
@@ -918,9 +920,9 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,* TODO */ bool dso__data_get_fd(struct dso *dso, struct machine *machine, int *fd) - __cond_acquires(true, &_dso__data_open_lock); -void dso__data_put_fd(struct dso *dso) __releases(&_dso__data_open_lock); -void dso__data_close(struct dso *dso) __must_not_hold(&_dso__data_open_lock); + __cond_acquires(true, &dso__data_open_lock); +void dso__data_put_fd(struct dso *dso) __releases(&dso__data_open_lock); +void dso__data_close(struct dso *dso) __must_not_hold(&dso__data_open_lock);int dso__data_file_size (struct dso *dso,struct machine *machine);off_t dso__data_size (struct dso *dso,struct machine *machine);
tools/perf/util/dsos.c +21 -4
@@ -12,6 +12,7 @@#include <unistd.h> void dsos__init (struct dsos *dsos) +__context_unsafe (/* initialization */ ) {init_rwsem (&dsos->lock);
@@ -50,6 +51,7 @@ void dsos__exit(struct dsos *dsos)static int __dsos__for_each_dso (struct dsos *dsos,int (*cb)(struct dso *dso,void *data),void *data) + __must_hold_shared(&dsos->lock) {for (unsigned int i =0 ; i < dsos->cnt; i++) {struct dso *dso = dsos->dsos[i];
@@ -182,7 +184,8 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos, }qsort (dsos->dsos, dsos->cnt,sizeof (struct dso *), dsos__cmp_long_name_id_short_name); - dsos->sorted = true; +/* write_locked is true, so dsos->lock is held exclusively. */ +context_unsafe (dsos->sorted = true); } res = bsearch(&key, dsos->dsos, dsos->cnt, sizeof(struct dso *),
@@ -193,7 +196,8 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos,return dso__get (*res); } -int __dsos__add (struct dsos *dsos,struct dso *dso) +static int __dsos__add (struct dsos *dsos,struct dso *dso) + __must_hold(&dsos->lock) {if (!dso)return -EINVAL ;
@@ -314,6 +318,7 @@ static void dso__set_basename(struct dso *dso) }static struct dso *__dsos__addnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) + __must_hold(&dsos->lock) {struct dso *dso =dso__new_id (name, id);
@@ -330,7 +335,7 @@ static struct dso *__dsos__addnew_id(struct dsos *dsos, const char *name, const }static struct dso *__dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) - __must_hold_shared(&dsos->lock) + __must_hold(&dsos->lock) {struct dso *dso =__dsos__find_id (dsos, name, id, false,/*write_locked=*/ true);
@@ -343,8 +348,20 @@ static struct dso *__dsos__findnew_id(struct dsos *dsos, const char *name, conststruct dso *dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) {struct dso *dso; + +down_read (&dsos->lock); + dso =__dsos__find_id (dsos, name, id, false,/*write_locked=*/ false); +if (dso && !dso__needs_improve_id (dso, id)) { +up_read (&dsos->lock); +return dso; + } +up_read (&dsos->lock); +down_write (&dsos->lock); - dso =__dsos__findnew_id (dsos, name, id); +if (dso) +__dso__improve_id (dso, id); +else + dso =__dsos__findnew_id (dsos, name, id);up_write (&dsos->lock);return dso; }
tools/perf/util/dsos.h +4 -5
@@ -19,16 +19,15 @@ struct machine;*/ struct dsos {struct rw_semaphore lock; -struct dso **dsos; -unsigned int cnt; -unsigned int allocated; -bool sorted; + struct dso **dsos __pt_guarded_by(&lock) __guarded_by(&lock); + unsigned int cnt __guarded_by(&lock); + unsigned int allocated __guarded_by(&lock); + bool sorted __guarded_by(&lock); };void dsos__init (struct dsos *dsos);void dsos__exit (struct dsos *dsos); -int __dsos__add (struct dsos *dsos,struct dso *dso);int dsos__add (struct dsos *dsos,struct dso *dso);struct dso *dsos__find (struct dsos *dsos,const char *name,bool cmp_short);
tools/perf/util/vdso.c +1 -1
@@ -131,7 +131,7 @@ static struct dso *__machine__addnew_vdso(struct machine *machine, const char *s dso =dso__new (short_name);if (dso !=NULL ) { -__dsos__add (&machine->dsos, dso); +dsos__add (&machine->dsos, dso);dso__set_long_name (dso, long_name, false); }
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v1 07/10] perf dso: Fix unlocked __dsos__add() in vdso and expand lock annotations
Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider: - [High] perf dso: AB-BA lock inversion deadlock between dso__data_open_lock and dso->lock during fd…
Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider:
- [High] perf dso: AB-BA lock inversion deadlock between dso__data_open_lock and dso->lock during fd eviction
- [High] perf dso: Out-of-bounds list access and crash due to dropped lock desyncing open count
- [Medium] perf vdso: TOCTOU race in machine__findnew_vdso allows duplicate VDSO dso insertion --
commit 8889b552b9a0b44cdbc90055b9073e8918dcfc00
Author: Ian Rogers <[email protected]>
perf dso: Fix unlocked __dsos__add() in vdso and expand lock annotations
This commit expands lock annotations for the struct dsos lock and struct dso data structures, updating locking primitives to ensure proper concurrency tracking. It also switches VDSO addition to use the locked dsos__add function.
Quoted 4 lines
tools/perf/util/dso.c +0
-0
[ ... ]
Quoted 5 lines
tools/perf/util/dso.c +0
-1@@ -552,13 +539,13 @@ static void dso__list_add(struct dso *dso) __must_hold(&_dso__data_open_lock) dso__data_open_cnt++; } -static void dso__list_del(struct dso *dso) __must_hold(&_dso__data_open_lock)
tools/perf/util/dso.c static void dso__list_add(struct dso *dso) __must_hold(&_dso__data_open_lock) · line 549
Quoted 10 lines
tools/perf/util/dso.c +3
-2+static void dso__list_del(struct dso *dso) __must_hold(&dso__data_open_lock) {list_del_init (&dso__data (dso)->open_entry);#ifdef REFCNT_CHECKING -mutex_unlock (dso__data_open_lock ()); +mutex_unlock (&dso__data_open_lock);dso__put (dso__data (dso)->dso); -mutex_lock (dso__data_open_lock ()); +mutex_lock (&dso__data_open_lock);#endif
[Severity: High]
Does dropping the lock before decrementing the count open a window for an out-of-bounds access?
In dso__list_del(), the entry is removed from the list via list_del_init() before dso__data_open_lock is dropped under REFCNT_CHECKING. However, dso__data_open_cnt is not decremented until after the lock is reacquired.
If the list had exactly one element, it is now empty, but the count remains positive during the unlocked window.
If another thread calls do_open() and hits EMFILE during this window, it checks dso__data_open_cnt. Seeing a positive count, it will call close_first_dso(), which blindly executes list_first_entry() on the empty dso__data_open list. This results in an invalid pointer and subsequent memory corruption.
Quoted 11 lines
tools/perf/util/dso.c +1
-1WARN_ONCE (dso__data_open_cnt <=0 ,"DSO data fd counter out of bounds." );@@ -567,7 +554,7 @@ static void dso__list_del(struct dso *dso) __must_hold(&_dso__data_open_lock)static void close_first_dso (void ); -static int do_open(char *name) __must_hold(&_dso__data_open_lock) +static int do_open(char *name) __must_hold(&dso__data_open_lock) { do { int fd = open(name, O_RDONLY|O_CLOEXEC);
[ ... ]
Quoted 10 lines
tools/perf/util/dso.c +1
-1@@ -670,7 +657,7 @@ void dso__put_filename(struct dso *dso __maybe_unused, char *filename, bool deco }static int __open_dso (struct dso *dso,struct machine *machine) - __must_hold(&_dso__data_open_lock) + __must_hold(&dso__data_open_lock) {int fd = -EINVAL ;char *name;
tools/perf/util/dso.c static void check_data_close(void); · line 693
Quoted 5 lines
tools/perf/util/dso.c +1
-1@@ -703,7 +690,7 @@ static void check_data_close(void);* list/count of open DSO objects. */ static int open_dso(struct dso *dso, struct machine *machine) - __must_hold(&_dso__data_open_lock) + __must_hold(&dso__data_open_lock)
[Severity: High]
Could this sequence lead to an AB-BA lock inversion deadlock between dso__data_open_lock and dso->lock?
When a thread opens a DSO via __open_dso(), it first acquires dso->lock. If it calls do_open() and hits the open file limit (EMFILE), do_open() calls close_first_dso() to evict an older DSO.
This leads to dso__list_del() being called for the evicted DSO. As seen above, under REFCNT_CHECKING, dso__list_del() temporarily drops the global dso__data_open_lock and calls dso__put(). At this moment, the current thread still holds dso->lock for the DSO it was trying to open.
A concurrent thread can now acquire the uncontended dso__data_open_lock, attempt to open the same DSO the first thread is processing, and block waiting for dso->lock. When the first thread finishes dso__put(), it will attempt to reacquire dso__data_open_lock, creating a classic AB-BA deadlock.
[ ... ]
tools/perf/util/vdso.c static struct dso *__machine__addnew_vdso(struct machine *machine, const char *s · line 137
Quoted 13 lines
tools/perf/util/vdso.c +1
-1@@ -131,7 +131,7 @@ static struct dso *__machine__addnew_vdso(struct machine *machine, const char *s dso =dso__new (short_name);if (dso !=NULL ) { -__dsos__add (&machine->dsos, dso); +dsos__add (&machine->dsos, dso);dso__set_long_name (dso, long_name, false); }
[Severity: Medium]
Does this missing double-check create a TOCTOU race that allows duplicate VDSO entries to be inserted?
In machine__findnew_vdso(), there is an initial read-locked lookup via dsos__find(). If the DSO is not found, it calls __machine__addnew_vdso() which allocates a new DSO and delegates to dsos__add().
Because dsos__add() acquires the write lock and blindly appends the DSO without verifying if another thread already inserted it, concurrent threads calling map__new() can race. They can both miss the initial read-locked lookup, both allocate new DSO objects, and both insert them.
This violates the unique DSO invariant and leaks the memory allocated for the duplicate VDSO dso.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=7
Ian Rogers
reviewerPATCH 8/10 perf thread: Expand context analysis annotations to threads and namespaces_lock
In reply to Ian RogersAnnotate shard and last_match in struct threads_table_entry with __guarded_by(&lock) and add __must_hold_shared()/__must_hold() to the last_match helpers in util/threads.c.
In util/thread.h and util/thread.c, add __returns_ctx_lock() to thread__namespaces_lock() and thread__comm_lock(), annotate namespaces_list and comm_list with __guarded_by(), and add __must_hold_shared()/__must_hold() to the namespaces_list helpers.
--- tools/perf/util/thread.c | 2 ++ tools/perf/util/thread.h | 28 +++++++++++++++++----------- tools/perf/util/threads.c | 4 ++++ tools/perf/util/threads.h | 6 +++--- 4 files changed, 26 insertions(+), 14 deletions(-)
tools/perf/util/thread.c +2 -0
@@ -149,6 +149,7 @@ void thread__put(struct thread *thread) }static struct namespaces *__thread__namespaces (struct thread *thread) +__must_hold_shared (thread__namespaces_lock (thread)) {if (list_empty (thread__namespaces_list (thread)))return NULL ;
@@ -169,6 +170,7 @@ struct namespaces *thread__namespaces(struct thread *thread)static int __thread__set_namespaces (struct thread *thread,u64 timestamp,struct perf_record_namespaces *event) +__must_hold (thread__namespaces_lock (thread)) {struct namespaces *new, *curr =__thread__namespaces (thread);
tools/perf/util/thread.h +17 -11
@@ -48,10 +48,10 @@ DECLARE_RC_STRUCT(thread) {bool exited;bool comm_set;int comm_len; -struct list_head namespaces_list;struct rw_semaphore namespaces_lock; -struct list_head comm_list; + struct list_head namespaces_list __guarded_by(&namespaces_lock);struct rw_semaphore comm_lock; + struct list_head comm_list __guarded_by(&comm_lock);u64 db_id;void *priv;
@@ -230,30 +230,36 @@ static inline void thread__set_comm_len(struct thread *thread, int len)RC_CHK_ACCESS (thread)->comm_len = len; } -static inline struct list_head *thread__namespaces_list (struct thread *thread) +static inline struct rw_semaphore *thread__namespaces_lock (const struct thread *thread) + __returns_ctx_lock(&RC_CHK_ACCESS(thread)->namespaces_lock) { -return &RC_CHK_ACCESS (thread)->namespaces_list; +return (struct rw_semaphore *)&RC_CHK_ACCESS (thread)->namespaces_lock; } -static inline int thread__namespaces_list_empty (const struct thread *thread) +static inline struct list_head *thread__namespaces_list (struct thread *thread) +__must_hold_shared (thread__namespaces_lock (thread)) { -return list_empty (&RC_CHK_ACCESS (thread)->namespaces_list); +/* Readers hold the shared lock; writers hold the exclusive lock. */ +return context_unsafe (&RC_CHK_ACCESS (thread)->namespaces_list); } -static inline struct rw_semaphore *thread__namespaces_lock (struct thread *thread) +static inline int thread__namespaces_list_empty (const struct thread *thread) +__must_hold_shared (thread__namespaces_lock (thread)) { -return &RC_CHK_ACCESS (thread)->namespaces_lock; +return list_empty (&RC_CHK_ACCESS (thread)->namespaces_list); } -static inline struct rw_semaphore *thread__comm_lock (struct thread *thread) +static inline struct rw_semaphore *thread__comm_lock (const struct thread *thread) + __returns_ctx_lock(&RC_CHK_ACCESS(thread)->comm_lock) { -return &RC_CHK_ACCESS (thread)->comm_lock; +return (struct rw_semaphore *)&RC_CHK_ACCESS (thread)->comm_lock; }static inline struct list_head *thread__comm_list (struct thread *thread)__must_hold_shared (thread__comm_lock (thread)) { -return &RC_CHK_ACCESS (thread)->comm_list; +/* Readers hold the shared lock; writers hold the exclusive lock. */ +return context_unsafe (&RC_CHK_ACCESS (thread)->comm_list); }static inline u64 thread__db_id (const struct thread *thread)
tools/perf/util/threads.c +4 -0
@@ -21,6 +21,7 @@ static bool key_equal(long key1, long key2, void *ctx __maybe_unused) }void threads__init (struct threads *threads) +__context_unsafe (/* initialization */ ) {for (int i =0 ; i <THREADS__TABLE_SIZE ; i++) {struct threads_table_entry *table = &threads->table[i];
@@ -32,6 +33,7 @@ void threads__init(struct threads *threads) }void threads__exit (struct threads *threads) +__context_unsafe (/* teardown */ ) {threads__remove_all_threads (threads);for (int i =0 ; i <THREADS__TABLE_SIZE ; i++) {
@@ -63,6 +65,7 @@ size_t threads__nr(struct threads *threads)*/ static struct thread *__threads_table_entry__get_last_match (struct threads_table_entry *table,pid_t tid) + __must_hold_shared(&table->lock) {struct thread *th, *res =NULL ;
@@ -76,6 +79,7 @@ static struct thread *__threads_table_entry__get_last_match(struct threads_tablestatic void __threads_table_entry__set_last_match (struct threads_table_entry *table,struct thread *th) + __must_hold(&table->lock) {thread__put (table->last_match); table->last_match =thread__get (th);
tools/perf/util/threads.h +3 -3
@@ -11,10 +11,10 @@ struct thread;#define THREADS__TABLE_SIZE (1 << THREADS__TABLE_BITS)struct threads_table_entry { -/* Key is tid, value is struct thread. */ -struct hashmap shard;struct rw_semaphore lock; -struct thread *last_match; +/* Key is tid, value is struct thread. */ + struct hashmap shard __guarded_by(&lock); + struct thread *last_match __guarded_by(&lock); };struct threads {
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v1 08/10] perf thread: Expand context analysis annotations to threads and namespaces_lock
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 4 lines
Annotate shard and
last_matchin structthreads_table_entrywith__guarded_by(&lock)and add __must_hold_shared()/__must_hold() to thelast_matchhelpers inutil/threads.c.
Quoted 8 lines
In
util/thread.handutil/thread.c, add__returns_ctx_lock()tothread__namespaces_lock()andthread__comm_lock(), annotatenamespaces_listandcomm_listwith__guarded_by(), and add __must_hold_shared()/__must_hold() to thenamespaces_listhelpers.Assisted-by Antigravity:gemini-3.1-proSigned-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=8
Ian Rogers
reviewerPATCH 9/10 perf config, intel-tpebs, env: Add __guarded_by and __must_hold annotations
In reply to Ian RogersAdd __guarded_by() and __must_hold() annotations to static parser and config state in util/config.c, TPEBS state in util/intel-tpebs.c (replacing tpebs_mtx_get() and its pthread_once() init with DEFINE_MUTEX(tpebs_mtx) and fixing an unlocked read of tpebs_reader_thread in tpebs_stop()), and bpf_progs and cgroups trees in struct perf_env.
--- tools/perf/util/bpf-event.h | 5 +- tools/perf/util/config.c | 39 +++++++++------- tools/perf/util/env.c | 1 + tools/perf/util/env.h | 19 ++++---- tools/perf/util/intel-tpebs.c | 86 +++++++++++++++-------------------- 5 files changed, 75 insertions(+), 75 deletions(-)
tools/perf/util/bpf-event.h +3 -2
@@ -6,11 +6,11 @@#include <linux/rbtree.h> #include <api/fd/array.h> #include <stdio.h> +#include "env.h" struct bpf_prog_info ;struct machine ;union perf_event ; -struct perf_env ;struct perf_sample ;struct perf_session ;struct record_opts ;
@@ -42,7 +42,8 @@ int machine__process_bpf(struct machine *machine, union perf_event *event,int evlist__add_bpf_sb_event (struct evlist *evlist,struct perf_env *env); void __bpf_event__print_bpf_prog_info(struct perf_bpil *info_linear, struct perf_env *env, -FILE *fp); + FILE *fp) + __must_hold_shared(&env->bpf_progs.lock);void bpf_metadata_free (struct bpf_metadata *metadata);#else static inline int machine__process_bpf(struct machine *machine __maybe_unused,
tools/perf/util/config.c +23 -16
@@ -64,15 +64,25 @@ struct perf_stat_config stat_config = {char buildid_dir[MAXPATHLEN ];/* root dir for buildid, binary cache */ -static FILE *config_file; -static const char *config_file_name; -static int config_linenr; -static int config_file_eof; -static struct perf_config_set *config_set; +/* Parsing and rewriting share the static parser state. */ +static DEFINE_MUTEX (config_mutex); + +/* Serializes whole perf_config__set_variable() updates. */ +static DEFINE_MUTEX (config_update_mutex); + +/* Not config_mutex: building the set parses the config files, which takes it. */ +static DEFINE_MUTEX (config_set_mutex); + +static FILE *config_file __guarded_by(&config_mutex); +static const char *config_file_name __guarded_by(&config_mutex); +static int config_linenr __guarded_by(&config_mutex); +static int config_file_eof __guarded_by(&config_mutex); +static struct perf_config_set *config_set __guarded_by(&config_set_mutex);const char *config_exclusive_filename;static int get_next_char (void ) + __must_hold(&config_mutex) {int c;FILE *f;
@@ -99,6 +109,7 @@ static int get_next_char(void) }static char *parse_value (void ) + __must_hold(&config_mutex) {static char value[1024 ];int quote =0 , comment =0 , space =0 ;
@@ -170,6 +181,7 @@ static inline int iskeychar(int c) }static int get_value (config_fn_t fn,void *data,char *name,unsigned int len) + __must_hold(&config_mutex) {int c;char *value;
@@ -201,6 +213,7 @@ static int get_value(config_fn_t fn, void *data, char *name, unsigned int len) }static int get_extended_base_var (char *name,int baselen,int c) + __must_hold(&config_mutex) { do { if (c == '\n')
@@ -237,6 +250,7 @@ static int get_extended_base_var(char *name, int baselen, int c) }static int get_base_var (char *name) + __must_hold(&config_mutex) {int baselen =0 ;
@@ -257,6 +271,7 @@ static int get_base_var(char *name) }static int perf_parse_file (config_fn_t fn,void *data) + __must_hold(&config_mutex) {int comment =0 ;int baselen =0 ;
@@ -549,12 +564,6 @@ int perf_default_config(const char *var, const char *value,return 0 ; } -/* Parsing and rewriting share the static parser state. */ -static DEFINE_MUTEX (config_mutex); - -/* Serializes whole perf_config__set_variable() updates. */ -static DEFINE_MUTEX (config_update_mutex); -static int perf_config_from_file (config_fn_t fn,const char *filename,void *data) {int ret;
@@ -737,6 +746,7 @@ static int set_value(struct perf_config_item *item, const char *value)static int collect_config (const char *var,const char *value,void *perf_config_set) + __must_hold(&config_mutex) {int ret =-1 ;char *ptr, *key;
@@ -853,11 +863,8 @@ struct perf_config_set *perf_config_set__load_file(const char *file)return set; } -/* Not config_mutex: building the set parses the config files, which takes it. */ -static DEFINE_MUTEX (config_set_mutex); - -/* Called with config_set_mutex held. */ static int perf_config__init (void ) + __must_hold(&config_set_mutex) {if (config_set ==NULL ) config_set =perf_config_set__new ();
@@ -975,7 +982,7 @@ int perf_config__set_variable(const char *var, const char *value)/* Static: the parser publishes it as config_file_name. */ { -static char path[PATH_MAX ]; + static char path[PATH_MAX] __guarded_by(&config_update_mutex);char *user_config =mkpath (path,sizeof (path),"%s/.perfconfig" ,getenv ("HOME" )); config_filename = config_exclusive_filename ?: user_config;
tools/perf/util/env.c +1 -0
@@ -302,6 +302,7 @@ void perf_env__exit(struct perf_env *env) }void perf_env__init (struct perf_env *env) +__context_unsafe (/* initialization */ ) {memset (env,0 ,sizeof (*env));#ifdef HAVE_LIBBPF_SUPPORT
tools/perf/util/env.h +11 -8
@@ -139,16 +139,16 @@ struct perf_env {*/ struct {struct rw_semaphore lock; -struct rb_root infos; -u32 infos_cnt; -struct rb_root btfs; -u32 btfs_cnt; + struct rb_root infos __guarded_by(&lock); + u32 infos_cnt __guarded_by(&lock); + struct rb_root btfs __guarded_by(&lock); + u32 btfs_cnt __guarded_by(&lock); } bpf_progs;#endif // HAVE_LIBBPF_SUPPORT /* same reason as above (for perf-top) */ struct {struct rw_semaphore lock; -struct rb_root tree; + struct rb_root tree __guarded_by(&lock); } cgroups;/* For fast cpu to numa node lookup via perf_env__numa_node */
@@ -223,7 +223,8 @@ int perf_env__nr_cpus_avail(struct perf_env *env);void perf_env__init (struct perf_env *env);#ifdef HAVE_LIBBPF_SUPPORT bool __perf_env__insert_bpf_prog_info(struct perf_env *env, -struct bpf_prog_info_node *info_node); + struct bpf_prog_info_node *info_node) + __must_hold(&env->bpf_progs.lock);bool perf_env__insert_bpf_prog_info (struct perf_env *env,struct bpf_prog_info_node *info_node); struct bpf_prog_info_node *perf_env__find_bpf_prog_info(struct perf_env *env,
@@ -233,9 +234,11 @@ void perf_env__iterate_bpf_prog_info(struct perf_env *env, void *data), void *data);bool perf_env__insert_btf (struct perf_env *env,struct btf_node *btf_node); -bool __perf_env__insert_btf (struct perf_env *env,struct btf_node *btf_node); +bool __perf_env__insert_btf(struct perf_env *env, struct btf_node *btf_node) + __must_hold(&env->bpf_progs.lock);struct btf_node *perf_env__find_btf (struct perf_env *env,__u32 btf_id); -struct btf_node *__perf_env__find_btf (struct perf_env *env,__u32 btf_id); +struct btf_node *__perf_env__find_btf (struct perf_env *env,__u32 btf_id) + __must_hold_shared(&env->bpf_progs.lock);#endif // HAVE_LIBBPF_SUPPORT int perf_env__numa_node (struct perf_env *env,struct perf_cpu cpu);
tools/perf/util/intel-tpebs.c +37 -49
230 lines not on this page · raw message
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v1 09/10] perf config, intel-tpebs, env: Add __guarded_by and __must_hold annotations
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [High] perf: double close of tpebs_cmd.out file descriptor --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] perf: double close of tpebs_cmd.out file descriptor
--
commit 6138e7835465a4c85543c9abbf52c07f583bbb7a
Author: Ian Rogers <[email protected]>
perf config, intel-tpebs, env: Add __guarded_by and __must_hold annotations
Add thread safety annotations to the static parser and config state, the TPEBS state, and the bpf_progs and cgroups trees. It also fixes some unlocked reads and modernizes mutex initialization.
Quoted 10 lines
tools/perf/util/intel-tpebs.c +1
-0@@ -331,13 +317,15 @@ static int tpebs_stop(void) __must_hold(tpebs_mtx_get())/* Like tpebs_start, we should only run tpebs_end once. */ if (tpebs_cmd.pid !=0 ) {pid_t actual_pid = tpebs_cmd.pid; +pthread_t reader_thread; tpebs_stopping = true;
tools/perf/util/intel-tpebs.c static int tpebs_stop(void) __must_hold(tpebs_mtx_get()) · line 329
Quoted 10 lines
tools/perf/util/intel-tpebs.c +4
-3tpebs_send_record_cmd (EVLIST_CTL_CMD_STOP_TAG ); tpebs_cmd.pid =0 ; -mutex_unlock (tpebs_mtx_get ()); -pthread_join (tpebs_reader_thread,NULL ); -mutex_lock (tpebs_mtx_get ()); + reader_thread = tpebs_reader_thread; +mutex_unlock (&tpebs_mtx); +pthread_join (reader_thread,NULL ); +mutex_lock (&tpebs_mtx);if (control_fd[0 ] >=0 ) {
[Severity: High]
Could this sequence result in a double close of the tpebs_cmd.out file descriptor?
The reader thread __sample_reader() assigns tpebs_cmd.out to data.file.fd and passes it to perf_session__new(). When the thread finishes, it calls perf_session__delete(), which invokes perf_data__close() and closes the underlying file descriptor:
tools/perf/util/data.c:perf_data_file__close() {
...
} else {
close(file->fd);
file->fd = -1;
}...
}
Meanwhile, after pthread_join() completes here in tpebs_stop(), the global tpebs_cmd.out variable is still >= 0 because the reader thread only closed its local struct copy without updating the global state.
This causes tpebs_stop() to explicitly call close() a second time just below this block:
tools/perf/util/intel-tpebs.c:tpebs_stop() {
...
if (tpebs_cmd.out >= 0) {
close(tpebs_cmd.out);
tpebs_cmd.out = -1;
}...
}
If another thread is assigned the same fd number in the window between the first close in __sample_reader() and this second close in tpebs_stop(), the second close could silently destroy an unrelated resource.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=9
Ian Rogers
reviewerPATCH 10/10 perf maps: Add context analysis annotations
In reply to Ian RogersAdd __returns_ctx_lock() to maps__lock(), annotate DECLARE_RC_STRUCT(maps) members protected by lock with __guarded_by(&lock), and annotate internal maps helpers with __must_hold() and __must_hold_shared().
--- tools/perf/util/maps.c | 122 ++++++++++++++++++++++++++--------------- 1 file changed, 78 insertions(+), 44 deletions(-)
tools/perf/util/maps.c +78 -44
@@ -30,12 +30,12 @@ DECLARE_RC_STRUCT(maps) {* @maps_by_address: array of maps sorted by their starting address if * maps_by_address_sorted is true. */ -struct map **maps_by_address; + struct map **maps_by_address __guarded_by(&lock);/** * @maps_by_name: optional array of maps sorted by their dso name if * maps_by_name_sorted is true. */ -struct map **maps_by_name; + struct map **maps_by_name __guarded_by(&lock);struct machine *machine;#ifdef HAVE_LIBUNWIND_SUPPORT void *addr_space;
@@ -50,26 +50,33 @@ DECLARE_RC_STRUCT(maps) {* @nr_maps: number of maps_by_address, and possibly maps_by_name, * entries that contain maps. */ -unsigned int nr_maps; + unsigned int nr_maps __guarded_by(&lock);/** * @nr_maps_allocated: number of entries in maps_by_address and possibly * maps_by_name. */ -unsigned int nr_maps_allocated; + unsigned int nr_maps_allocated __guarded_by(&lock);/** * @last_search_by_name_idx: cache of last found by name entry's index * as frequent searches for the same dso name are common. */ unsigned int last_search_by_name_idx;/** @maps_by_address_sorted: is maps_by_address sorted. */ -bool maps_by_address_sorted; + bool maps_by_address_sorted __guarded_by(&lock);/** @maps_by_name_sorted: is maps_by_name sorted. */ -bool maps_by_name_sorted; + bool maps_by_name_sorted __guarded_by(&lock);/** @ends_broken: does the map contain a map where end values are unset/unsorted? */ -bool ends_broken; + bool ends_broken __guarded_by(&lock); }; +static struct rw_semaphore *maps__lock (const struct maps *maps) + __returns_ctx_lock(&RC_CHK_ACCESS(maps)->lock) +{ +return (struct rw_semaphore *)&RC_CHK_ACCESS (maps)->lock; +} +static void check_invariants (const struct maps *maps__maybe_unused ) +__must_hold_shared (maps__lock (maps)) {#ifndef NDEBUG assert (RC_CHK_ACCESS (maps)->nr_maps <=RC_CHK_ACCESS (maps)->nr_maps_allocated);
@@ -119,55 +126,65 @@ static void check_invariants(const struct maps *maps __maybe_unused) }static struct map **maps__maps_by_address (const struct maps *maps) +__must_hold_shared (maps__lock (maps)) {return RC_CHK_ACCESS (maps)->maps_by_address; }static void maps__set_maps_by_address (struct maps *maps,struct map **new) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->maps_by_address = new; }static void maps__set_nr_maps_allocated (struct maps *maps,unsigned int nr_maps_allocated) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->nr_maps_allocated = nr_maps_allocated; }static void maps__set_nr_maps (struct maps *maps,unsigned int nr_maps) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->nr_maps = nr_maps; }/* Not in the header, to aid reference counting. */ static struct map **maps__maps_by_name (const struct maps *maps) +__must_hold_shared (maps__lock (maps)) {return RC_CHK_ACCESS (maps)->maps_by_name; }static void maps__set_maps_by_name (struct maps *maps,struct map **new) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->maps_by_name = new; }static bool maps__maps_by_address_sorted (const struct maps *maps) +__must_hold_shared (maps__lock (maps)) {return RC_CHK_ACCESS (maps)->maps_by_address_sorted; }static void maps__set_maps_by_address_sorted (struct maps *maps,bool value) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->maps_by_address_sorted = value; }static bool maps__maps_by_name_sorted (const struct maps *maps) +__must_hold_shared (maps__lock (maps)) {return RC_CHK_ACCESS (maps)->maps_by_name_sorted; }static void maps__set_maps_by_name_sorted (struct maps *maps,bool value) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->maps_by_name_sorted = value; }
@@ -177,11 +194,22 @@ struct machine *maps__machine(const struct maps *maps)return RC_CHK_ACCESS (maps)->machine; } -unsigned int maps__nr_maps (const struct maps *maps) +static unsigned int __maps__nr_maps (const struct maps *maps) +__must_hold_shared (maps__lock (maps)) {return RC_CHK_ACCESS (maps)->nr_maps; } +unsigned int maps__nr_maps (const struct maps *maps) +{ +unsigned int nr; + +down_read (maps__lock (maps)); + nr =__maps__nr_maps (maps); +up_read (maps__lock (maps)); +return nr; +} +refcount_t *maps__refcnt (struct maps *maps) {return &RC_CHK_ACCESS (maps)->refcnt;
@@ -220,12 +248,8 @@ void maps__set_libdw_addr_space_dwfl(struct maps *maps, void *dwfl) }#endif -static struct rw_semaphore *maps__lock (struct maps *maps) -{ -return &RC_CHK_ACCESS (maps)->lock; -} -static void maps__init (struct maps *maps,struct machine *machine) +__context_unsafe (/* initialization */ ) {init_rwsem (maps__lock (maps));RC_CHK_ACCESS (maps)->maps_by_address =NULL ;
@@ -247,11 +271,12 @@ static void maps__init(struct maps *maps, struct machine *machine) }static void maps__exit (struct maps *maps) +__context_unsafe (/* teardown */ ) {struct map **maps_by_address =maps__maps_by_address (maps);struct map **maps_by_name =maps__maps_by_name (maps); -for (unsigned int i =0 ; i <maps__nr_maps (maps); i++) { +for (unsigned int i =0 ; i <__maps__nr_maps (maps); i++) {map__zput (maps_by_address[i]);if (maps_by_name)map__zput (maps_by_name[i]);
@@ -300,6 +325,7 @@ void maps__put(struct maps *maps) }static void __maps__free_maps_by_name (struct maps *maps) +__must_hold (maps__lock (maps)) {if (!maps__maps_by_name (maps))return ;
@@ -307,7 +333,7 @@ static void __maps__free_maps_by_name(struct maps *maps)/* * Free everything to try to do it from the rbtree in the next search */ -for (unsigned int i =0 ; i <maps__nr_maps (maps); i++) +for (unsigned int i =0 ; i <__maps__nr_maps (maps); i++)map__put (maps__maps_by_name (maps)[i]);zfree (&RC_CHK_ACCESS (maps)->maps_by_name);
@@ -340,12 +366,13 @@ static int map__start_cmp(const void *a, const void *b) }static void __maps__sort_by_address (struct maps *maps) +__must_hold (maps__lock (maps)) {if (maps__maps_by_address_sorted (maps))return ;qsort (maps__maps_by_address (maps), -maps__nr_maps (maps), +__maps__nr_maps (maps),sizeof (struct map *), map__start_cmp);maps__set_maps_by_address_sorted (maps, true);
@@ -388,7 +415,7 @@ static int maps__sort_by_name(struct maps *maps) err = -ENOMEM ; else {struct map **maps_by_address =maps__maps_by_address (maps); -unsigned int n =maps__nr_maps (maps); +unsigned int n =__maps__nr_maps (maps);maps__set_maps_by_name (maps, maps_by_name);for (unsigned int i =0 ; i < n; i++)
@@ -397,7 +424,7 @@ static int maps__sort_by_name(struct maps *maps) }if (!err) {qsort (maps_by_name, -maps__nr_maps (maps), +__maps__nr_maps (maps),sizeof (struct map *), map__strcmp);maps__set_maps_by_name_sorted (maps, true);
@@ -409,18 +436,19 @@ static int maps__sort_by_name(struct maps *maps) }static unsigned int maps__by_address_index (const struct maps *maps,const struct map *map) +__must_hold_shared (maps__lock (maps)) {struct map **maps_by_address =maps__maps_by_address (maps);if (maps__maps_by_address_sorted (maps)) {struct map **mapp = -bsearch (&map,maps__maps_by_address (maps),maps__nr_maps (maps), +bsearch (&map,maps__maps_by_address (maps),__maps__nr_maps (maps),sizeof (*mapp), map__start_cmp);if (mapp)return mapp - maps_by_address; }else { -for (unsigned int i =0 ; i <maps__nr_maps (maps); i++) { +for (unsigned int i =0 ; i <__maps__nr_maps (maps); i++) {if (RC_CHK_ACCESS (maps_by_address[i]) ==RC_CHK_ACCESS (map))return i; }
@@ -430,18 +458,19 @@ static unsigned int maps__by_address_index(const struct maps *maps, const struct }static unsigned int maps__by_name_index (const struct maps *maps,const struct map *map) +__must_hold_shared (maps__lock (maps)) {struct map **maps_by_name =maps__maps_by_name (maps);if (maps__maps_by_name_sorted (maps)) {struct map **mapp = -bsearch (&map, maps_by_name,maps__nr_maps (maps), +bsearch (&map, maps_by_name,__maps__nr_maps (maps),sizeof (*mapp), map__strcmp);if (mapp)return mapp - maps_by_name; }else { -for (unsigned int i =0 ; i <maps__nr_maps (maps); i++) { +for (unsigned int i =0 ; i <__maps__nr_maps (maps); i++) {if (RC_CHK_ACCESS (maps_by_name[i]) ==RC_CHK_ACCESS (map))return i; }
@@ -470,10 +499,11 @@ static void map__set_kmap_maps(struct map *map, struct maps *maps) }static int __maps__insert (struct maps *maps,struct map *new) +__must_hold (maps__lock (maps)) {struct map **maps_by_address =maps__maps_by_address (maps);struct map **maps_by_name =maps__maps_by_name (maps); -unsigned int nr_maps =maps__nr_maps (maps); +unsigned int nr_maps =__maps__nr_maps (maps);unsigned int nr_allocate =RC_CHK_ACCESS (maps)->nr_maps_allocated;if (nr_maps +1 > nr_allocate) {
@@ -540,10 +570,11 @@ int maps__insert(struct maps *maps, struct map *map) }static void __maps__remove (struct maps *maps,struct map *map) +__must_hold (maps__lock (maps)) {struct map **maps_by_address =maps__maps_by_address (maps);struct map **maps_by_name =maps__maps_by_name (maps); -unsigned int nr_maps =maps__nr_maps (maps); +unsigned int nr_maps =__maps__nr_maps (maps);unsigned int address_idx;/* Slide later mappings over the one to remove */
@@ -623,7 +654,7 @@ bool maps__empty(struct maps *maps)bool res;down_read (maps__lock (maps)); - res =maps__nr_maps (maps) ==0 ; + res =__maps__nr_maps (maps) ==0 ;up_read (maps__lock (maps));return res;
@@ -651,7 +682,7 @@ int maps__for_each_map(struct maps *maps, int (*cb)(struct map *map, void *data)* the array - this may cause maps to be skipped or * repeated. */ -for (unsigned int i =0 ; i <maps__nr_maps (maps); i++) { +for (unsigned int i =0 ; i <__maps__nr_maps (maps); i++) {struct map **maps_by_address =maps__maps_by_address (maps);struct map *map = maps_by_address[i];
@@ -678,7 +709,7 @@ int maps__load_maps(struct maps *maps)return 0 ;down_read (maps__lock (maps)); - nr_maps =maps__nr_maps (maps); + nr_maps =__maps__nr_maps (maps);if (nr_maps ==0 ) {up_read (maps__lock (maps));return 0 ;
@@ -711,7 +742,7 @@ void maps__remove_maps(struct maps *maps, bool (*cb)(struct map *map, void *datadown_write (maps__lock (maps)); maps_by_address =maps__maps_by_address (maps); -for (unsigned int i =0 ; i <maps__nr_maps (maps);) { +for (unsigned int i =0 ; i <__maps__nr_maps (maps);) {if (cb (maps_by_address[i], data)) {__maps__remove (maps, maps_by_address[i]); removed = true;
@@ -765,7 +796,7 @@ struct symbol *maps__find_symbol_by_name(struct maps *maps, const char *name, st* This prevents deadlocking if iteration triggers further map insertions. */ down_read (maps__lock (maps)); - nr_maps =maps__nr_maps (maps); + nr_maps =__maps__nr_maps (maps); maps_copy =calloc (nr_maps,sizeof (*maps_copy));if (maps_copy) {for (unsigned int i =0 ; i < nr_maps; i++) {
@@ -850,9 +881,10 @@ size_t maps__fprintf(struct maps *maps, FILE *fp)* Same as find_vma() in kernel. */ static unsigned int first_ending_after (struct maps *maps,const struct map *map) +__must_hold_shared (maps__lock (maps)) {struct map **maps_by_address =maps__maps_by_address (maps); -int low =0 , high = (int )maps__nr_maps (maps) -1 , first = high +1 ; +int low =0 , high = (int )__maps__nr_maps (maps) -1 , first = high +1 ;assert (maps__maps_by_address_sorted (maps));if (low <= high &&map__end (maps_by_address[0 ]) >map__start (map))
@@ -877,10 +909,11 @@ static unsigned int first_ending_after(struct maps *maps, const struct map *map)static int __maps__insert_sorted (struct maps *maps,unsigned int first_after_index,struct map *new1,struct map *new2) +__must_hold (maps__lock (maps)) {struct map **maps_by_address =maps__maps_by_address (maps);struct map **maps_by_name =maps__maps_by_name (maps); -unsigned int nr_maps =maps__nr_maps (maps); +unsigned int nr_maps =__maps__nr_maps (maps);unsigned int nr_allocate =RC_CHK_ACCESS (maps)->nr_maps_allocated;unsigned int to_add = new2 ?2 :1 ;
@@ -937,6 +970,7 @@ static int __maps__insert_sorted(struct maps *maps, unsigned int first_after_ind* adjusted or removed so that new fits without overlapping any entries. */ static int __maps__fixup_overlap_and_insert (struct maps *maps,struct map *new) +__must_hold (maps__lock (maps)) {int err =0 ;unsigned int i, ni =INT_MAX ;// Some gcc complain, but depends on maps_by_name...
@@ -948,7 +982,7 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new)* Iterate through entries where the end of the existing entry is * greater-than the new map's start. */ -for (i =first_ending_after (maps, new); i <maps__nr_maps (maps); ) { +for (i =first_ending_after (maps, new); i <__maps__nr_maps (maps); ) {struct map **maps_by_address =maps__maps_by_address (maps);struct map **maps_by_name =maps__maps_by_name (maps);struct map *pos = maps_by_address[i];
@@ -1059,7 +1093,7 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new)return err; }else {struct map *next =NULL ; -unsigned int nr_maps =maps__nr_maps (maps); +unsigned int nr_maps =__maps__nr_maps (maps);if (i +1 < nr_maps) next = maps_by_address[i +1 ];
@@ -1143,8 +1177,8 @@ int maps__copy_from(struct maps *dest, struct maps *parent) }#endif parent_maps_by_address =maps__maps_by_address (parent); - n =maps__nr_maps (parent); -if (maps__nr_maps (dest) ==0 ) { + n =__maps__nr_maps (parent); +if (__maps__nr_maps (dest) ==0 ) {/* No existing mappings so just copy from parent to avoid reallocs in insert. */ unsigned int nr_maps_allocated =RC_CHK_ACCESS (parent)->nr_maps_allocated; struct map **dest_maps_by_address =
@@ -1228,7 +1262,7 @@ struct map *maps__find(struct maps *maps, u64 ip)if (maps__maps_by_address_sorted (maps)) {struct map **mapp =NULL ;struct map **maps_by_address =maps__maps_by_address (maps); -unsigned int nr_maps =maps__nr_maps (maps); +unsigned int nr_maps =__maps__nr_maps (maps);if (maps_by_address && nr_maps) mapp = bsearch(&ip, maps_by_address, nr_maps, sizeof(*mapp),
@@ -1264,7 +1298,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name)/* First check last found entry. */ i =RC_CHK_ACCESS (maps)->last_search_by_name_idx; -if (i <maps__nr_maps (maps) &&maps__maps_by_name (maps)) { +if (i <__maps__nr_maps (maps) &&maps__maps_by_name (maps)) {struct dso *dso =map__dso (maps__maps_by_name (maps)[i]);if (dso &&strcmp (dso__short_name (dso), name) ==0 ) {
@@ -1276,7 +1310,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name)/* Second search sorted array. */ if (!done &&maps__maps_by_name_sorted (maps)) {struct map **mapp = -bsearch (name,maps__maps_by_name (maps),maps__nr_maps (maps), +bsearch (name,maps__maps_by_name (maps),__maps__nr_maps (maps),sizeof (*mapp), map__strcmp_name);if (mapp) {
@@ -1299,7 +1333,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name)down_read (maps__lock (maps)); maps_by_address =maps__maps_by_address (maps); - n =maps__nr_maps (maps); + n =__maps__nr_maps (maps);for (i =0 ; i < n; i++) {struct map *pos = maps_by_address[i];struct dso *dso =map__dso (pos);
@@ -1329,7 +1363,7 @@ struct map *maps__find_next_entry(struct maps *maps, struct map *map)down_read (maps__lock (maps)); } i =maps__by_address_index (maps, map); -if (++i <maps__nr_maps (maps)) +if (++i <__maps__nr_maps (maps)) result =map__get (maps__maps_by_address (maps)[i]);up_read (maps__lock (maps));
@@ -1346,7 +1380,7 @@ void maps__fixup_end(struct maps *maps)__maps__sort_by_address (maps); maps_by_address =maps__maps_by_address (maps); - n =maps__nr_maps (maps); + n =__maps__nr_maps (maps);for (unsigned int i =1 ; i < n; i++) {struct map *prev = maps_by_address[i -1 ];struct map *curr = maps_by_address[i];
@@ -1393,7 +1427,7 @@ int maps__merge_in(struct maps *kmaps, struct map *new_map) first_after_ =first_ending_after (kmaps, new_map); kmaps_maps_by_address =maps__maps_by_address (kmaps); -if (first_after_ >=maps__nr_maps (kmaps) || +if (first_after_ >=__maps__nr_maps (kmaps) ||map__start (kmaps_maps_by_address[first_after_]) >=map__end (new_map)) {/* No overlap so regular insert suffices. */ up_read (maps__lock (kmaps));
@@ -1408,7 +1442,7 @@ int maps__merge_in(struct maps *kmaps, struct map *new_map) first_after_ =first_ending_after (kmaps, new_map); kmaps_maps_by_address =maps__maps_by_address (kmaps); - kmaps__nr_maps =maps__nr_maps (kmaps); + kmaps__nr_maps =__maps__nr_maps (kmaps);if (first_after_ >= kmaps__nr_maps ||map__start (kmaps_maps_by_address[first_after_]) >=map__end (new_map)) {
@@ -1461,7 +1495,7 @@ void maps__load_first(struct maps *maps) {down_read (maps__lock (maps)); -if (maps__nr_maps (maps) >0 ) +if (__maps__nr_maps (maps) >0 )map__load (maps__maps_by_address (maps)[0 ]);up_read (maps__lock (maps));
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v1 10/10] perf maps: Add context analysis annotations
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Medium] perf maps: Recursive read-to-write deadlock in maps__load_first() --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] perf maps: Recursive read-to-write deadlock in maps__load_first() --
commit a66bec7dd23ce4df0be90007a645d5cd9c4e05dc
Author: Ian Rogers <[email protected]>
perf maps: Add context analysis annotations
This commit adds compiler context analysis annotations to the perf maps subsystem. It annotates map struct fields and internal helper functions to verify locking invariants at compile time.
Quoted 3 lines
tools/perf/util/maps.c +0
-0
[ ... ]
tools/perf/util/maps.c void maps__load_first(struct maps *maps) · line 1499
Quoted 7 lines
tools/perf/util/maps.c +1
-1@@ -1495,7 +1495,7 @@ void maps__load_first(struct maps *maps) {down_read (maps__lock (maps)); -if (maps__nr_maps (maps) >0 ) +if (__maps__nr_maps (maps) >0 )map__load (maps__maps_by_address (maps)[0 ]);
[Severity: Medium]
Can this lead to a recursive read-to-write deadlock on maps__lock?
Here in maps__load_first(), maps__lock is acquired in read mode via down_read() before calling map__load(). For kernel maps on x86_64, map__load() triggers the x86_64 entry trampolines mapping:
map__load()
-> dso__load()
-> machine__map_x86_64_entry_trampolines()
-> machine__create_extra_kernel_map()The machine__create_extra_kernel_map() function then inserts a new map into the same kernel maps array:
tools/perf/util/machine.c:machine__create_extra_kernel_map() {
...
err = maps__insert(machine__kernel_maps(machine), map);
...
}And maps__insert() attempts to acquire the exact same lock in write mode:
tools/perf/util/maps.c:maps__insert() {
...
down_write(maps__lock(maps));
...
}Since maps__load_first() still holds the read lock when map__load() is called, wouldn't the down_write() in maps__insert() cause a self-deadlock? Other APIs like maps__load_maps() copy the map array and drop the read lock before loading to explicitly prevent this scenario.
Quoted 3 lines
tools/perf/util/maps.c +0
-0up_read (maps__lock (maps)); }
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=10
Ian Rogers
reviewerv2 cover tools/perf: Adopt kernel compiler-context-analysis.h annotations
In reply to Ian RogersThe perf tool previously added Clang thread-safety annotations in tools/perf/util/mutex.h (GUARDED_BY, LOCKABLE, EXCLUSIVE_LOCK_FUNCTION, UNLOCK_FUNCTION, etc.). Since then, the Linux kernel has adopted a unified set of static context analysis macros and attributes in include/linux/compiler-context-analysis.h (context_lock_struct, __guarded_by, __acquires, __releases, __must_hold, etc.).
This series makes tools/include/linux/compiler-context-analysis.h functional by synchronizing it and the required compiler_types.h helpers with the kernel headers, converts tools/perf from its custom mutex.h macros to the kernel-style compiler-context-analysis.h annotations, and expands context analysis coverage across comm, dso/dsos, thread/threads, config, intel-tpebs, env, and maps. In the process, it fixes an unlocked __dsos__add() call and TOCTOU race in __machine__addnew_vdso(), avoids dropping dso__data_open_lock in dso__list_del() under REFCNT_CHECKING, fixes an unlocked read of tpebs_reader_thread and double-close of tpebs_cmd.out in intel-tpebs, avoids a potential read-to-write deadlock in maps__load_first(), and adds a read-lock fast path to dsos__findnew_id().
v2:
- Use -c rather than -E when probing for -fexperimental-late-parse-attributes in Makefile.config to avoid -Werror,-Wunused-command-line-argument (patch 5).
- Acquire machine->dsos.lock in write mode across duplicate checking,
dso__set_long_name(), and __dsos__add() in __machine__addnew_vdso()
(patch 7).
- Release the REFCNT_CHECKING reference in dso__list_del() without
dropping dso__data_open_lock, avoiding an unlocked window and AB-BA
deadlock with dso->lock, and check dso__data(dso)->dso in dso__put()
(patch 7). - Pass tpebs_cmd.out directly to __sample_reader() and set tpebs_cmd.out = -1 in evsel__tpebs_open() to avoid a double-close in tpebs_stop(), and clarify the config_set_mutex comment (patch 9).
- Drop maps__lock before calling map__load() in maps__load_first() to avoid a read-to-write self-deadlock when loading kernel maps inserts additional trampoline maps (patch 10).
Ian Rogers (10):
compiler-context-analysis: Avoid unused parameter warning in
_context_unsafe_alias()
tools headers compiler: Synchronize compiler_types.h with the kernel
sources
tools headers: Synchronize linux/compiler-context-analysis.h with the
kernel sources
perf mutex: Use kernel style compiler-context-analysis.h annotations perf build: Enable additional Clang thread-safety flags perf comm: Add __guarded_by annotations to struct comm_strs perf dso: Fix unlocked __dsos__add() in vdso and expand lock
annotations
perf thread: Expand context analysis annotations to threads and
namespaces_lock
perf config, intel-tpebs, env: Add __guarded_by and __must_hold
annotations
perf maps: Add context analysis annotations
include/linux/compiler-context-analysis.h | 2 +- .../include/linux/compiler-context-analysis.h | 518 ++++++++++++++++-- tools/include/linux/compiler-gcc.h | 55 +- tools/include/linux/compiler.h | 50 +- tools/include/linux/compiler_types.h | 206 ++++++- tools/perf/Makefile.config | 5 +- tools/perf/builtin-sched.c | 16 +- tools/perf/builtin-top.c | 4 +- tools/perf/check-headers.sh | 1 + tools/perf/tests/dso-data.c | 4 + tools/perf/util/annotate.c | 4 +- tools/perf/util/annotate.h | 8 +- tools/perf/util/bpf-event.h | 5 +- tools/perf/util/comm.c | 10 +- tools/perf/util/config.c | 43 +- tools/perf/util/dso.c | 93 ++-- tools/perf/util/dso.h | 12 +- tools/perf/util/dsos.c | 35 +- tools/perf/util/dsos.h | 12 +- tools/perf/util/env.c | 1 + tools/perf/util/env.h | 19 +- tools/perf/util/intel-tpebs.c | 98 ++-- tools/perf/util/libbfd.c | 4 +- tools/perf/util/maps.c | 133 +++-- tools/perf/util/mutex.c | 4 +- tools/perf/util/mutex.h | 90 +-- tools/perf/util/rwsem.c | 8 +- tools/perf/util/rwsem.h | 10 +- tools/perf/util/thread.c | 10 +- tools/perf/util/thread.h | 30 +- tools/perf/util/threads.c | 4 + tools/perf/util/threads.h | 6 +- tools/perf/util/vdso.c | 17 +- 33 files changed, 1095 insertions(+), 422 deletions(-)
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
Ian Rogers
reviewerPATCH v2 1/10 compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias()
_context_unsafe_alias() does not use its parameter 'p', which triggers -Wunused-parameter when building code that enables -Wextra (such as tools/perf, tools/lib/perf, tools/lib/subcmd, and tools/lib/symbol). Explicitly cast 'p' to void to silence the warning, matching __assume_ctx_lock() and __assume_shared_ctx_lock().
--- include/linux/compiler-context-analysis.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/compiler-context-analysis.h +1 -1
@@ -243,7 +243,7 @@* alias as a function argument). */ #define context_unsafe_alias (p) _context_unsafe_alias((void **)&(p)) -static inline void _context_unsafe_alias (void **p) { } +static inline void _context_unsafe_alias (void **p) { (void )p; }/** * token_context_lock() - declare an abstract global context lock instance
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v2 01/10] compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias()
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 8 lines
_context_unsafe_alias()does not use its parameter 'p', which triggers -Wunused-parameter when building code that enables -Wextra (such astools/perf,tools/lib/perf,tools/lib/subcmd, andtools/lib/symbol). Explicitly cast 'p' to void to silence the warning, matching__assume_ctx_lock()and__assume_shared_ctx_lock().Assisted-by Antigravity:gemini-3.1-proSigned-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Re: [PATCH v2 01/10] compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias()
In reply to Ian RogersQuoted 9 lines · Ian Rogers
_context_unsafe_alias()does not use its parameter 'p', which triggers -Wunused-parameter when building code that enables -Wextra (such astools/perf,tools/lib/perf,tools/lib/subcmd, andtools/lib/symbol). Explicitly cast 'p' to void to silence the warning, matching__assume_ctx_lock()and__assume_shared_ctx_lock().Assisted-by Antigravity:gemini-3.1-proSigned-off-by Ian Rogers <[email protected]>
Re __attribute__((unused)): I suppose it could work, but (void)p is the more minimal solution that is not uncommon across the kernel. I don't see a downside, and less code is better.
Thanks!
Quoted 20 lines
--- include/linux/compiler-context-analysis.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/linux/compiler-context-analysis.h +1
-2@@ -243,7 +243,7 @@* alias as a function argument). */ #define context_unsafe_alias (p) _context_unsafe_alias((void **)&(p)) -static inline void _context_unsafe_alias (void **p) { } +static inline void _context_unsafe_alias (void **p) { (void )p; }/** * token_context_lock() - declare an abstract global context lock instance -- 2.56.0.385.gd3acb90ef8-goog
Ian Rogers
reviewerPATCH v2 2/10 tools headers compiler: Synchronize compiler_types.h with the kernel sources
In reply to Ian RogersSynchronize the non-__KERNEL__ sections of tools/include/linux/compiler_types.h and tools/include/linux/compiler-gcc.h with the kernel sources (including ___PASTE/__PASTE, BTF_TYPE_TAG, object-size helpers, asm_goto_output, ASM_INPUT_*, asm_inline, __typeof_unqual__/__unqual_scalar_typeof, __signed_scalar_typeof, __native_word, compiletime_assert, and the __diag pragma helpers required by compiler-context-analysis.h), and remove the duplicated definitions from tools/include/linux/compiler.h.
--- tools/include/linux/compiler-gcc.h | 55 ++++++- tools/include/linux/compiler.h | 50 +------ tools/include/linux/compiler_types.h | 206 ++++++++++++++++++++++++++- 3 files changed, 258 insertions(+), 53 deletions(-)
tools/include/linux/compiler-gcc.h +52 -3
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _TOOLS_LINUX_COMPILER_H_ +#ifndef __LINUX_COMPILER_TYPES_H#error "Please do not include <linux/compiler-gcc.h> directly, include <linux/compiler.h> instead." -#endif +#endif /* __LINUX_COMPILER_TYPES_H */ /* * Common definitions for all gcc versions go here.
@@ -33,10 +33,59 @@#define __packed __attribute__((packed))#endif #ifndef __noreturn -#define __noreturn __attribute__((noreturn)) +#define __noreturn __attribute__((__noreturn__))#endif #ifndef __aligned#define __aligned (x) __attribute__((aligned(x)))#endif #define __printf (a, b) __attribute__((format(printf, a, b)))#define __scanf (a, b) __attribute__((format(scanf, a, b))) + +/* +* Turn individual warnings and errors on and off locally, depending +* on version. +*/ +#define __diag_str1 (s) #s +#define __diag_str (s) __diag_str1(s) + +#ifdef __clang__ +#define __diag_clang (version, severity, s) \ + __diag_clang_ ## version(__diag_clang_ ## severity s) + +/* Severity used in pragma directives */ +#define __diag_clang_ignore ignored +#define __diag_clang_warn warning +#define __diag_clang_error error + +#define __diag (s) _Pragma(__diag_str(clang diagnostic s)) + +#define __diag_clang_all (s) __diag(s) + +#define __diag_ignore_all (option, comment) \ + __diag_clang(all, ignore, option) + +#define CC_HAS_TYPEOF_UNQUAL (__clang_major__ > 19 || (__clang_major__ == 19 && __clang_minor__ > 0)) +#else /* !__clang__ */ +#define __diag_GCC (version, severity, s) \ + __diag_GCC_ ## version(__diag_GCC_ ## severity s) + +/* Severity used in pragma directives */ +#define __diag_GCC_ignore ignored +#define __diag_GCC_warn warning +#define __diag_GCC_error error + +#define __diag (s) _Pragma(__diag_str(GCC diagnostic s)) + +#if GCC_VERSION >=80000 +#define __diag_GCC_8 (s) __diag(s) +#else +#define __diag_GCC_8 (s) +#endif + +#define __diag_GCC_all (s) __diag(s) + +#define __diag_ignore_all (option, comment) \ + __diag(__diag_GCC_ignore option) + +#define CC_HAS_TYPEOF_UNQUAL (__GNUC__ >= 14) +#endif /* __clang__ */
tools/include/linux/compiler.h +3 -47
80 lines not on this page · raw message
tools/include/linux/compiler_types.h +203 -3
236 lines not on this page · raw message
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v2 02/10] tools headers compiler: Synchronize compiler_types.h with the kernel sources
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider: - [Medium] tools headers: missing Clang ASM_INPUT_G workarounds may cause bad inline asm - [Low] tools…
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
- [Medium] tools headers: missing Clang ASM_INPUT_G workarounds may cause bad inline asm
- [Low] tools headers: missing __diag_clang_23 breaks __diag_ignore API
--
commit 2b6bac7c46f78e737bc9e5436ea6f3f62dcfe7d3
Author: Ian Rogers <[email protected]>
tools headers compiler: Synchronize compiler_types.h with the kernel sources
Synchronize the non-__KERNEL__ sections of tools/include/linux/compiler_types.h and tools/include/linux/compiler-gcc.h with the kernel sources (including ___PASTE/__PASTE, BTF_TYPE_TAG, object-size helpers, asm_goto_output, ASM_INPUT_*, asm_inline, __typeof_unqual__/__unqual_scalar_typeof, __signed_scalar_typeof, __native_word, compiletime_assert, and the __diag pragma helpers required by compiler-context-analysis.h), and remove the duplicated definitions from tools/include/linux/compiler.h.
Quoted 4 lines
tools/include/linux/compiler-gcc.h +0
-0
[ ... ]
Quoted 26 lines
tools/include/linux/compiler-gcc.h +15
-1@@ -33,10 +33,59 @@#define __packed __attribute__((packed))#endif #ifndef __noreturn -#define __noreturn __attribute__((noreturn)) +#define __noreturn __attribute__((__noreturn__))#endif #ifndef __aligned#define __aligned (x) __attribute__((aligned(x)))#endif #define __printf (a, b) __attribute__((format(printf, a, b)))#define __scanf (a, b) __attribute__((format(scanf, a, b))) + +/* +* Turn individual warnings and errors on and off locally, depending +* on version. +*/ +#define __diag_str1 (s) #s +#define __diag_str (s) __diag_str1(s) + +#ifdef __clang__ +#define __diag_clang (version, severity, s) \ + __diag_clang_ ## version(__diag_clang_ ## severity s) + +/* Severity used in pragma directives */ +#define __diag_clang_ignore ignored
tools/include/linux/compiler-gcc.h line 66
Quoted 10 lines
tools/include/linux/compiler-gcc.h +10
-0+#define __diag_clang_warn warning +#define __diag_clang_error error + +#define __diag (s) _Pragma(__diag_str(clang diagnostic s)) + +#define __diag_clang_all (s) __diag(s) + +#define __diag_ignore_all (option, comment) \ + __diag_clang(all, ignore, option) +
[Severity: Low]
Does this missing __diag_clang_23 definition cause a regression in the __diag_ignore API for Clang?
It looks like __diag_GCC_8 was ported for GCC, but the equivalent Clang-specific diagnostic ignore request was omitted.
Could this cause a compilation failure due to an undefined macro expansion when a header uses __diag_ignore(clang, 23, ...) and is included by tools?
Quoted 5 lines
tools/include/linux/compiler-gcc.h +5
-0+#define CC_HAS_TYPEOF_UNQUAL (__clang_major__ > 19 || (__clang_major__ == 19 && __clang_minor__ > 0)) +#else /* !__clang__ */ +#define __diag_GCC (version, severity, s) \ + __diag_GCC_ ## version(__diag_GCC_ ## severity s) +
[ ... ]
Quoted 4 lines
tools/include/linux/compiler_types.h +0
-0
[ ... ]
tools/include/linux/compiler_types.h line 108
Quoted 10 lines
tools/include/linux/compiler_types.h +10
-0+/* +* Clang has trouble with constraints with multiple +* alternative behaviors ("g" , "rm" and "=rm"). +*/ +#ifndef ASM_INPUT_G +#define ASM_INPUT_G "g" +#define ASM_INPUT_RM "rm" +#define ASM_OUTPUT_RM "=rm" +#endif +
[Severity: Medium]
Will Clang incorrectly use these generic definitions and produce bad codegen because the Clang-specific overrides ("ir" and "r") were omitted from the port?
The kernel explicitly overrides these for Clang because of issues with "g" or "rm" constraints.
Since those overrides are missing here, could tools utilizing kernel arch headers end up with incorrect inline assembly behavior when built with Clang?
Quoted 3 lines
tools/include/linux/compiler_types.h +3
-0+#ifdef CONFIG_CC_HAS_ASM_INLINE +#define asm_inline asm __inline +#else
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
Ian Rogers
reviewerPATCH v2 3/10 tools headers: Synchronize linux/compiler-context-analysis.h with the kernel sources
In reply to Ian RogersReplace the no-op stub tools/include/linux/compiler-context-analysis.h with the full kernel implementation from include/linux/compiler-context-analysis.h and add it to tools/perf/check-headers.sh so future changes are tracked.
--- .../include/linux/compiler-context-analysis.h | 518 ++++++++++++++++-- tools/perf/check-headers.sh | 1 + 2 files changed, 480 insertions(+), 39 deletions(-)
tools/include/linux/compiler-context-analysis.h +479 -39
@@ -1,42 +1,482 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _TOOLS_LINUX_COMPILER_CONTEXT_ANALYSIS_H -#define _TOOLS_LINUX_COMPILER_CONTEXT_ANALYSIS_H -/* * Macros and attributes for compiler-based static context analysis. -* No-op stubs for tools. -*/ - -#define __guarded_by (...) -#define __pt_guarded_by (...) - -#define context_lock_struct (name, ...) struct __VA_ARGS__ name - -#define __no_context_analysis -#define __context_unsafe (comment) -#define context_unsafe (...) ({ __VA_ARGS__; }) -#define context_unsafe_alias (p) -#define disable_context_analysis () -#define enable_context_analysis () - -#define __must_hold (...) -#define __must_not_hold (...) -#define __acquires (...) -#define __cond_acquires (ret, x) -#define __releases (...) -#define __acquire (x) (void)0 -#define __release (x) (void)0 - -#define __must_hold_shared (...) -#define __acquires_shared (...) -#define __cond_acquires_shared (ret, x) -#define __releases_shared (...) -#define __acquire_shared (x) (void)0 -#define __release_shared (x) (void)0 - -#define __acquire_ret (call, expr) (call) -#define __acquire_shared_ret (call, expr) (call) -#define __acquires_ret -#define __acquires_shared_ret - -#endif /* _TOOLS_LINUX_COMPILER_CONTEXT_ANALYSIS_H */ +*/ + +#ifndef _LINUX_COMPILER_CONTEXT_ANALYSIS_H +#define _LINUX_COMPILER_CONTEXT_ANALYSIS_H + +#if defined(WARN_CONTEXT_ANALYSIS ) && !defined(__CHECKER__) && !defined(__GENKSYMS__) + +/* +* These attributes define new context lock (Clang: capability) types. +* Internal only. +*/ +# define __ctx_lock_type (name) __attribute__((capability(#name))) +# define __reentrant_ctx_lock __attribute__((reentrant_capability)) +# define __acquires_ctx_lock (...) __attribute__((acquire_capability(__VA_ARGS__))) +# define __acquires_shared_ctx_lock (...) __attribute__((acquire_shared_capability(__VA_ARGS__))) +# define __try_acquires_ctx_lock (ret, var) __attribute__((try_acquire_capability(ret, var))) +# define __try_acquires_shared_ctx_lock (ret, var) __attribute__((try_acquire_shared_capability(ret, var))) +# define __releases_ctx_lock (...) __attribute__((release_capability(__VA_ARGS__))) +# define __releases_shared_ctx_lock (...) __attribute__((release_shared_capability(__VA_ARGS__))) +# define __returns_ctx_lock (var) __attribute__((lock_returned(var))) + +/* +* The below are used to annotate code being checked. Internal only. +*/ +# define __excludes_ctx_lock (...) __attribute__((locks_excluded(__VA_ARGS__))) +# define __requires_ctx_lock (...) __attribute__((requires_capability(__VA_ARGS__))) +# define __requires_shared_ctx_lock (...) __attribute__((requires_shared_capability(__VA_ARGS__))) + +/* +* The "assert_capability" attribute is a bit confusingly named. It does not +* generate a check. Instead, it tells the analysis to *assume* the capability +* is held. This is used for augmenting runtime assertions, that can then help +* with patterns beyond the compiler's static reasoning abilities. +*/ +# define __assumes_ctx_lock (...) __attribute__((assert_capability(__VA_ARGS__))) +# define __assumes_shared_ctx_lock (...) __attribute__((assert_shared_capability(__VA_ARGS__))) + +/** +* __guarded_by() - struct member and globals attribute, declares variable +* only accessible within active context +* @...: context lock instance pointer(s) +* +* Declares that the struct member or global variable is only accessible within +* the context entered by the given context lock(s). Read operations on the data +* require shared access to at least one of the context locks, while write +* operations require exclusive access to all listed context locks. +* +* .. code-block:: c +* +* struct some_state { +* spinlock_t lock; +* long counter __guarded_by(&lock); +* }; +* +* struct some_state { +* spinlock_t lock1, lock2; +* long counter __guarded_by(&lock1, &lock2); +* }; +*/ +# define __guarded_by (...) __attribute__((guarded_by(__VA_ARGS__))) + +/** +* __pt_guarded_by() - struct member and globals attribute, declares pointed-to +* data only accessible within active context +* @...: context lock instance pointer(s) +* +* Declares that the data pointed to by the struct member pointer or global +* pointer is only accessible within the context entered by the given context +* lock(s). Read operations on the data require shared access to at least one +* of the context locks, while write operations require exclusive access to all +* listed context locks. +* +* .. code-block:: c +* +* struct some_state { +* spinlock_t lock; +* long *counter __pt_guarded_by(&lock); +* }; +* +* struct some_state { +* spinlock_t lock1, lock2; +* long *counter __pt_guarded_by(&lock1, &lock2); +* }; +*/ +# define __pt_guarded_by (...) __attribute__((pt_guarded_by(__VA_ARGS__))) + +/** +* context_lock_struct() - declare or define a context lock struct +* @name: struct name +* +* Helper to declare or define a struct type that is also a context lock. +* +* .. code-block:: c +* +* context_lock_struct(my_handle) { +* int foo; +* long bar; +* }; +* +* struct some_state { +* ... +* }; +* // ... declared elsewhere ... +* context_lock_struct(some_state); +* +* Note: The implementation defines several helper functions that can acquire +* and release the context lock. +*/ +# define context_lock_struct (name, ...) \ + struct __ctx_lock_type(name) __VA_ARGS__ name; \ + static __always_inline void __acquire_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __no_context_analysis __acquires_ctx_lock(var) { } \ + static __always_inline void __acquire_shared_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __no_context_analysis __acquires_shared_ctx_lock(var) { } \ + static __always_inline bool __try_acquire_ctx_lock(const struct name *var, bool ret) \ + __attribute__((overloadable)) __no_context_analysis __try_acquires_ctx_lock(1, var) \ + { return ret; } \ + static __always_inline bool __try_acquire_shared_ctx_lock(const struct name *var, bool ret) \ + __attribute__((overloadable)) __no_context_analysis __try_acquires_shared_ctx_lock(1, var) \ + { return ret; } \ + static __always_inline void __release_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __no_context_analysis __releases_ctx_lock(var) { } \ + static __always_inline void __release_shared_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __no_context_analysis __releases_shared_ctx_lock(var) { } \ + static __always_inline void __assume_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __assumes_ctx_lock(var) { } \ + static __always_inline void __assume_shared_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __assumes_shared_ctx_lock(var) { } \ + struct name + +/** +* disable_context_analysis() - disables context analysis +* +* Disables context analysis. Must be paired with a later +* enable_context_analysis(). +*/ +# define disable_context_analysis () \ + __diag_push(); \ + __diag_ignore_all("-Wunknown-warning-option", "") \ + __diag_ignore_all("-Wthread-safety", "") \ + __diag_ignore_all("-Wthread-safety-pointer", "") + +/** +* enable_context_analysis() - re-enables context analysis +* +* Re-enables context analysis. Must be paired with a prior +* disable_context_analysis(). +*/ +# define enable_context_analysis () __diag_pop() + +/** +* __no_context_analysis - function attribute, disables context analysis +* +* Function attribute denoting that context analysis is disabled for the +* whole function. Prefer use of `context_unsafe()` where possible. +*/ +# define __no_context_analysis __attribute__((no_thread_safety_analysis)) + +#else /* !WARN_CONTEXT_ANALYSIS */ + +# define __ctx_lock_type (name) +# define __reentrant_ctx_lock +# define __acquires_ctx_lock (...) +# define __acquires_shared_ctx_lock (...) +# define __try_acquires_ctx_lock (ret, var) +# define __try_acquires_shared_ctx_lock (ret, var) +# define __releases_ctx_lock (...) +# define __releases_shared_ctx_lock (...) +# define __assumes_ctx_lock (...) +# define __assumes_shared_ctx_lock (...) +# define __returns_ctx_lock (var) +# define __guarded_by (...) +# define __pt_guarded_by (...) +# define __excludes_ctx_lock (...) +# define __requires_ctx_lock (...) +# define __requires_shared_ctx_lock (...) +# define __acquire_ctx_lock (var) do { } while (0) +# define __acquire_shared_ctx_lock (var) do { } while (0) +# define __try_acquire_ctx_lock (var, ret) (ret) +# define __try_acquire_shared_ctx_lock (var, ret) (ret) +# define __release_ctx_lock (var) do { } while (0) +# define __release_shared_ctx_lock (var) do { } while (0) +# define __assume_ctx_lock (var) do { (void)(var); } while (0) +# define __assume_shared_ctx_lock (var) do { (void)(var); } while (0) +# define context_lock_struct (name, ...) struct __VA_ARGS__ name +# define disable_context_analysis () +# define enable_context_analysis () +# define __no_context_analysis + +#endif /* WARN_CONTEXT_ANALYSIS */ + +/** +* context_unsafe() - disable context checking for contained code +* +* Disables context checking for contained statements or expression. +* +* .. code-block:: c +* +* struct some_data { +* spinlock_t lock; +* int counter __guarded_by(&lock); +* }; +* +* int foo(struct some_data *d) +* { +* // ... +* // other code that is still checked ... +* // ... +* return context_unsafe(d->counter); +* } +*/ +#define context_unsafe (...) \ +({ \ + disable_context_analysis(); \ + __VA_ARGS__; \ + enable_context_analysis() \ +}) + +/** +* __context_unsafe() - function attribute, disable context checking +* @comment: comment explaining why opt-out is safe +* +* Function attribute denoting that context analysis is disabled for the +* whole function. Forces adding an inline comment as argument. +*/ +#define __context_unsafe (comment) __no_context_analysis + +/** +* context_unsafe_alias() - helper to insert a context lock "alias barrier" +* @p: pointer aliasing a context lock or object containing context locks +* +* No-op function that acts as a "context lock alias barrier", where the +* analysis rightfully detects that we're switching aliases, but the switch is +* considered safe but beyond the analysis reasoning abilities. +* +* This should be inserted before the first use of such an alias. +* +* Implementation Note: The compiler ignores aliases that may be reassigned but +* their value cannot be determined (e.g. when passing a non-const pointer to an +* alias as a function argument). +*/ +#define context_unsafe_alias (p) _context_unsafe_alias((void **)&(p)) +static inline void _context_unsafe_alias (void **p) { (void )p; } + +/** +* token_context_lock() - declare an abstract global context lock instance +* @name: token context lock name +* +* Helper that declares an abstract global context lock instance @name, but not +* backed by a real data structure (linker error if accidentally referenced). +* The type name is `__ctx_lock_@name`. +*/ +#define token_context_lock (name, ...) \ + context_lock_struct(__ctx_lock_##name, ##__VA_ARGS__) {}; \ + extern const struct __ctx_lock_##name *name + +/** +* token_context_lock_instance() - declare another instance of a global context lock +* @ctx: token context lock previously declared with token_context_lock() +* @name: name of additional global context lock instance +* +* Helper that declares an additional instance @name of the same token context +* lock class @ctx. This is helpful where multiple related token contexts are +* declared, to allow using the same underlying type (`__ctx_lock_@ctx`) as +* function arguments. +*/ +#define token_context_lock_instance (ctx, name) \ + extern const struct __ctx_lock_##ctx *name + +/* +* Common keywords for static context analysis. +*/ + +/** +* __must_hold() - function attribute, caller must hold exclusive context lock +* +* Function attribute declaring that the caller must hold the given context +* lock instance(s) exclusively. +*/ +#define __must_hold (...) __requires_ctx_lock(__VA_ARGS__) + +/** +* __must_not_hold() - function attribute, caller must not hold context lock +* +* Function attribute declaring that the caller must not hold the given context +* lock instance(s). +*/ +#define __must_not_hold (...) __excludes_ctx_lock(__VA_ARGS__) + +/** +* __acquires() - function attribute, function acquires context lock exclusively +* +* Function attribute declaring that the function acquires the given context +* lock instance(s) exclusively, but does not release them. +*/ +#define __acquires (...) __acquires_ctx_lock(__VA_ARGS__) + +/* +* Clang's analysis does not care precisely about the value, only that it is +* either zero or non-zero. So the __cond_acquires() interface might be +* misleading if we say that @ret is the value returned if acquired. Instead, +* provide symbolic variants which we translate. +*/ +#define __cond_acquires_impl_true (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_false (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_nonzero (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_0 (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_nonnull (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_NULL (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) + +/** +* __cond_acquires() - function attribute, function conditionally +* acquires a context lock exclusively +* @ret: abstract value returned by function if context lock acquired +* @x: context lock instance pointer +* +* Function attribute declaring that the function conditionally acquires the +* given context lock instance @x exclusively, but does not release it. The +* function return value @ret denotes when the context lock is acquired. +* +* @ret may be one of: true, false, nonzero, 0, nonnull, NULL. +*/ +#define __cond_acquires (ret, x) __cond_acquires_impl_##ret(x) + +/** +* __releases() - function attribute, function releases a context lock exclusively +* +* Function attribute declaring that the function releases the given context +* lock instance(s) exclusively. The associated context(s) must be active on +* entry. +*/ +#define __releases (...) __releases_ctx_lock(__VA_ARGS__) + +/* +* Clang's analysis does not care precisely about the value, only that it is +* either zero or non-zero. So the __cond_acquires() interface might be +* misleading if we say that @ret is the value returned if acquired. Instead, +* provide symbolic variants which we translate. +*/ +#define __cond_acquires_impl_not_true (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_not_false (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_not_nonzero (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_not_0 (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_not_nonnull (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_not_NULL (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) + +/** +* __cond_releases() - function attribute, function conditionally +* releases a context lock exclusively +* @ret: abstract value returned by function if context lock releases +* @x: context lock instance pointer +* +* Function attribute declaring that the function conditionally releases the +* given context lock instance @x exclusively. The associated context(s) must +* be active on entry. The function return value @ret denotes when the context +* lock is released. +* +* @ret may be one of: true, false, nonzero, 0, nonnull, NULL. +* +* NOTE: clang does not have a native attribute for this; instead implement +* it as an unconditional release and a conditional acquire for the +* inverted condition -- which is semantically equivalent. +*/ +#define __cond_releases (ret, x) __releases(x) __cond_acquires_impl_not_##ret(x) + +/** +* __acquire() - function to acquire context lock exclusively +* @x: context lock instance pointer +* +* No-op function that acquires the given context lock instance @x exclusively. +*/ +#define __acquire (x) __acquire_ctx_lock(x) + +/** +* __release() - function to release context lock exclusively +* @x: context lock instance pointer +* +* No-op function that releases the given context lock instance @x. +*/ +#define __release (x) __release_ctx_lock(x) + +/** +* __must_hold_shared() - function attribute, caller must hold shared context lock +* +* Function attribute declaring that the caller must hold the given context +* lock instance(s) with shared access. +*/ +#define __must_hold_shared (...) __requires_shared_ctx_lock(__VA_ARGS__) + +/** +* __acquires_shared() - function attribute, function acquires context lock shared +* +* Function attribute declaring that the function acquires the given +* context lock instance(s) with shared access, but does not release them. +*/ +#define __acquires_shared (...) __acquires_shared_ctx_lock(__VA_ARGS__) + +/** +* __cond_acquires_shared() - function attribute, function conditionally +* acquires a context lock shared +* @ret: abstract value returned by function if context lock acquired +* @x: context lock instance pointer +* +* Function attribute declaring that the function conditionally acquires the +* given context lock instance @x with shared access, but does not release it. +* The function return value @ret denotes when the context lock is acquired. +* +* @ret may be one of: true, false, nonzero, 0, nonnull, NULL. +*/ +#define __cond_acquires_shared (ret, x) __cond_acquires_impl_##ret(x, _shared) + +/** +* __releases_shared() - function attribute, function releases a +* context lock shared +* +* Function attribute declaring that the function releases the given context +* lock instance(s) with shared access. The associated context(s) must be +* active on entry. +*/ +#define __releases_shared (...) __releases_shared_ctx_lock(__VA_ARGS__) + +/** +* __acquire_shared() - function to acquire context lock shared +* @x: context lock instance pointer +* +* No-op function that acquires the given context lock instance @x with shared +* access. +*/ +#define __acquire_shared (x) __acquire_shared_ctx_lock(x) + +/** +* __release_shared() - function to release context lock shared +* @x: context lock instance pointer +* +* No-op function that releases the given context lock instance @x with shared +* access. +*/ +#define __release_shared (x) __release_shared_ctx_lock(x) + +/** +* __acquire_ret() - helper to acquire context lock of return value +* @call: call expression +* @ret_expr: acquire expression that uses __ret +*/ +#define __acquire_ret (call, ret_expr) \ + ({ \ + __auto_type __ret = call; \ + __acquire(ret_expr); \ + __ret; \ + }) + +/** +* __acquire_shared_ret() - helper to acquire context lock shared of return value +* @call: call expression +* @ret_expr: acquire shared expression that uses __ret +*/ +#define __acquire_shared_ret (call, ret_expr) \ + ({ \ + __auto_type __ret = call; \ + __acquire_shared(ret_expr); \ + __ret; \ + }) + +/* +* Attributes to mark functions returning acquired context locks. +* +* This is purely cosmetic to help readability, and should be used with the +* above macros as follows: +* +* struct foo { spinlock_t lock; ... }; +* ... +* #define myfunc(...) __acquire_ret(_myfunc(__VA_ARGS__), &__ret->lock) +* struct foo *_myfunc(int bar) __acquires_ret; +* ... +*/ +#define __acquires_ret __no_context_analysis +#define __acquires_shared_ret __no_context_analysis + +#endif /* _LINUX_COMPILER_CONTEXT_ANALYSIS_H */
tools/perf/check-headers.sh +1 -0
@@ -23,6 +23,7 @@ declare -a FILES=( "include/linux/bits.h" "include/vdso/bits.h" "include/linux/cfi_types.h" + "include/linux/compiler-context-analysis.h" "include/linux/const.h" "include/vdso/const.h" "include/vdso/unaligned.h"
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v2 03/10] tools headers: Synchronize linux/compiler-context-analysis.h with the kernel sources
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 7 lines
Replace the no-op stub
tools/include/linux/compiler-context-analysis.hwith the full kernel implementation frominclude/linux/compiler-context-analysis.hand add it totools/perf/check-headers.shso future changes are tracked.Assisted-by Antigravity:gemini-3.1-proSigned-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
Ian Rogers
reviewerPATCH v2 4/10 perf mutex: Use kernel style compiler-context-analysis.h annotations
In reply to Ian RogersEnable -DWARN_CONTEXT_ANALYSIS alongside -Wthread-safety for Clang builds in tools/perf/Makefile.config, replace the custom lock safety macros in tools/perf with the kernel's compiler-context-analysis.h annotations (context_lock_struct, __guarded_by, __acquires, __acquires_shared, __releases, __releases_shared, __cond_acquires, __must_hold, __must_hold_shared, __must_not_hold, __returns_ctx_lock, __no_context_analysis, and __context_unsafe), and remove the redundant macro definitions from tools/perf/util/mutex.h.
--- tools/perf/Makefile.config | 2 +- tools/perf/builtin-sched.c | 16 +++---- tools/perf/builtin-top.c | 4 +- tools/perf/util/annotate.c | 4 +- tools/perf/util/annotate.h | 8 ++-- tools/perf/util/comm.c | 4 +- tools/perf/util/dso.c | 26 +++++----- tools/perf/util/dso.h | 8 ++-- tools/perf/util/dsos.c | 6 +-- tools/perf/util/intel-tpebs.c | 6 +-- tools/perf/util/libbfd.c | 4 +- tools/perf/util/mutex.c | 4 +- tools/perf/util/mutex.h | 90 +++-------------------------------- tools/perf/util/rwsem.c | 8 ++-- tools/perf/util/rwsem.h | 10 ++-- tools/perf/util/thread.c | 8 ++-- tools/perf/util/thread.h | 2 +- 17 files changed, 66 insertions(+), 144 deletions(-)
tools/perf/Makefile.config +1 -1
@@ -64,7 +64,7 @@ ifeq ($(CC_NO_CLANG), 0) endif # Enabled Wthread-safety analysis for clang builds. - CFLAGS += -Wthread-safety + CFLAGS += -Wthread-safety -DWARN_CONTEXT_ANALYSIS endif include $(srctree)/tools/scripts/Makefile.arch
tools/perf/builtin-sched.c +8 -8
@@ -828,8 +828,8 @@ static void *thread_func(void *ctx) }static void create_tasks (struct perf_sched *sched) - EXCLUSIVE_LOCK_FUNCTION(sched->start_work_mutex) - EXCLUSIVE_LOCK_FUNCTION(sched->work_done_wait_mutex) + __acquires(&sched->start_work_mutex) + __acquires(&sched->work_done_wait_mutex) {struct task_desc *task;pthread_attr_t attr;
@@ -858,8 +858,8 @@ static void create_tasks(struct perf_sched *sched) }static void destroy_tasks (struct perf_sched *sched) - UNLOCK_FUNCTION(sched->start_work_mutex) - UNLOCK_FUNCTION(sched->work_done_wait_mutex) + __releases(&sched->start_work_mutex) + __releases(&sched->work_done_wait_mutex) {struct task_desc *task;unsigned long i;
@@ -878,8 +878,8 @@ static void destroy_tasks(struct perf_sched *sched) }static void wait_for_tasks (struct perf_sched *sched) - EXCLUSIVE_LOCKS_REQUIRED(sched->work_done_wait_mutex) - EXCLUSIVE_LOCKS_REQUIRED(sched->start_work_mutex) + __must_hold(&sched->work_done_wait_mutex) + __must_hold(&sched->start_work_mutex) {u64 cpu_usage_0, cpu_usage_1;struct task_desc *task;
@@ -930,8 +930,8 @@ static void wait_for_tasks(struct perf_sched *sched) }static void run_one_test (struct perf_sched *sched) - EXCLUSIVE_LOCKS_REQUIRED(sched->work_done_wait_mutex) - EXCLUSIVE_LOCKS_REQUIRED(sched->start_work_mutex) + __must_hold(&sched->work_done_wait_mutex) + __must_hold(&sched->start_work_mutex) {u64 T0 ,T1 , delta, avg_delta, fluct;
tools/perf/builtin-top.c +2 -2
@@ -201,7 +201,7 @@ static void perf_top__record_precise_ip(struct perf_top *top,struct hist_entry *he, struct perf_sample *sample, u64 ip) - EXCLUSIVE_LOCKS_REQUIRED(he->hists->lock) + __must_hold(&he->hists->lock) { struct annotation *notes;struct symbol *sym = he->ms.sym;
@@ -730,7 +730,7 @@ static void *display_thread(void *arg)static int hist_iter__top_callback (struct hist_entry_iter *iter,struct addr_location *al,bool single,void *arg) - EXCLUSIVE_LOCKS_REQUIRED(iter->he->hists->lock) + __must_hold(&iter->he->hists->lock) {struct perf_top *top = arg;
tools/perf/util/annotate.c +2 -2
@@ -655,7 +655,7 @@ static struct mutex *annotation__get_mutex(const struct annotation *notes) }void annotation__lock (struct annotation *notes) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {struct mutex *mutex =annotation__get_mutex (notes);
@@ -664,7 +664,7 @@ void annotation__lock(struct annotation *notes) }void annotation__unlock (struct annotation *notes) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {struct mutex *mutex =annotation__get_mutex (notes);
tools/perf/util/annotate.h +4 -4
@@ -369,7 +369,7 @@ struct annotated_branch {u64 *br_cntr; }; -struct LOCKABLE annotation { +context_lock_struct (annotation) {struct annotated_source *src;struct annotated_branch *branch; };
@@ -379,9 +379,9 @@ static inline void annotation__init(struct annotation *notes __maybe_unused) }void annotation__exit (struct annotation *notes); -void annotation__lock(struct annotation *notes) EXCLUSIVE_LOCK_FUNCTION(*notes); -void annotation__unlock(struct annotation *notes) UNLOCK_FUNCTION(*notes); -bool annotation__trylock(struct annotation *notes) EXCLUSIVE_TRYLOCK_FUNCTION(true, *notes); +void annotation__lock(struct annotation *notes) __acquires(notes); +void annotation__unlock(struct annotation *notes) __releases(notes); +bool annotation__trylock(struct annotation *notes) __cond_acquires(true, notes);static inline int annotation__cycles_width (struct annotation *notes) {
tools/perf/util/comm.c +2 -2
@@ -24,7 +24,7 @@ static struct comm_strs {static void comm_strs__remove_if_last (struct comm_str *cs);static void comm_strs__init (void ) -NO_THREAD_SAFETY_ANALYSIS /* Inherently single threaded due to pthread_once. */ +__context_unsafe (/* Inherently single threaded due to pthread_once. */ ) {init_rwsem (&_comm_strs.lock); _comm_strs.capacity =16 ;
@@ -120,7 +120,7 @@ static void comm_strs__remove_if_last(struct comm_str *cs) }static struct comm_str *__comm_strs__find (struct comm_strs *comm_strs,const char *str) - SHARED_LOCKS_REQUIRED(comm_strs->lock) + __must_hold_shared(&comm_strs->lock) {struct comm_str **result;
tools/perf/util/dso.c +13 -13
@@ -525,14 +525,14 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,*/ struct mutex _dso__data_open_lock;static LIST_HEAD (dso__data_open); -static long dso__data_open_cnt GUARDED_BY (_dso__data_open_lock ); +static long dso__data_open_cnt __guarded_by(&_dso__data_open_lock);static void dso__data_open_lock_init (void ) {mutex_init (&_dso__data_open_lock); } -static struct mutex *dso__data_open_lock (void )LOCK_RETURNED (_dso__data_open_lock) +static struct mutex *dso__data_open_lock(void) __returns_ctx_lock(&_dso__data_open_lock) {static pthread_once_t data_open_lock_once =PTHREAD_ONCE_INIT ;
@@ -541,7 +541,7 @@ static struct mutex *dso__data_open_lock(void) LOCK_RETURNED(_dso__data_open_locreturn &_dso__data_open_lock; } -static void dso__list_add (struct dso *dso)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void dso__list_add(struct dso *dso) __must_hold(&_dso__data_open_lock) {list_add_tail (&dso__data (dso)->open_entry, &dso__data_open);#ifdef REFCNT_CHECKING
@@ -552,7 +552,7 @@ static void dso__list_add(struct dso *dso) EXCLUSIVE_LOCKS_REQUIRED(_dso__data_o dso__data_open_cnt++; } -static void dso__list_del (struct dso *dso)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void dso__list_del(struct dso *dso) __must_hold(&_dso__data_open_lock) {list_del_init (&dso__data (dso)->open_entry);#ifdef REFCNT_CHECKING
@@ -567,7 +567,7 @@ static void dso__list_del(struct dso *dso) EXCLUSIVE_LOCKS_REQUIRED(_dso__data_ostatic void close_first_dso (void ); -static int do_open (char *name)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static int do_open(char *name) __must_hold(&_dso__data_open_lock) { do { int fd = open(name, O_RDONLY|O_CLOEXEC);
@@ -670,7 +670,7 @@ void dso__put_filename(struct dso *dso __maybe_unused, char *filename, bool deco }static int __open_dso (struct dso *dso,struct machine *machine) -EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) + __must_hold(&_dso__data_open_lock) {int fd = -EINVAL ;char *name;
@@ -703,7 +703,7 @@ static void check_data_close(void);* list/count of open DSO objects. */ static int open_dso (struct dso *dso,struct machine *machine) -EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) + __must_hold(&_dso__data_open_lock) {int fd;struct nscookie nsc;
@@ -729,7 +729,7 @@ static int open_dso(struct dso *dso, struct machine *machine)return fd; } -static void close_data_fd (struct dso *dso)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void close_data_fd(struct dso *dso) __must_hold(&_dso__data_open_lock) {if (dso__data (dso)->fd >=0 ) {close (dso__data (dso)->fd);
@@ -746,12 +746,12 @@ static void close_data_fd(struct dso *dso) EXCLUSIVE_LOCKS_REQUIRED(_dso__data_o* Close @dso's data file descriptor and updates * list/count of open DSO objects. */ -static void close_dso (struct dso *dso)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void close_dso(struct dso *dso) __must_hold(&_dso__data_open_lock) {close_data_fd (dso); } -static void close_first_dso (void )EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void close_first_dso(void) __must_hold(&_dso__data_open_lock) {struct dso_data *dso_data;struct dso *dso;
@@ -796,7 +796,7 @@ void reset_fd_limit(void) fd_limit =0 ; } -static bool may_cache_fd (void )EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static bool may_cache_fd(void) __must_hold(&_dso__data_open_lock) {if (!fd_limit) fd_limit =get_fd_limit ();
@@ -812,7 +812,7 @@ static bool may_cache_fd(void) EXCLUSIVE_LOCKS_REQUIRED(_dso__data_open_lock)* for opened dso file descriptors. The limit is half * of the RLIMIT_NOFILE files opened. */ -static void check_data_close (void )EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void check_data_close(void) __must_hold(&_dso__data_open_lock) {bool cache_fd =may_cache_fd ();
@@ -834,7 +834,7 @@ void dso__data_close(struct dso *dso) }static void try_to_open_dso (struct dso *dso,struct machine *machine) -EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) + __must_hold(&_dso__data_open_lock) {enum dso_binary_type binary_type_data[] = {DSO_BINARY_TYPE__BUILD_ID_CACHE ,
tools/perf/util/dso.h +4 -4
@@ -808,7 +808,7 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id);int dso__name_len (const struct dso *dso);struct dso *dso__get (struct dso *dso); -void dso__put(struct dso *dso) LOCKS_EXCLUDED(_dso__data_open_lock); +void dso__put(struct dso *dso) __must_not_hold(&_dso__data_open_lock);static inline void __dso__zput (struct dso **dso) {
@@ -918,9 +918,9 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,* TODO */ bool dso__data_get_fd(struct dso *dso, struct machine *machine, int *fd) - EXCLUSIVE_TRYLOCK_FUNCTION(true, _dso__data_open_lock); -void dso__data_put_fd(struct dso *dso) UNLOCK_FUNCTION(_dso__data_open_lock); -void dso__data_close(struct dso *dso) LOCKS_EXCLUDED(_dso__data_open_lock); + __cond_acquires(true, &_dso__data_open_lock); +void dso__data_put_fd(struct dso *dso) __releases(&_dso__data_open_lock); +void dso__data_close(struct dso *dso) __must_not_hold(&_dso__data_open_lock);int dso__data_file_size (struct dso *dso,struct machine *machine);off_t dso__data_size (struct dso *dso,struct machine *machine);
tools/perf/util/dsos.c +3 -3
@@ -157,7 +157,7 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos, const char *name, const struct dso_id *id, bool write_locked) - SHARED_LOCKS_REQUIRED(dsos->lock) + __must_hold_shared(&dsos->lock) { struct dsos__key key = { .long_name = name,
@@ -266,7 +266,7 @@ static int dsos__find_id_cb(struct dso *dso, void *data)static struct dso *__dsos__find_id (struct dsos *dsos,const char *name,const struct dso_id *id,bool cmp_short,bool write_locked) - SHARED_LOCKS_REQUIRED(dsos->lock) + __must_hold_shared(&dsos->lock) {struct dso *res;
@@ -330,7 +330,7 @@ static struct dso *__dsos__addnew_id(struct dsos *dsos, const char *name, const }static struct dso *__dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) - SHARED_LOCKS_REQUIRED(dsos->lock) + __must_hold_shared(&dsos->lock) {struct dso *dso =__dsos__find_id (dsos, name, id, false,/*write_locked=*/ true);
tools/perf/util/intel-tpebs.c +3 -3
@@ -69,7 +69,7 @@ static struct mutex *tpebs_mtx_get(void) }static struct tpebs_retire_lat *tpebs_retire_lat__find (struct evsel *evsel) -EXCLUSIVE_LOCKS_REQUIRED (tpebs_mtx_get ()); +__must_hold (tpebs_mtx_get ());static int evsel__tpebs_start_perf_record (struct evsel *evsel) {
@@ -244,7 +244,7 @@ static void *__sample_reader(void *arg __maybe_unused)return NULL ; } -static int tpebs_send_record_cmd (const char *msg)EXCLUSIVE_LOCKS_REQUIRED (tpebs_mtx_get ()) +static int tpebs_send_record_cmd (const char *msg)__must_hold (tpebs_mtx_get ()) {struct pollfd pollfd = { .events =POLLIN , };int ret, len, retries =0 ;
@@ -321,7 +321,7 @@ static int tpebs_send_record_cmd(const char *msg) EXCLUSIVE_LOCKS_REQUIRED(tpebs/* * tpebs_stop - stop the sample data read thread and the perf record process. */ -static int tpebs_stop (void )EXCLUSIVE_LOCKS_REQUIRED (tpebs_mtx_get ()) +static int tpebs_stop (void )__must_hold (tpebs_mtx_get ()) {int ret =0 ;
tools/perf/util/libbfd.c +2 -2
@@ -51,13 +51,13 @@ struct a2l_data {asymbol **syms; }; -static bool perf_bfd_lock (void *bfd_mutex)NO_THREAD_SAFETY_ANALYSIS +static bool perf_bfd_lock (void *bfd_mutex) __no_context_analysis {mutex_lock (bfd_mutex);return true; } -static bool perf_bfd_unlock (void *bfd_mutex)NO_THREAD_SAFETY_ANALYSIS +static bool perf_bfd_unlock (void *bfd_mutex) __no_context_analysis {mutex_unlock (bfd_mutex);return true;
tools/perf/util/mutex.c +2 -2
@@ -56,13 +56,13 @@ void mutex_destroy(struct mutex *mtx) }void mutex_lock (struct mutex *mtx) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {CHECK_ERR (pthread_mutex_lock (&mtx->lock)); }void mutex_unlock (struct mutex *mtx) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {CHECK_ERR (pthread_mutex_unlock (&mtx->lock)); }
tools/perf/util/mutex.h +6 -84
114 lines not on this page · raw message
tools/perf/util/rwsem.c +4 -4
@@ -27,7 +27,7 @@ int exit_rwsem(struct rw_semaphore *sem) }int down_read (struct rw_semaphore *sem) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {#if RWS_ERRORCHECK mutex_lock (&sem->mtx);
@@ -38,7 +38,7 @@ int down_read(struct rw_semaphore *sem) }int up_read (struct rw_semaphore *sem) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {#if RWS_ERRORCHECK mutex_unlock (&sem->mtx);
@@ -49,7 +49,7 @@ int up_read(struct rw_semaphore *sem) }int down_write (struct rw_semaphore *sem) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {#if RWS_ERRORCHECK mutex_lock (&sem->mtx);
@@ -60,7 +60,7 @@ int down_write(struct rw_semaphore *sem) }int up_write (struct rw_semaphore *sem) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {#if RWS_ERRORCHECK mutex_unlock (&sem->mtx);
tools/perf/util/rwsem.h +5 -5
@@ -10,7 +10,7 @@*/ #define RWS_ERRORCHECK 0 -struct LOCKABLE rw_semaphore { +context_lock_struct (rw_semaphore) {#if RWS_ERRORCHECK struct mutex mtx;#else
@@ -21,10 +21,10 @@ struct LOCKABLE rw_semaphore {int init_rwsem (struct rw_semaphore *sem);int exit_rwsem (struct rw_semaphore *sem); -int down_read(struct rw_semaphore *sem) SHARED_LOCK_FUNCTION(sem); -int up_read(struct rw_semaphore *sem) UNLOCK_FUNCTION(sem); +int down_read(struct rw_semaphore *sem) __acquires_shared(sem); +int up_read(struct rw_semaphore *sem) __releases_shared(sem); -int down_write(struct rw_semaphore *sem) EXCLUSIVE_LOCK_FUNCTION(sem); -int up_write(struct rw_semaphore *sem) UNLOCK_FUNCTION(sem); +int down_write(struct rw_semaphore *sem) __acquires(sem); +int up_write(struct rw_semaphore *sem) __releases(sem);#endif /* _PERF_RWSEM_H */
tools/perf/util/thread.c +4 -4
@@ -41,7 +41,7 @@ int thread__init_maps(struct thread *thread, struct machine *machine) }struct thread *thread__new (pid_t pid,pid_t tid) -NO_THREAD_SAFETY_ANALYSIS /* Allocation/creation is inherently single threaded. */ +__context_unsafe (/* Allocation/creation is inherently single threaded. */ ) {RC_STRUCT (thread) *_thread =zalloc (sizeof (*_thread));struct thread *thread;
@@ -203,7 +203,7 @@ int thread__set_namespaces(struct thread *thread, u64 timestamp, }static struct comm *__thread__comm (struct thread *thread) -SHARED_LOCKS_REQUIRED (thread__comm_lock (thread)) +__must_hold_shared (thread__comm_lock (thread)) {if (list_empty (thread__comm_list (thread)))return NULL ;
@@ -250,7 +250,7 @@ struct comm *thread__exec_comm(struct thread *thread)static int ____thread__set_comm (struct thread *thread,const char *str,u64 timestamp,bool exec) -EXCLUSIVE_LOCKS_REQUIRED (thread__comm_lock (thread)) +__must_hold (thread__comm_lock (thread)) {struct comm *new, *curr =__thread__comm (thread);
@@ -308,7 +308,7 @@ int thread__set_comm_from_proc(struct thread *thread) }static const char *__thread__comm_str (struct thread *thread) -SHARED_LOCKS_REQUIRED (thread__comm_lock (thread)) +__must_hold_shared (thread__comm_lock (thread)) {const struct comm *comm =__thread__comm (thread);
tools/perf/util/thread.h +1 -1
@@ -251,7 +251,7 @@ static inline struct rw_semaphore *thread__comm_lock(struct thread *thread) }static inline struct list_head *thread__comm_list (struct thread *thread) -SHARED_LOCKS_REQUIRED (thread__comm_lock (thread)) +__must_hold_shared (thread__comm_lock (thread)) {return &RC_CHK_ACCESS (thread)->comm_list; }
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v2 04/10] perf mutex: Use kernel style compiler-context-analysis.h annotations
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 11 lines
Enable -DWARN_CONTEXT_ANALYSIS alongside -Wthread-safety for Clang builds in
tools/perf/Makefile.config, replace the custom lock safety macros intools/perfwith the kernel'scompiler-context-analysis.hannotations (context_lock_struct,__guarded_by,__acquires,__acquires_shared,__releases,__releases_shared,__cond_acquires,__must_hold,__must_hold_shared,__must_not_hold,__returns_ctx_lock,__no_context_analysis, and__context_unsafe), and remove the redundant macro definitions fromtools/perf/util/mutex.h.Assisted-by Antigravity:gemini-3.1-proSigned-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=4
Ian Rogers
reviewerPATCH v2 5/10 perf build: Enable additional Clang thread-safety flags
In reply to Ian RogersAlign tools/perf's Clang thread-safety flags with the kernel's scripts/Makefile.context-analysis by adding -Wthread-safety-pointer, -Wthread-safety-beta, and (when supported by the compiler) -fexperimental-late-parse-attributes.
--- tools/perf/Makefile.config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/Makefile.config +4 -1
@@ -64,7 +64,10 @@ ifeq ($(CC_NO_CLANG), 0) endif # Enabled Wthread-safety analysis for clang builds. - CFLAGS += -Wthread-safety -DWARN_CONTEXT_ANALYSIS + CFLAGS += -DWARN_CONTEXT_ANALYSIS -Wthread-safety -Wthread-safety-pointer -Wthread-safety-beta + ifeq ($(shell $(CC) -Werror -fexperimental-late-parse-attributes -c -x c /dev/null -o /dev/null >/dev/null 2>&1 && echo 1), 1) + CFLAGS += -fexperimental-late-parse-attributes + endif endif include $(srctree)/tools/scripts/Makefile.arch
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v2 05/10] perf build: Enable additional Clang thread-safety flags
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 8 lines
Align tools/perf's Clang thread-safety flags with the kernel's
scripts/Makefile.context-analysisby adding -Wthread-safety-pointer,(quoted diff) +0
-2-Wthread-safety-beta, and (when supported by the compiler) -fexperimental-late-parse-attributes.Assisted-by Antigravity:gemini-3.1-proSigned-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=5
Ian Rogers
reviewerPATCH v2 6/10 perf comm: Add __guarded_by annotations to struct comm_strs
In reply to Ian RogersAnnotate strs, num_strs, and capacity in struct comm_strs with __guarded_by(&lock) and __pt_guarded_by(&lock) so Clang verifies all accesses hold comm_strs->lock.
--- tools/perf/util/comm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/comm.c +3 -3
@@ -16,9 +16,9 @@ DECLARE_RC_STRUCT(comm_str) {static struct comm_strs {struct rw_semaphore lock; -struct comm_str **strs; -int num_strs; -int capacity; + struct comm_str **strs __pt_guarded_by(&lock) __guarded_by(&lock); + int num_strs __guarded_by(&lock); + int capacity __guarded_by(&lock); } _comm_strs;static void comm_strs__remove_if_last (struct comm_str *cs);
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v2 06/10] perf comm: Add __guarded_by annotations to struct comm_strs
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 7 lines
Annotate strs,
num_strs, and capacity in structcomm_strswith__guarded_by(&lock)and__pt_guarded_by(&lock)so Clang verifies all accesses holdcomm_strs->lock.Assisted-by Antigravity:gemini-3.1-proSigned-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=6
Ian Rogers
reviewerPATCH v2 7/10 perf dso: Fix unlocked __dsos__add() in vdso and expand lock annotations
In reply to Ian Rogers__machine__addnew_vdso() called __dsos__add(&machine->dsos, dso) without holding machine->dsos.lock. Acquire machine->dsos.lock in write mode, double-check __dsos__find() to avoid inserting duplicate VDSO entries when racing with another thread, and set the long name before calling __dsos__add().
In dsos__findnew_id(), try finding the DSO under the read lock first and only acquire the write lock when a new DSO must be inserted or an existing DSO needs its ID updated (checked via dso__needs_improve_id()).
In dso__list_del(), release the REFCNT_CHECKING reference directly via refcount_dec_and_test() and RC_CHK_PUT() instead of unlocking dso__data_open_lock to call dso__put(), keeping dso__data_open_lock held continuously across try_to_open_dso() and avoiding lock-order inversions and races during EMFILE eviction.
Also replace _dso__data_open_lock and its pthread_once() wrapper with DEFINE_MUTEX(dso__data_open_lock), annotate struct dsos fields with __guarded_by(&lock), add __returns_ctx_lock() to dso__lock(), annotate dso__data_open and fd_limit in util/dso.c with __guarded_by(&dso__data_open_lock), and tighten __dsos__findnew_id() and __dsos__addnew_id() from shared to exclusive lock requirements.
--- tools/perf/tests/dso-data.c | 4 ++ tools/perf/util/dso.c | 93 ++++++++++++++++++------------------- tools/perf/util/dso.h | 12 +++-- tools/perf/util/dsos.c | 31 +++++++++++-- tools/perf/util/dsos.h | 12 +++-- tools/perf/util/vdso.c | 17 ++++++- 6 files changed, 106 insertions(+), 63 deletions(-)
tools/perf/tests/dso-data.c +4 -0
@@ -116,12 +116,14 @@ static int dso__data_fd(struct dso *dso, struct machine *machine)static void dsos__delete (struct dsos *dsos) { +down_write (&dsos->lock);for (unsigned int i =0 ; i < dsos->cnt; i++) {struct dso *dso = dsos->dsos[i];dso__data_close (dso);unlink (dso__name (dso)); } +up_write (&dsos->lock);dsos__exit (dsos); }
@@ -247,6 +249,7 @@ static int set_fd_limit(int n) }static int test__dso_data_cache (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) +__context_unsafe (/* single-threaded test */ ) {struct machine machine;long nr_end, nr =open_files_cnt ();
@@ -317,6 +320,7 @@ static long new_limit(int count) }static int test__dso_data_reopen (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) +__context_unsafe (/* single-threaded test */ ) {struct machine machine;long nr_end, nr =open_files_cnt (), lim =new_limit (3 );
tools/perf/util/dso.c +46 -47
244 lines not on this page · raw message
tools/perf/util/dso.h +7 -5
@@ -356,7 +356,7 @@ DECLARE_RC_STRUCT(dso) {char name[]; }; -extern struct mutex _dso__data_open_lock; +extern struct mutex dso__data_open_lock;extern const struct dso_id dso_id_empty;int dso_id__cmp (const struct dso_id *a,const struct dso_id *b);
@@ -628,6 +628,7 @@ static inline void dso__set_loaded(struct dso *dso) }static inline struct mutex *dso__lock (struct dso *dso) + __returns_ctx_lock(&RC_CHK_ACCESS(dso)->lock) {return &RC_CHK_ACCESS (dso)->lock; }
@@ -803,12 +804,13 @@ void dso__delete(struct dso *dso);int dso__cmp_id (struct dso *a,struct dso *b);void dso__set_short_name (struct dso *dso,const char *name,bool name_allocated);void dso__set_long_name (struct dso *dso,const char *name,bool name_allocated); +bool dso__needs_improve_id (const struct dso *dso,const struct dso_id *id);void __dso__improve_id (struct dso *dso,const struct dso_id *id);int dso__name_len (const struct dso *dso);struct dso *dso__get (struct dso *dso); -void dso__put(struct dso *dso) __must_not_hold(&_dso__data_open_lock); +void dso__put(struct dso *dso) __must_not_hold(&dso__data_open_lock);static inline void __dso__zput (struct dso **dso) {
@@ -918,9 +920,9 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,* TODO */ bool dso__data_get_fd(struct dso *dso, struct machine *machine, int *fd) - __cond_acquires(true, &_dso__data_open_lock); -void dso__data_put_fd(struct dso *dso) __releases(&_dso__data_open_lock); -void dso__data_close(struct dso *dso) __must_not_hold(&_dso__data_open_lock); + __cond_acquires(true, &dso__data_open_lock); +void dso__data_put_fd(struct dso *dso) __releases(&dso__data_open_lock); +void dso__data_close(struct dso *dso) __must_not_hold(&dso__data_open_lock);int dso__data_file_size (struct dso *dso,struct machine *machine);off_t dso__data_size (struct dso *dso,struct machine *machine);
tools/perf/util/dsos.c +27 -4
@@ -12,6 +12,7 @@#include <unistd.h> void dsos__init (struct dsos *dsos) +__context_unsafe (/* initialization */ ) {init_rwsem (&dsos->lock);
@@ -50,6 +51,7 @@ void dsos__exit(struct dsos *dsos)static int __dsos__for_each_dso (struct dsos *dsos,int (*cb)(struct dso *dso,void *data),void *data) + __must_hold_shared(&dsos->lock) {for (unsigned int i =0 ; i < dsos->cnt; i++) {struct dso *dso = dsos->dsos[i];
@@ -182,7 +184,8 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos, }qsort (dsos->dsos, dsos->cnt,sizeof (struct dso *), dsos__cmp_long_name_id_short_name); - dsos->sorted = true; +/* write_locked is true, so dsos->lock is held exclusively. */ +context_unsafe (dsos->sorted = true); } res = bsearch(&key, dsos->dsos, dsos->cnt, sizeof(struct dso *),
@@ -194,6 +197,7 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos, }int __dsos__add (struct dsos *dsos,struct dso *dso) + __must_hold(&dsos->lock) {if (!dso)return -EINVAL ;
@@ -284,12 +288,18 @@ static struct dso *__dsos__find_id(struct dsos *dsos, const char *name, const streturn res; } +struct dso *__dsos__find (struct dsos *dsos,const char *name,bool cmp_short) + __must_hold_shared(&dsos->lock) +{ +return __dsos__find_id (dsos, name, &dso_id_empty, cmp_short,/*write_locked=*/ false); +} +struct dso *dsos__find (struct dsos *dsos,const char *name,bool cmp_short) {struct dso *res;down_read (&dsos->lock); - res =__dsos__find_id (dsos, name, &dso_id_empty, cmp_short,/*write_locked=*/ false); + res =__dsos__find (dsos, name, cmp_short);up_read (&dsos->lock);return res; }
@@ -314,6 +324,7 @@ static void dso__set_basename(struct dso *dso) }static struct dso *__dsos__addnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) + __must_hold(&dsos->lock) {struct dso *dso =dso__new_id (name, id);
@@ -330,7 +341,7 @@ static struct dso *__dsos__addnew_id(struct dsos *dsos, const char *name, const }static struct dso *__dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) - __must_hold_shared(&dsos->lock) + __must_hold(&dsos->lock) {struct dso *dso =__dsos__find_id (dsos, name, id, false,/*write_locked=*/ true);
@@ -343,8 +354,20 @@ static struct dso *__dsos__findnew_id(struct dsos *dsos, const char *name, conststruct dso *dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) {struct dso *dso; + +down_read (&dsos->lock); + dso =__dsos__find_id (dsos, name, id, false,/*write_locked=*/ false); +if (dso && !dso__needs_improve_id (dso, id)) { +up_read (&dsos->lock); +return dso; + } +up_read (&dsos->lock); +down_write (&dsos->lock); - dso =__dsos__findnew_id (dsos, name, id); +if (dso) +__dso__improve_id (dso, id); +else + dso =__dsos__findnew_id (dsos, name, id);up_write (&dsos->lock);return dso; }
tools/perf/util/dsos.h +7 -5
@@ -19,17 +19,19 @@ struct machine;*/ struct dsos {struct rw_semaphore lock; -struct dso **dsos; -unsigned int cnt; -unsigned int allocated; -bool sorted; + struct dso **dsos __pt_guarded_by(&lock) __guarded_by(&lock); + unsigned int cnt __guarded_by(&lock); + unsigned int allocated __guarded_by(&lock); + bool sorted __guarded_by(&lock); };void dsos__init (struct dsos *dsos);void dsos__exit (struct dsos *dsos); -int __dsos__add (struct dsos *dsos,struct dso *dso); +int __dsos__add(struct dsos *dsos, struct dso *dso) __must_hold(&dsos->lock);int dsos__add (struct dsos *dsos,struct dso *dso); +struct dso *__dsos__find (struct dsos *dsos,const char *name,bool cmp_short) + __must_hold_shared(&dsos->lock);struct dso *dsos__find (struct dsos *dsos,const char *name,bool cmp_short);struct dso *dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id);
tools/perf/util/vdso.c +15 -2
@@ -127,13 +127,26 @@ void machine__exit_vdso(struct machine *machine)static struct dso *__machine__addnew_vdso (struct machine *machine,const char *short_name,const char *long_name) { -struct dso *dso; +struct dso *dso, *existing; + +down_write (&machine->dsos.lock); + existing =__dsos__find (&machine->dsos, short_name, true); +if (existing) { +up_write (&machine->dsos.lock); +return existing; + } dso =dso__new (short_name);if (dso !=NULL ) { -__dsos__add (&machine->dsos, dso); +/* +* Set the long name before adding to machine->dsos so that +* __dsos__add() inserts it in sorted order without needing to +* re-take machine->dsos.lock. +*/ dso__set_long_name (dso, long_name, false); +__dsos__add (&machine->dsos, dso); } +up_write (&machine->dsos.lock);return dso; }
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v2 07/10] perf dso: Fix unlocked __dsos__add() in vdso and expand lock annotations
Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider: - [High] perf dso: Use-after-free of dso handle in dso__list_del - [Medium] perf dso: TOCTOU race in…
Thank you for your contribution! Sashiko AI review found 3 potential issue(s) to consider:
- [High] perf dso: Use-after-free of dso handle in dso__list_del
- [Medium] perf dso: TOCTOU race in dso__put crashes process via BUG_ON
- [Medium] perf: TOCTOU race in dsos__findnew_id() returns DSO with conflicting ID --
commit ec25e6950c1517fbc1aa1d6b77689a77a68b1b3d
Author: Ian Rogers <[email protected]>
perf dso: Fix unlocked __dsos__add() in vdso and expand lock annotations
This patch addresses a missing lock acquisition in __machine__addnew_vdso() and introduces a read/write lock upgrade pattern for DSO ID improvement. It also tightens locking for dso__list_del() to avoid lock inversions during EMFILE eviction and expands lock annotations.
tools/perf/util/dso.c static void dso__list_add(struct dso *dso) __must_hold(&_dso__data_open_lock) · line 543
Quoted 13 lines
tools/perf/util/dso.c +1
-3@@ -539,13 +539,13 @@ static void dso__list_add(struct dso *dso) __must_hold(&_dso__data_open_lock) static void dso__list_del(struct dso *dso) __must_hold(&dso__data_open_lock) {list_del_init (&dso__data (dso)->open_entry);#ifdef REFCNT_CHECKING -mutex_unlock (dso__data_open_lock ()); -dso__put (dso__data (dso)->dso); -mutex_lock (dso__data_open_lock ()); +BUG_ON (refcount_dec_and_test (&RC_CHK_ACCESS (dso)->refcnt));
[Severity: Medium]
If two threads concurrently call dso__put() on a DSO with 3 references, won't both threads read the refcount as 3 and bypass the refcount_read() == 2 check?
If both drop the refcount to 1 without calling dso__data_close(), could a later EMFILE eviction calling dso__list_del() hit this BUG_ON when the refcount unexpectedly drops to 0?
tools/perf/util/dso.c static void dso__list_add(struct dso *dso) __must_hold(&_dso__data_open_lock) · line 548
Quoted 2 lines
tools/perf/util/dso.c +2
-0+RC_CHK_PUT (dso__data (dso)->dso); +dso__data (dso)->dso =NULL ;
[Severity: High]
Does RC_CHK_PUT() free the handle that is immediately dereferenced on the next line when evaluating the dso__data(dso) macro, resulting in a heap use-after-free during EMFILE eviction?
Quoted 3 lines
tools/perf/util/dso.c +0
-0#endif WARN_ONCE (dso__data_open_cnt <=0 ,"DSO data fd counter out of bounds." );
[ ... ]
Quoted 9 lines
tools/perf/util/dso.c +1
-1@@ -1804,7 +1804,7 @@ struct dso *dso__get(struct dso *dso)void dso__put (struct dso *dso) {#ifdef REFCNT_CHECKING -if (dso &&dso__data (dso) &&refcount_read (&RC_CHK_ACCESS (dso)->refcnt) ==2 ) +if (dso &&dso__data (dso)->dso &&refcount_read (&RC_CHK_ACCESS (dso)->refcnt) ==2 )dso__data_close (dso);#endif if (dso &&refcount_dec_and_test (&RC_CHK_ACCESS (dso)->refcnt))
[ ... ]
Quoted 4 lines
tools/perf/util/dsos.c +0
-0
[ ... ]
Quoted 7 lines
tools/perf/util/dsos.c +3
-0@@ -343,8 +354,20 @@ static struct dso *__dsos__findnew_id(struct dsos *dsos, const char *name, conststruct dso *dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) {struct dso *dso; + +down_read (&dsos->lock); + dso =__dsos__find_id (dsos, name, id, false,/*write_locked=*/ false);
tools/perf/util/dsos.c static struct dso *__dsos__findnew_id(struct dsos *dsos, const char *name, const · line 368
Quoted 10 lines
tools/perf/util/dsos.c +8
-1+if (dso && !dso__needs_improve_id (dso, id)) { +up_read (&dsos->lock); +return dso; + } +up_read (&dsos->lock); +down_write (&dsos->lock); - dso =__dsos__findnew_id (dsos, name, id); +if (dso) +__dso__improve_id (dso, id);
[Severity: Medium]
If two threads concurrently call dsos__findnew_id() for the same DSO name but with different valid IDs, couldn't both find the same empty DSO under the read lock?
When they subsequently acquire the write lock, since the cached dso pointer is used unconditionally without re-validation, could one thread incorrectly receive a DSO that was just updated with the other thread's ID, leading to incorrect symbol resolution and corrupted tracking structures?
Quoted 5 lines
tools/perf/util/dsos.c +2
-0+else + dso =__dsos__findnew_id (dsos, name, id);up_write (&dsos->lock);return dso; }
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=7
Ian Rogers
reviewerPATCH v2 8/10 perf thread: Expand context analysis annotations to threads and namespaces_lock
In reply to Ian RogersAnnotate shard and last_match in struct threads_table_entry with __guarded_by(&lock) and add __must_hold_shared()/__must_hold() to the last_match helpers in util/threads.c.
In util/thread.h and util/thread.c, add __returns_ctx_lock() to thread__namespaces_lock() and thread__comm_lock(), annotate namespaces_list and comm_list with __guarded_by(), and add __must_hold_shared()/__must_hold() to the namespaces_list helpers.
--- tools/perf/util/thread.c | 2 ++ tools/perf/util/thread.h | 28 +++++++++++++++++----------- tools/perf/util/threads.c | 4 ++++ tools/perf/util/threads.h | 6 +++--- 4 files changed, 26 insertions(+), 14 deletions(-)
tools/perf/util/thread.c +2 -0
@@ -149,6 +149,7 @@ void thread__put(struct thread *thread) }static struct namespaces *__thread__namespaces (struct thread *thread) +__must_hold_shared (thread__namespaces_lock (thread)) {if (list_empty (thread__namespaces_list (thread)))return NULL ;
@@ -169,6 +170,7 @@ struct namespaces *thread__namespaces(struct thread *thread)static int __thread__set_namespaces (struct thread *thread,u64 timestamp,struct perf_record_namespaces *event) +__must_hold (thread__namespaces_lock (thread)) {struct namespaces *new, *curr =__thread__namespaces (thread);
tools/perf/util/thread.h +17 -11
@@ -48,10 +48,10 @@ DECLARE_RC_STRUCT(thread) {bool exited;bool comm_set;int comm_len; -struct list_head namespaces_list;struct rw_semaphore namespaces_lock; -struct list_head comm_list; + struct list_head namespaces_list __guarded_by(&namespaces_lock);struct rw_semaphore comm_lock; + struct list_head comm_list __guarded_by(&comm_lock);u64 db_id;void *priv;
@@ -230,30 +230,36 @@ static inline void thread__set_comm_len(struct thread *thread, int len)RC_CHK_ACCESS (thread)->comm_len = len; } -static inline struct list_head *thread__namespaces_list (struct thread *thread) +static inline struct rw_semaphore *thread__namespaces_lock (const struct thread *thread) + __returns_ctx_lock(&RC_CHK_ACCESS(thread)->namespaces_lock) { -return &RC_CHK_ACCESS (thread)->namespaces_list; +return (struct rw_semaphore *)&RC_CHK_ACCESS (thread)->namespaces_lock; } -static inline int thread__namespaces_list_empty (const struct thread *thread) +static inline struct list_head *thread__namespaces_list (struct thread *thread) +__must_hold_shared (thread__namespaces_lock (thread)) { -return list_empty (&RC_CHK_ACCESS (thread)->namespaces_list); +/* Readers hold the shared lock; writers hold the exclusive lock. */ +return context_unsafe (&RC_CHK_ACCESS (thread)->namespaces_list); } -static inline struct rw_semaphore *thread__namespaces_lock (struct thread *thread) +static inline int thread__namespaces_list_empty (const struct thread *thread) +__must_hold_shared (thread__namespaces_lock (thread)) { -return &RC_CHK_ACCESS (thread)->namespaces_lock; +return list_empty (&RC_CHK_ACCESS (thread)->namespaces_list); } -static inline struct rw_semaphore *thread__comm_lock (struct thread *thread) +static inline struct rw_semaphore *thread__comm_lock (const struct thread *thread) + __returns_ctx_lock(&RC_CHK_ACCESS(thread)->comm_lock) { -return &RC_CHK_ACCESS (thread)->comm_lock; +return (struct rw_semaphore *)&RC_CHK_ACCESS (thread)->comm_lock; }static inline struct list_head *thread__comm_list (struct thread *thread)__must_hold_shared (thread__comm_lock (thread)) { -return &RC_CHK_ACCESS (thread)->comm_list; +/* Readers hold the shared lock; writers hold the exclusive lock. */ +return context_unsafe (&RC_CHK_ACCESS (thread)->comm_list); }static inline u64 thread__db_id (const struct thread *thread)
tools/perf/util/threads.c +4 -0
@@ -21,6 +21,7 @@ static bool key_equal(long key1, long key2, void *ctx __maybe_unused) }void threads__init (struct threads *threads) +__context_unsafe (/* initialization */ ) {for (int i =0 ; i <THREADS__TABLE_SIZE ; i++) {struct threads_table_entry *table = &threads->table[i];
@@ -32,6 +33,7 @@ void threads__init(struct threads *threads) }void threads__exit (struct threads *threads) +__context_unsafe (/* teardown */ ) {threads__remove_all_threads (threads);for (int i =0 ; i <THREADS__TABLE_SIZE ; i++) {
@@ -63,6 +65,7 @@ size_t threads__nr(struct threads *threads)*/ static struct thread *__threads_table_entry__get_last_match (struct threads_table_entry *table,pid_t tid) + __must_hold_shared(&table->lock) {struct thread *th, *res =NULL ;
@@ -76,6 +79,7 @@ static struct thread *__threads_table_entry__get_last_match(struct threads_tablestatic void __threads_table_entry__set_last_match (struct threads_table_entry *table,struct thread *th) + __must_hold(&table->lock) {thread__put (table->last_match); table->last_match =thread__get (th);
tools/perf/util/threads.h +3 -3
@@ -11,10 +11,10 @@ struct thread;#define THREADS__TABLE_SIZE (1 << THREADS__TABLE_BITS)struct threads_table_entry { -/* Key is tid, value is struct thread. */ -struct hashmap shard;struct rw_semaphore lock; -struct thread *last_match; +/* Key is tid, value is struct thread. */ + struct hashmap shard __guarded_by(&lock); + struct thread *last_match __guarded_by(&lock); };struct threads {
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v2 08/10] perf thread: Expand context analysis annotations to threads and namespaces_lock
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 4 lines
Annotate shard and
last_matchin structthreads_table_entrywith__guarded_by(&lock)and add __must_hold_shared()/__must_hold() to thelast_matchhelpers inutil/threads.c.
Quoted 8 lines
In
util/thread.handutil/thread.c, add__returns_ctx_lock()tothread__namespaces_lock()andthread__comm_lock(), annotatenamespaces_listandcomm_listwith__guarded_by(), and add __must_hold_shared()/__must_hold() to thenamespaces_listhelpers.Assisted-by Antigravity:gemini-3.1-proSigned-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=8
Ian Rogers
reviewerPATCH v2 9/10 perf config, intel-tpebs, env: Add __guarded_by and __must_hold annotations
In reply to Ian RogersAdd __guarded_by() and __must_hold() annotations to static parser and config state in util/config.c, TPEBS state in util/intel-tpebs.c (replacing tpebs_mtx_get() and its pthread_once() init with DEFINE_MUTEX(tpebs_mtx), fixing an unlocked read of tpebs_reader_thread in tpebs_stop(), and transferring tpebs_cmd.out ownership to __sample_reader() so it is not double-closed in tpebs_stop()), and bpf_progs and cgroups trees in struct perf_env.
--- tools/perf/util/bpf-event.h | 5 +- tools/perf/util/config.c | 43 +++++++++------ tools/perf/util/env.c | 1 + tools/perf/util/env.h | 19 ++++--- tools/perf/util/intel-tpebs.c | 98 ++++++++++++++++------------------- 5 files changed, 87 insertions(+), 79 deletions(-)
tools/perf/util/bpf-event.h +3 -2
@@ -6,11 +6,11 @@#include <linux/rbtree.h> #include <api/fd/array.h> #include <stdio.h> +#include "env.h" struct bpf_prog_info ;struct machine ;union perf_event ; -struct perf_env ;struct perf_sample ;struct perf_session ;struct record_opts ;
@@ -42,7 +42,8 @@ int machine__process_bpf(struct machine *machine, union perf_event *event,int evlist__add_bpf_sb_event (struct evlist *evlist,struct perf_env *env); void __bpf_event__print_bpf_prog_info(struct perf_bpil *info_linear, struct perf_env *env, -FILE *fp); + FILE *fp) + __must_hold_shared(&env->bpf_progs.lock);void bpf_metadata_free (struct bpf_metadata *metadata);#else static inline int machine__process_bpf(struct machine *machine __maybe_unused,
tools/perf/util/config.c +27 -16
108 lines not on this page · raw message
tools/perf/util/env.c +1 -0
@@ -302,6 +302,7 @@ void perf_env__exit(struct perf_env *env) }void perf_env__init (struct perf_env *env) +__context_unsafe (/* initialization */ ) {memset (env,0 ,sizeof (*env));#ifdef HAVE_LIBBPF_SUPPORT
tools/perf/util/env.h +11 -8
@@ -139,16 +139,16 @@ struct perf_env {*/ struct {struct rw_semaphore lock; -struct rb_root infos; -u32 infos_cnt; -struct rb_root btfs; -u32 btfs_cnt; + struct rb_root infos __guarded_by(&lock); + u32 infos_cnt __guarded_by(&lock); + struct rb_root btfs __guarded_by(&lock); + u32 btfs_cnt __guarded_by(&lock); } bpf_progs;#endif // HAVE_LIBBPF_SUPPORT /* same reason as above (for perf-top) */ struct {struct rw_semaphore lock; -struct rb_root tree; + struct rb_root tree __guarded_by(&lock); } cgroups;/* For fast cpu to numa node lookup via perf_env__numa_node */
@@ -223,7 +223,8 @@ int perf_env__nr_cpus_avail(struct perf_env *env);void perf_env__init (struct perf_env *env);#ifdef HAVE_LIBBPF_SUPPORT bool __perf_env__insert_bpf_prog_info(struct perf_env *env, -struct bpf_prog_info_node *info_node); + struct bpf_prog_info_node *info_node) + __must_hold(&env->bpf_progs.lock);bool perf_env__insert_bpf_prog_info (struct perf_env *env,struct bpf_prog_info_node *info_node); struct bpf_prog_info_node *perf_env__find_bpf_prog_info(struct perf_env *env,
@@ -233,9 +234,11 @@ void perf_env__iterate_bpf_prog_info(struct perf_env *env, void *data), void *data);bool perf_env__insert_btf (struct perf_env *env,struct btf_node *btf_node); -bool __perf_env__insert_btf (struct perf_env *env,struct btf_node *btf_node); +bool __perf_env__insert_btf(struct perf_env *env, struct btf_node *btf_node) + __must_hold(&env->bpf_progs.lock);struct btf_node *perf_env__find_btf (struct perf_env *env,__u32 btf_id); -struct btf_node *__perf_env__find_btf (struct perf_env *env,__u32 btf_id); +struct btf_node *__perf_env__find_btf (struct perf_env *env,__u32 btf_id) + __must_hold_shared(&env->bpf_progs.lock);#endif // HAVE_LIBBPF_SUPPORT int perf_env__numa_node (struct perf_env *env,struct perf_cpu cpu);
tools/perf/util/intel-tpebs.c +45 -53
268 lines not on this page · raw message
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v2 09/10] perf config, intel-tpebs, env: Add __guarded_by and __must_hold annotations
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Medium] perf: Missing POSIX libc header inclusions for musl compatibility --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] perf: Missing POSIX libc header inclusions for musl compatibility --
commit 8960a6e4824321506be07bc73e262a9ac1420f9c
Author: Ian Rogers <[email protected]>
perf config, intel-tpebs, env: Add __guarded_by and __must_hold annotations
This commit adds __guarded_by() and __must_hold() annotations to static parser and config state, TPEBS state, and perf_env trees. It also fixes an unlocked read in tpebs_stop() and transfers tpebs_cmd.out ownership to prevent a double-close.
Quoted 4 lines
tools/perf/util/intel-tpebs.c +0
-0
[ ... ]
tools/perf/util/intel-tpebs.c static void *__sample_reader(void *arg __maybe_unused) · line 226
Quoted 7 lines
tools/perf/util/intel-tpebs.c +2
-1@@ -236,15 +222,17 @@ static void *__sample_reader(void *arg __maybe_unused) tool.attr = perf_event__process_attr; session =perf_session__new (&data, &tool); -if (IS_ERR (session)) +if (IS_ERR (session)) { +close (data.file.fd);
[Severity: Medium]
Does this file need standard POSIX header inclusions like <unistd.h> for musl libc compatibility?
This file makes heavy use of POSIX functions such as close(), pipe(), read(), write(), malloc(), and strlen(), but omits the standard headers. The patch adds new usages of close() and modifies file descriptor ownership without including the necessary headers to prevent musl build failures.
Quoted 7 lines
tools/perf/util/intel-tpebs.c +1
-0return NULL ; + }perf_session__process_events (session);perf_session__delete (session);return NULL ; }
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=9
Ian Rogers
reviewerPATCH v2 10/10 perf maps: Add context analysis annotations
In reply to Ian RogersAdd __returns_ctx_lock() to maps__lock(), annotate DECLARE_RC_STRUCT(maps) members protected by lock with __guarded_by(&lock), and annotate internal maps helpers with __must_hold() and __must_hold_shared().
Also in maps__load_first(), take a reference to the first map and drop the read lock before calling map__load() to avoid a read-to-write self-deadlock if map__load() inserts extra kernel maps.
--- tools/perf/util/maps.c | 133 ++++++++++++++++++++++++++--------------- 1 file changed, 86 insertions(+), 47 deletions(-)
tools/perf/util/maps.c +86 -47
@@ -30,12 +30,12 @@ DECLARE_RC_STRUCT(maps) {* @maps_by_address: array of maps sorted by their starting address if * maps_by_address_sorted is true. */ -struct map **maps_by_address; + struct map **maps_by_address __guarded_by(&lock);/** * @maps_by_name: optional array of maps sorted by their dso name if * maps_by_name_sorted is true. */ -struct map **maps_by_name; + struct map **maps_by_name __guarded_by(&lock);struct machine *machine;#ifdef HAVE_LIBUNWIND_SUPPORT void *addr_space;
@@ -50,26 +50,33 @@ DECLARE_RC_STRUCT(maps) {* @nr_maps: number of maps_by_address, and possibly maps_by_name, * entries that contain maps. */ -unsigned int nr_maps; + unsigned int nr_maps __guarded_by(&lock);/** * @nr_maps_allocated: number of entries in maps_by_address and possibly * maps_by_name. */ -unsigned int nr_maps_allocated; + unsigned int nr_maps_allocated __guarded_by(&lock);/** * @last_search_by_name_idx: cache of last found by name entry's index * as frequent searches for the same dso name are common. */ unsigned int last_search_by_name_idx;/** @maps_by_address_sorted: is maps_by_address sorted. */ -bool maps_by_address_sorted; + bool maps_by_address_sorted __guarded_by(&lock);/** @maps_by_name_sorted: is maps_by_name sorted. */ -bool maps_by_name_sorted; + bool maps_by_name_sorted __guarded_by(&lock);/** @ends_broken: does the map contain a map where end values are unset/unsorted? */ -bool ends_broken; + bool ends_broken __guarded_by(&lock); }; +static struct rw_semaphore *maps__lock (const struct maps *maps) + __returns_ctx_lock(&RC_CHK_ACCESS(maps)->lock) +{ +return (struct rw_semaphore *)&RC_CHK_ACCESS (maps)->lock; +} +static void check_invariants (const struct maps *maps__maybe_unused ) +__must_hold_shared (maps__lock (maps)) {#ifndef NDEBUG assert (RC_CHK_ACCESS (maps)->nr_maps <=RC_CHK_ACCESS (maps)->nr_maps_allocated);
@@ -119,55 +126,65 @@ static void check_invariants(const struct maps *maps __maybe_unused) }static struct map **maps__maps_by_address (const struct maps *maps) +__must_hold_shared (maps__lock (maps)) {return RC_CHK_ACCESS (maps)->maps_by_address; }static void maps__set_maps_by_address (struct maps *maps,struct map **new) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->maps_by_address = new; }static void maps__set_nr_maps_allocated (struct maps *maps,unsigned int nr_maps_allocated) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->nr_maps_allocated = nr_maps_allocated; }static void maps__set_nr_maps (struct maps *maps,unsigned int nr_maps) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->nr_maps = nr_maps; }/* Not in the header, to aid reference counting. */ static struct map **maps__maps_by_name (const struct maps *maps) +__must_hold_shared (maps__lock (maps)) {return RC_CHK_ACCESS (maps)->maps_by_name; }static void maps__set_maps_by_name (struct maps *maps,struct map **new) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->maps_by_name = new; }static bool maps__maps_by_address_sorted (const struct maps *maps) +__must_hold_shared (maps__lock (maps)) {return RC_CHK_ACCESS (maps)->maps_by_address_sorted; }static void maps__set_maps_by_address_sorted (struct maps *maps,bool value) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->maps_by_address_sorted = value; }static bool maps__maps_by_name_sorted (const struct maps *maps) +__must_hold_shared (maps__lock (maps)) {return RC_CHK_ACCESS (maps)->maps_by_name_sorted; }static void maps__set_maps_by_name_sorted (struct maps *maps,bool value) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->maps_by_name_sorted = value; }
@@ -177,11 +194,22 @@ struct machine *maps__machine(const struct maps *maps)return RC_CHK_ACCESS (maps)->machine; } -unsigned int maps__nr_maps (const struct maps *maps) +static unsigned int __maps__nr_maps (const struct maps *maps) +__must_hold_shared (maps__lock (maps)) {return RC_CHK_ACCESS (maps)->nr_maps; } +unsigned int maps__nr_maps (const struct maps *maps) +{ +unsigned int nr; + +down_read (maps__lock (maps)); + nr =__maps__nr_maps (maps); +up_read (maps__lock (maps)); +return nr; +} +refcount_t *maps__refcnt (struct maps *maps) {return &RC_CHK_ACCESS (maps)->refcnt;
@@ -220,12 +248,8 @@ void maps__set_libdw_addr_space_dwfl(struct maps *maps, void *dwfl) }#endif -static struct rw_semaphore *maps__lock (struct maps *maps) -{ -return &RC_CHK_ACCESS (maps)->lock; -} -static void maps__init (struct maps *maps,struct machine *machine) +__context_unsafe (/* initialization */ ) {init_rwsem (maps__lock (maps));RC_CHK_ACCESS (maps)->maps_by_address =NULL ;
@@ -247,11 +271,12 @@ static void maps__init(struct maps *maps, struct machine *machine) }static void maps__exit (struct maps *maps) +__context_unsafe (/* teardown */ ) {struct map **maps_by_address =maps__maps_by_address (maps);struct map **maps_by_name =maps__maps_by_name (maps); -for (unsigned int i =0 ; i <maps__nr_maps (maps); i++) { +for (unsigned int i =0 ; i <__maps__nr_maps (maps); i++) {map__zput (maps_by_address[i]);if (maps_by_name)map__zput (maps_by_name[i]);
@@ -300,6 +325,7 @@ void maps__put(struct maps *maps) }static void __maps__free_maps_by_name (struct maps *maps) +__must_hold (maps__lock (maps)) {if (!maps__maps_by_name (maps))return ;
@@ -307,7 +333,7 @@ static void __maps__free_maps_by_name(struct maps *maps)/* * Free everything to try to do it from the rbtree in the next search */ -for (unsigned int i =0 ; i <maps__nr_maps (maps); i++) +for (unsigned int i =0 ; i <__maps__nr_maps (maps); i++)map__put (maps__maps_by_name (maps)[i]);zfree (&RC_CHK_ACCESS (maps)->maps_by_name);
@@ -340,12 +366,13 @@ static int map__start_cmp(const void *a, const void *b) }static void __maps__sort_by_address (struct maps *maps) +__must_hold (maps__lock (maps)) {if (maps__maps_by_address_sorted (maps))return ;qsort (maps__maps_by_address (maps), -maps__nr_maps (maps), +__maps__nr_maps (maps),sizeof (struct map *), map__start_cmp);maps__set_maps_by_address_sorted (maps, true);
@@ -388,7 +415,7 @@ static int maps__sort_by_name(struct maps *maps) err = -ENOMEM ; else {struct map **maps_by_address =maps__maps_by_address (maps); -unsigned int n =maps__nr_maps (maps); +unsigned int n =__maps__nr_maps (maps);maps__set_maps_by_name (maps, maps_by_name);for (unsigned int i =0 ; i < n; i++)
@@ -397,7 +424,7 @@ static int maps__sort_by_name(struct maps *maps) }if (!err) {qsort (maps_by_name, -maps__nr_maps (maps), +__maps__nr_maps (maps),sizeof (struct map *), map__strcmp);maps__set_maps_by_name_sorted (maps, true);
@@ -409,18 +436,19 @@ static int maps__sort_by_name(struct maps *maps) }static unsigned int maps__by_address_index (const struct maps *maps,const struct map *map) +__must_hold_shared (maps__lock (maps)) {struct map **maps_by_address =maps__maps_by_address (maps);if (maps__maps_by_address_sorted (maps)) {struct map **mapp = -bsearch (&map,maps__maps_by_address (maps),maps__nr_maps (maps), +bsearch (&map,maps__maps_by_address (maps),__maps__nr_maps (maps),sizeof (*mapp), map__start_cmp);if (mapp)return mapp - maps_by_address; }else { -for (unsigned int i =0 ; i <maps__nr_maps (maps); i++) { +for (unsigned int i =0 ; i <__maps__nr_maps (maps); i++) {if (RC_CHK_ACCESS (maps_by_address[i]) ==RC_CHK_ACCESS (map))return i; }
@@ -430,18 +458,19 @@ static unsigned int maps__by_address_index(const struct maps *maps, const struct }static unsigned int maps__by_name_index (const struct maps *maps,const struct map *map) +__must_hold_shared (maps__lock (maps)) {struct map **maps_by_name =maps__maps_by_name (maps);if (maps__maps_by_name_sorted (maps)) {struct map **mapp = -bsearch (&map, maps_by_name,maps__nr_maps (maps), +bsearch (&map, maps_by_name,__maps__nr_maps (maps),sizeof (*mapp), map__strcmp);if (mapp)return mapp - maps_by_name; }else { -for (unsigned int i =0 ; i <maps__nr_maps (maps); i++) { +for (unsigned int i =0 ; i <__maps__nr_maps (maps); i++) {if (RC_CHK_ACCESS (maps_by_name[i]) ==RC_CHK_ACCESS (map))return i; }
@@ -470,10 +499,11 @@ static void map__set_kmap_maps(struct map *map, struct maps *maps) }static int __maps__insert (struct maps *maps,struct map *new) +__must_hold (maps__lock (maps)) {struct map **maps_by_address =maps__maps_by_address (maps);struct map **maps_by_name =maps__maps_by_name (maps); -unsigned int nr_maps =maps__nr_maps (maps); +unsigned int nr_maps =__maps__nr_maps (maps);unsigned int nr_allocate =RC_CHK_ACCESS (maps)->nr_maps_allocated;if (nr_maps +1 > nr_allocate) {
@@ -540,10 +570,11 @@ int maps__insert(struct maps *maps, struct map *map) }static void __maps__remove (struct maps *maps,struct map *map) +__must_hold (maps__lock (maps)) {struct map **maps_by_address =maps__maps_by_address (maps);struct map **maps_by_name =maps__maps_by_name (maps); -unsigned int nr_maps =maps__nr_maps (maps); +unsigned int nr_maps =__maps__nr_maps (maps);unsigned int address_idx;/* Slide later mappings over the one to remove */
@@ -623,7 +654,7 @@ bool maps__empty(struct maps *maps)bool res;down_read (maps__lock (maps)); - res =maps__nr_maps (maps) ==0 ; + res =__maps__nr_maps (maps) ==0 ;up_read (maps__lock (maps));return res;
@@ -651,7 +682,7 @@ int maps__for_each_map(struct maps *maps, int (*cb)(struct map *map, void *data)* the array - this may cause maps to be skipped or * repeated. */ -for (unsigned int i =0 ; i <maps__nr_maps (maps); i++) { +for (unsigned int i =0 ; i <__maps__nr_maps (maps); i++) {struct map **maps_by_address =maps__maps_by_address (maps);struct map *map = maps_by_address[i];
@@ -678,7 +709,7 @@ int maps__load_maps(struct maps *maps)return 0 ;down_read (maps__lock (maps)); - nr_maps =maps__nr_maps (maps); + nr_maps =__maps__nr_maps (maps);if (nr_maps ==0 ) {up_read (maps__lock (maps));return 0 ;
@@ -711,7 +742,7 @@ void maps__remove_maps(struct maps *maps, bool (*cb)(struct map *map, void *datadown_write (maps__lock (maps)); maps_by_address =maps__maps_by_address (maps); -for (unsigned int i =0 ; i <maps__nr_maps (maps);) { +for (unsigned int i =0 ; i <__maps__nr_maps (maps);) {if (cb (maps_by_address[i], data)) {__maps__remove (maps, maps_by_address[i]); removed = true;
@@ -765,7 +796,7 @@ struct symbol *maps__find_symbol_by_name(struct maps *maps, const char *name, st* This prevents deadlocking if iteration triggers further map insertions. */ down_read (maps__lock (maps)); - nr_maps =maps__nr_maps (maps); + nr_maps =__maps__nr_maps (maps); maps_copy =calloc (nr_maps,sizeof (*maps_copy));if (maps_copy) {for (unsigned int i =0 ; i < nr_maps; i++) {
@@ -850,9 +881,10 @@ size_t maps__fprintf(struct maps *maps, FILE *fp)* Same as find_vma() in kernel. */ static unsigned int first_ending_after (struct maps *maps,const struct map *map) +__must_hold_shared (maps__lock (maps)) {struct map **maps_by_address =maps__maps_by_address (maps); -int low =0 , high = (int )maps__nr_maps (maps) -1 , first = high +1 ; +int low =0 , high = (int )__maps__nr_maps (maps) -1 , first = high +1 ;assert (maps__maps_by_address_sorted (maps));if (low <= high &&map__end (maps_by_address[0 ]) >map__start (map))
@@ -877,10 +909,11 @@ static unsigned int first_ending_after(struct maps *maps, const struct map *map)static int __maps__insert_sorted (struct maps *maps,unsigned int first_after_index,struct map *new1,struct map *new2) +__must_hold (maps__lock (maps)) {struct map **maps_by_address =maps__maps_by_address (maps);struct map **maps_by_name =maps__maps_by_name (maps); -unsigned int nr_maps =maps__nr_maps (maps); +unsigned int nr_maps =__maps__nr_maps (maps);unsigned int nr_allocate =RC_CHK_ACCESS (maps)->nr_maps_allocated;unsigned int to_add = new2 ?2 :1 ;
@@ -937,6 +970,7 @@ static int __maps__insert_sorted(struct maps *maps, unsigned int first_after_ind* adjusted or removed so that new fits without overlapping any entries. */ static int __maps__fixup_overlap_and_insert (struct maps *maps,struct map *new) +__must_hold (maps__lock (maps)) {int err =0 ;unsigned int i, ni =INT_MAX ;// Some gcc complain, but depends on maps_by_name...
@@ -948,7 +982,7 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new)* Iterate through entries where the end of the existing entry is * greater-than the new map's start. */ -for (i =first_ending_after (maps, new); i <maps__nr_maps (maps); ) { +for (i =first_ending_after (maps, new); i <__maps__nr_maps (maps); ) {struct map **maps_by_address =maps__maps_by_address (maps);struct map **maps_by_name =maps__maps_by_name (maps);struct map *pos = maps_by_address[i];
@@ -1059,7 +1093,7 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new)return err; }else {struct map *next =NULL ; -unsigned int nr_maps =maps__nr_maps (maps); +unsigned int nr_maps =__maps__nr_maps (maps);if (i +1 < nr_maps) next = maps_by_address[i +1 ];
@@ -1143,8 +1177,8 @@ int maps__copy_from(struct maps *dest, struct maps *parent) }#endif parent_maps_by_address =maps__maps_by_address (parent); - n =maps__nr_maps (parent); -if (maps__nr_maps (dest) ==0 ) { + n =__maps__nr_maps (parent); +if (__maps__nr_maps (dest) ==0 ) {/* No existing mappings so just copy from parent to avoid reallocs in insert. */ unsigned int nr_maps_allocated =RC_CHK_ACCESS (parent)->nr_maps_allocated; struct map **dest_maps_by_address =
@@ -1228,7 +1262,7 @@ struct map *maps__find(struct maps *maps, u64 ip)if (maps__maps_by_address_sorted (maps)) {struct map **mapp =NULL ;struct map **maps_by_address =maps__maps_by_address (maps); -unsigned int nr_maps =maps__nr_maps (maps); +unsigned int nr_maps =__maps__nr_maps (maps);if (maps_by_address && nr_maps) mapp = bsearch(&ip, maps_by_address, nr_maps, sizeof(*mapp),
@@ -1264,7 +1298,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name)/* First check last found entry. */ i =RC_CHK_ACCESS (maps)->last_search_by_name_idx; -if (i <maps__nr_maps (maps) &&maps__maps_by_name (maps)) { +if (i <__maps__nr_maps (maps) &&maps__maps_by_name (maps)) {struct dso *dso =map__dso (maps__maps_by_name (maps)[i]);if (dso &&strcmp (dso__short_name (dso), name) ==0 ) {
@@ -1276,7 +1310,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name)/* Second search sorted array. */ if (!done &&maps__maps_by_name_sorted (maps)) {struct map **mapp = -bsearch (name,maps__maps_by_name (maps),maps__nr_maps (maps), +bsearch (name,maps__maps_by_name (maps),__maps__nr_maps (maps),sizeof (*mapp), map__strcmp_name);if (mapp) {
@@ -1299,7 +1333,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name)down_read (maps__lock (maps)); maps_by_address =maps__maps_by_address (maps); - n =maps__nr_maps (maps); + n =__maps__nr_maps (maps);for (i =0 ; i < n; i++) {struct map *pos = maps_by_address[i];struct dso *dso =map__dso (pos);
@@ -1329,7 +1363,7 @@ struct map *maps__find_next_entry(struct maps *maps, struct map *map)down_read (maps__lock (maps)); } i =maps__by_address_index (maps, map); -if (++i <maps__nr_maps (maps)) +if (++i <__maps__nr_maps (maps)) result =map__get (maps__maps_by_address (maps)[i]);up_read (maps__lock (maps));
@@ -1346,7 +1380,7 @@ void maps__fixup_end(struct maps *maps)__maps__sort_by_address (maps); maps_by_address =maps__maps_by_address (maps); - n =maps__nr_maps (maps); + n =__maps__nr_maps (maps);for (unsigned int i =1 ; i < n; i++) {struct map *prev = maps_by_address[i -1 ];struct map *curr = maps_by_address[i];
@@ -1393,7 +1427,7 @@ int maps__merge_in(struct maps *kmaps, struct map *new_map) first_after_ =first_ending_after (kmaps, new_map); kmaps_maps_by_address =maps__maps_by_address (kmaps); -if (first_after_ >=maps__nr_maps (kmaps) || +if (first_after_ >=__maps__nr_maps (kmaps) ||map__start (kmaps_maps_by_address[first_after_]) >=map__end (new_map)) {/* No overlap so regular insert suffices. */ up_read (maps__lock (kmaps));
@@ -1408,7 +1442,7 @@ int maps__merge_in(struct maps *kmaps, struct map *new_map) first_after_ =first_ending_after (kmaps, new_map); kmaps_maps_by_address =maps__maps_by_address (kmaps); - kmaps__nr_maps =maps__nr_maps (kmaps); + kmaps__nr_maps =__maps__nr_maps (kmaps);if (first_after_ >= kmaps__nr_maps ||map__start (kmaps_maps_by_address[first_after_]) >=map__end (new_map)) {
@@ -1459,10 +1493,15 @@ int maps__merge_in(struct maps *kmaps, struct map *new_map)void maps__load_first (struct maps *maps) { -down_read (maps__lock (maps)); - -if (maps__nr_maps (maps) >0 ) -map__load (maps__maps_by_address (maps)[0 ]); +struct map *first =NULL ; +down_read (maps__lock (maps)); +if (__maps__nr_maps (maps) >0 ) + first =map__get (maps__maps_by_address (maps)[0 ]);up_read (maps__lock (maps)); + +if (first) { +map__load (first); +map__put (first); + } }
Signature · 1 line
2.56.0.385.gd3acb90ef8-goog
[email protected]
AI reviewRe: [PATCH v2 10/10] perf maps: Add context analysis annotations
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [High] perf maps: Missing -1 return check in __maps__remove() causes OOB access --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [High] perf maps: Missing -1 return check in __maps__remove() causes OOB access --
commit cfd924d431a48e1a59506fcafdc9a6ec06b58bad
Author: Ian Rogers <[email protected]>
perf maps: Add context analysis annotations
This commit adds lock annotations for static analysis of the maps locking context. It also modifies maps__load_first() to take a map reference to prevent read-to-write deadlocks during map loading.
Quoted 3 lines
tools/perf/util/maps.c +0
-0
[ ... ]
tools/perf/util/maps.c int maps__insert(struct maps *maps, struct map *map) · line 580
Quoted 13 lines
tools/perf/util/maps.c +2
-1@@ -540,10 +570,11 @@ int maps__insert(struct maps *maps, struct map *map) }static void __maps__remove (struct maps *maps,struct map *map) +__must_hold (maps__lock (maps)) {struct map **maps_by_address =maps__maps_by_address (maps);struct map **maps_by_name =maps__maps_by_name (maps); -unsigned int nr_maps =maps__nr_maps (maps); +unsigned int nr_maps =__maps__nr_maps (maps);unsigned int address_idx;/* Slide later mappings over the one to remove */
[Severity: High]
Could the lack of a return value check on maps__by_address_index() lead to an out-of-bounds array access here?
In concurrent environments, a TOCTOU race can occur. For instance, machine__process_ksymbol_unregister() retrieves a map via maps__find() (which drops the read lock) and then calls maps__remove() (which acquires the write lock):
tools/perf/util/machine.c:machine__process_ksymbol_unregister() {
...
map = maps__find(machine__kernel_maps(machine), event->ksymbol.addr);
if (!map)
return 0;
if (!RC_CHK_EQUAL(map, machine->vmlinux_map))
maps__remove(machine__kernel_maps(machine), map);
...
}If another thread removes the map in the interim, maps__by_address_index() will print an error and return -1:
tools/perf/util/maps.c:maps__by_address_index() {
...
pr_err("Map missing from maps");
return -1;
}Since address_idx is unsigned, the -1 casts to UINT_MAX. When __maps__remove() continues, it directly uses this value, resulting in out-of-bounds accesses:
tools/perf/util/maps.c:__maps__remove() {
...
address_idx = maps__by_address_index(maps, map);
map__put(maps_by_address[address_idx]);
memmove(&maps_by_address[address_idx],
&maps_by_address[address_idx + 1],
(nr_maps - address_idx - 1) * sizeof(*maps_by_address));
...
}Would it be safer to check if address_idx is valid (e.g., != -1) before performing the map__put() and memmove() operations?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=10
Bart Van Assche
reviewerQuoted 6 lines · Ian Rogers
The perf tool previously added Clang thread-safety annotations in
tools/perf/util/mutex.h(GUARDED_BY, LOCKABLE,EXCLUSIVE_LOCK_FUNCTION,UNLOCK_FUNCTION, etc.). Since then, the Linux kernel has adopted a unified set of static context analysis macros and attributes ininclude/linux/compiler-context-analysis.h(context_lock_struct,__guarded_by,__acquires,__releases,__must_hold, etc.).
New versions of a patch series should be posted as a new e-mail thread instead of as a reply to an existing email thread. Additionally, posting a new version of a patch series only four hours after the previous version is way too soon.
The LLM that I asked to take a look at this patch series came up with the feedback below. Please take a look at this feedback.
Thanks,
Bart.
--------------------------------------------------------------------------
Verdict: Needs Substantive Revision
While the overall goal and majority of the annotations are well-executed, several patches bundle distinct bug fixes with refactoring and annotation churn (violating the "one logical change per patch" rule). Additionally, there are concurrency and lifetime subtleties in the newly introduced dsos__findnew_id() read-lock fast path and vdso.c, an unsynchronized benign data race in maps.c, and missing Fixes: attribution tags.
2. Critical & Concurrency Findings
A. Patch 07/10: Lock drop-and-reacquire race and unneeded re-invalidations in dsos__findnew_id()
In tools/perf/util/dsos.c:
struct dso *dsos__findnew_id(struct dsos *dsos, const char *name, const struct dso_id *id)
{
struct dso *dso;
down_read(&dsos->lock);
dso = __dsos__find_id(dsos, name, id, false, /*write_locked=*/false);
if (dso && !dso__needs_improve_id(dso, id)) {
up_read(&dsos->lock);
return dso;
}
up_read(&dsos->lock);
down_write(&dsos->lock);
if (dso)
__dso__improve_id(dso, id);
else
dso = __dsos__findnew_id(dsos, name, id);
up_write(&dsos->lock);
return dso;
}Issue: If dso is found under down_read but needs ID improvement (dso__needs_improve_id(dso, id) == true), up_read() releases the lock. Before down_write() is acquired, another thread may have acquired down_write() and already improved the DSO's ID with the identical or better info.
Consequence: When down_write() is acquired, __dso__improve_id(dso, id) is executed unconditionally without re-checking dso__needs_improve_id(). While updating fields is mostly idempotent, __dso__improve_id() sets dsos->sorted = false;, unnecessarily degrading subsequent read lookups to qsort().
Fix: Re-check dso__needs_improve_id(dso, id) under down_write(). If no improvement is needed, avoid calling __dso__improve_id().
B. Patch 07/10: Unnecessary lock churn and array sort invalidation in vdso.c
In tools/perf/util/vdso.c:
static struct dso *__machine__addnew_vdso(struct machine *machine, const char *short_name, const char *long_name)
{
struct dso *dso;
dso = dso__new(short_name);
if (dso != NULL) {
dsos__add(&machine->dsos, dso);
dso__set_long_name(dso, long_name, false);
}Issue: Calling dsos__add() followed by dso__set_long_name() causes two separate down_write(&machine->dsos.lock) acquisitions in immediate succession. Worse, dsos__add() inserts the DSO into the array ordered by its current short_name. Immediately afterwards, dso__set_long_name() mutates the name and explicitly sets dsos->sorted = false; (lines 1528 in dso.c).
Fix: Set the long name before adding the DSO to dsos (matching the pattern used in dsos__findnew_module_dso() in util/dsos.c):
dso = dso__new(short_name);
if (dso != NULL) {
dso__set_long_name(dso, long_name, false);
dsos__add(&machine->dsos, dso);
}This requires only a single write lock acquisition in dsos__add() and keeps dsos->sorted = true.
C. Patch 10/10: Unsynchronized concurrent write in maps__find_by_name()
In tools/perf/util/maps.c:
struct map *maps__find_by_name(struct maps *maps, const char *name) {
...
while (!done) {
down_read(maps__lock(maps));
...
/* Second search sorted array. */
if (!done && maps__maps_by_name_sorted(maps)) {
struct map **mapp =
bsearch(name, maps__maps_by_name(maps), __maps__nr_maps(maps),
sizeof(*mapp), map__strcmp_name);
if (mapp) {
result = map__get(*mapp);
i = mapp - maps__maps_by_name(maps);
RC_CHK_ACCESS(maps)->last_search_by_name_idx = i;
}
done = true;
}
up_read(maps__lock(maps));Issue: last_search_by_name_idx is written while holding only down_read(maps__lock(maps)). Because multiple reader threads execute maps__find_by_name() concurrently, this is a concurrent write race (which is why last_search_by_name_idx could not be annotated with __guarded_by(&lock)).
Consequence: Under TSAN or strict memory models, unsynchronized conflicting writes cause data races.
Suggestion: Use WRITE_ONCE()/data_race() on the assignment, or annotate last_search_by_name_idx with a brief comment explaining that this is an intentional, benign unlocked cache update.
3. Patch Architecture & Organization Findings
Per Documentation/process/submitting-patches.rst ("Separate each logical change into a separate patch"):
Patch 07/10 mixes 4 distinct logical changes:
Bug fix: Fixing the unlocked __dsos__add() call in __machine__addnew_vdso(). Performance optimization: Adding the read-lock fast path in dsos__findnew_id().
Refactoring: Replacing _dso__data_open_lock and pthread_once with DEFINE_MUTEX(dso__data_open_lock).
Annotations: Adding static context analysis macros across dso.c, dso.h, dsos.c, dsos.h.
Recommendation: Split this patch into at least 3 patches:
Standalone bug fix for vdso.c with a Fixes: tag (see metadata below).
Standalone performance optimization for dsos__findnew_id().
DSO/DSOs lock annotations and mutex cleanup.
Patch 09/10 bundles three disparate subsystems plus a bug fix:
Combines perf config, intel-tpebs, and perf_env.
Includes a real bug fix: fixing an unlocked read of tpebs_reader_thread after releasing tpebs_mtx in tpebs_stop().
Recommendation: Split the intel-tpebs race fix into its own commit with a Fixes: tag. Split the remaining annotations into separate commits per subsystem (perf config, perf intel-tpebs, and perf env).
Ian Rogers
reviewerQuoted 9 lines · Bart Van Assche
Quoted 6 lines · Ian Rogers
The perf tool previously added Clang thread-safety annotations in
tools/perf/util/mutex.h(GUARDED_BY, LOCKABLE,EXCLUSIVE_LOCK_FUNCTION,UNLOCK_FUNCTION, etc.). Since then, the Linux kernel has adopted a unified set of static context analysis macros and attributes ininclude/linux/compiler-context-analysis.h(context_lock_struct,__guarded_by,__acquires,__releases,__must_hold, etc.).
Quoted 7 lines
New versions of a patch series should be posted as a new e-mail thread instead of as a reply to an existing email thread. Additionally, posting a new version of a patch series only four hours after the previous version is way too soon.
The LLM that I asked to take a look at this patch series came up with the feedback below. Please take a look at this feedback.
Hi Bart,
Which mailing list is objecting to the frequent emails? I'll remove it and yourself from follow ups as the intended recipients are on linux-perf-users except for patch 1, which fixes a build issue in a file copied into the tools directory. The LLM feedback included was flawed and introduces feature creep.
Thanks,
Ian
Quoted 150 lines
Thanks,
Bart.
--------------------------------------------------------------------------
Verdict: Needs Substantive Revision
While the overall goal and majority of the annotations are well-executed, several patches bundle distinct bug fixes with refactoring and annotation churn (violating the "one logical change per patch" rule).
Additionally, there are concurrency and lifetime subtleties in the newly introduceddsos__findnew_id()read-lock fast path andvdso.c, an unsynchronized benign data race inmaps.c, and missing Fixes:
attribution tags.2. Critical & Concurrency Findings
A. Patch 07/10: Lock drop-and-reacquire race and unneeded re-invalidations in
dsos__findnew_id()In
tools/perf/util/dsos.c:struct dso *dsos__findnew_id(struct dsos *dsos, const char *name, const struct
dso_id*id){ struct dso *dso; down_read(&dsos->lock); dso = __dsos__find_id(dsos, name, id, false, /*write_locked=*/false); if (dso && !dso__needs_improve_id(dso, id)) { up_read(&dsos->lock); return dso; } up_read(&dsos->lock); down_write(&dsos->lock); if (dso) __dso__improve_id(dso, id); else dso = __dsos__findnew_id(dsos, name, id); up_write(&dsos->lock); return dso; }Issue: If dso is found under
down_readbut needs ID improvement (dso__needs_improve_id(dso, id)== true),up_read()releases the lock. Beforedown_write()is acquired, another thread may have acquireddown_write()and already improved the DSO's ID with the identical or better info.
Consequence: Whendown_write()is acquired,__dso__improve_id(dso, id)is executed unconditionally without re-checkingdso__needs_improve_id(). While updating fields is mostly idempotent,__dso__improve_id()setsdsos->sorted= false;, unnecessarily degrading subsequent read lookups toqsort().
Fix: Re-checkdso__needs_improve_id(dso, id)underdown_write(). If no improvement is needed, avoid calling__dso__improve_id().
B. Patch 07/10: Unnecessary lock churn and array sort invalidation invdso.cIn
tools/perf/util/vdso.c:static struct dso *__machine__addnew_vdso(struct machine *machine, const char
*short_name, const char*long_name){ struct dso *dso; dso = dso__new(short_name); if (dso != NULL) { dsos__add(&machine->dsos, dso); dso__set_long_name(dso, long_name, false); }Issue: Calling
dsos__add()followed bydso__set_long_name()causes two separatedown_write(&machine->dsos.lock)acquisitions in immediate succession. Worse,dsos__add()inserts the DSO into the array ordered by its currentshort_name. Immediately afterwards,dso__set_long_name()mutates the name and explicitly setsdsos->sorted= false; (lines 1528 indso.c).
Fix: Set the long name before adding the DSO to dsos (matching the pattern used indsos__findnew_module_dso()inutil/dsos.c):dso = dso__new(short_name); if (dso != NULL) { dso__set_long_name(dso, long_name, false); dsos__add(&machine->dsos, dso); }This requires only a single write lock acquisition in
dsos__add()and keepsdsos->sorted= true.C. Patch 10/10: Unsynchronized concurrent write in
maps__find_by_name()In
tools/perf/util/maps.c:struct map *maps__find_by_name(struct maps *maps, const char *name) {
...while (!done) { down_read(maps__lock(maps)); ... /* Second search sorted array. */ if (!done && maps__maps_by_name_sorted(maps)) { struct map **mapp = bsearch(name, maps__maps_by_name(maps), __maps__nr_maps(maps), sizeof(*mapp), map__strcmp_name); if (mapp) { result = map__get(*mapp); i = mapp - maps__maps_by_name(maps); RC_CHK_ACCESS(maps)->last_search_by_name_idx = i; } done = true; } up_read(maps__lock(maps));Issue:
last_search_by_name_idxis written while holding only down_read(maps__lock(maps)). Because multiple reader threads executemaps__find_by_name()concurrently, this is a concurrent write race (which is whylast_search_by_name_idxcould not be annotated with__guarded_by(&lock)).
Consequence: Under TSAN or strict memory models, unsynchronized conflicting writes cause data races.
Suggestion: Use WRITE_ONCE()/data_race() on the assignment, or annotatelast_search_by_name_idxwith a brief comment explaining that this is an intentional, benign unlocked cache update.3. Patch Architecture & Organization Findings
Per
Documentation/process/submitting-patches.rst("Separate each logical change into a separate patch"):Patch 07/10 mixes 4 distinct logical changes:
Bug fix: Fixing the unlocked
__dsos__add()call in__machine__addnew_vdso(). Performance optimization: Adding the read-lock fast path indsos__findnew_id().
Refactoring: Replacing_dso__data_open_lockandpthread_oncewithDEFINE_MUTEX(dso__data_open_lock).
Annotations: Adding static context analysis macros acrossdso.c,dso.h,dsos.c,dsos.h.
Recommendation: Split this patch into at least 3 patches:
Standalone bug fix forvdso.cwith a Fixes: tag (see metadata below). Standalone performance optimization fordsos__findnew_id(). DSO/DSOs lock annotations and mutex cleanup.Patch 09/10 bundles three disparate subsystems plus a bug fix:
Combines perf config, intel-tpebs, and
perf_env.
Includes a real bug fix: fixing an unlocked read oftpebs_reader_threadafter releasingtpebs_mtxintpebs_stop().
Recommendation: Split the intel-tpebs race fix into its own commit with a Fixes: tag. Split the remaining annotations into separate commits per subsystem (perf config, perf intel-tpebs, and perf env).
Bart Van Assche
reviewerQuoted 1 line · Ian Rogers
Which mailing list is objecting to the frequent emails?
This is a policy that applies to all Linux kernel related mailing lists. From Documentation/process/submitting-patches.rst: "Wait for a minimum of one week before resubmitting or pinging reviewers - possibly longer during busy times like merge windows."
Bart.
Ian Rogers
reviewerQuoted 7 lines · Bart Van Assche
Quoted 1 line · Ian Rogers
Which mailing list is objecting to the frequent emails?
This is a policy that applies to all Linux kernel related mailing lists. From
Documentation/process/submitting-patches.rst: "Wait for a minimum of one week before resubmitting or pinging reviewers - possibly longer during busy times like merge windows."
That's a nice try, but you misquoted the documentation. As the cover letter explaining the fixes makes clear, these are different versions of the patch series, not resubmissions of the same one.
Thanks,
Ian
Quoted 2 lines
Bart.
Ian Rogers
reviewerv3 cover tools/perf: Adopt kernel compiler-context-analysis.h annotations
In reply to Ian RogersThe perf tool previously added Clang thread-safety annotations in tools/perf/util/mutex.h (GUARDED_BY, LOCKABLE, EXCLUSIVE_LOCK_FUNCTION, UNLOCK_FUNCTION, etc.). Since then, the Linux kernel has adopted a unified set of static context analysis macros and attributes in include/linux/compiler-context-analysis.h (context_lock_struct, __guarded_by, __acquires, __releases, __must_hold, etc.).
This series makes tools/include/linux/compiler-context-analysis.h functional by synchronizing it and the required compiler_types.h helpers with the kernel headers, converts tools/perf from its custom mutex.h macros to the kernel-style compiler-context-analysis.h annotations, and expands context analysis coverage across comm, dso/dsos, thread/threads, config, intel-tpebs, env, and maps. Along the way, separate preparatory patches fix an unlocked __dsos__add() call and TOCTOU race in __machine__addnew_vdso(), avoid dropping _dso__data_open_lock in dso__list_del() under REFCNT_CHECKING, switch dso__data_open_lock and tpebs_mtx to DEFINE_MUTEX(), add a read-lock fast path to dsos__findnew_id(), fix an unlocked read of tpebs_reader_thread and double-close of tpebs_cmd.out in intel-tpebs, and avoid a potential read-to-write deadlock in maps__load_first() and out-of-bounds access in __maps__remove().
This series was developed and reviewed with assistance from an AI coding agent (Gemini 3.1 Pro) and reviewed with Sashiko.
v3:
- Rebase onto perf-tools-next (converting the newly added dso__find_binary_type() lock annotations in util/dso.c).
- Separate bug fixes, DEFINE_MUTEX() cleanups, and improvements (vdso, dso_data, dso__data_open_lock, dsos__findnew_id, intel-tpebs, tpebs_mtx, maps) from the annotation patches.
- Move AI coding assistant attribution to the cover letter and drop per-commit Assisted-by tags per linux-next Documentation/process/coding-assistants.rst.
- Add Marco Elver's Reviewed-by to patch 1.
- Define __diag_clang_23() and Clang ASM_INPUT_G/ASM_INPUT_RM/ ASM_OUTPUT_RM overrides in tools/include/linux/compiler-gcc.h (patch 2).
- Probe for -Wthread-safety-pointer/-Wthread-safety-beta in Makefile.config (patch 5).
- Pass write_locked to __dsos__find() (patch 7).
- Pass struct dso_data * to close_data_fd() and dso__list_del() to remove the REFCNT_CHECKING dso pointer from struct dso_data and avoid dropping dso__data_open_lock in dso__list_del(), and include <assert.h> in util/dso.c (patch 8).
- Re-validate DSO lookup under the write lock in dsos__findnew_id()
via __dsos__findnew_id(), and handle NULL dso_id in
dso__needs_improve_id(), __dso__improve_id(), and dso_id__cmp()
(patch 10).
- Reset tpebs_cmd.out = -1 if start_command() fails and include
<stdint.h>, <stdlib.h>, <string.h>, and <unistd.h> in
util/intel-tpebs.c (patch 13). - Bounds-check the index in __maps__remove() (freeing maps_by_name if out of bounds) (patch 16).
v2:
- Use -c rather than -E when probing for -fexperimental-late-parse-attributes in Makefile.config to avoid -Werror,-Wunused-command-line-argument.
- Acquire machine->dsos.lock in write mode across duplicate checking,
dso__set_long_name(), and __dsos__add() in __machine__addnew_vdso().
- Avoid dropping dso__data_open_lock in dso__list_del() under REFCNT_CHECKING.
- Pass tpebs_cmd.out directly to __sample_reader() and set tpebs_cmd.out = -1 in evsel__tpebs_open() to avoid a double-close in tpebs_stop(), and clarify the config_set_mutex comment.
- Drop maps__lock before calling map__load() in maps__load_first() to avoid a read-to-write self-deadlock when loading kernel maps inserts additional trampoline maps.
Ian Rogers (17):
compiler-context-analysis: Avoid unused parameter warning in
_context_unsafe_alias()
tools headers compiler: Synchronize compiler_types.h with the kernel
sources
tools headers: Synchronize linux/compiler-context-analysis.h with the
kernel sources
perf mutex: Use kernel style compiler-context-analysis.h annotations perf build: Enable additional Clang thread-safety flags perf comm: Add __guarded_by annotations to struct comm_strs perf vdso: Fix unlocked __dsos__add() and race in
__machine__addnew_vdso()
perf dso: Pass dso_data to close_data_fd() and dso__list_del()
perf dso: Use DEFINE_MUTEX for dso__data_open_lock
perf dsos: Use read lock fast path in dsos__findnew_id()
perf dso: Expand context analysis annotations
perf thread: Expand context analysis annotations to threads and
namespaces_lock
perf intel-tpebs: Fix race in tpebs_stop() and tpebs_cmd.out fd
handling
perf intel-tpebs: Use DEFINE_MUTEX for tpebs_mtx
perf config, intel-tpebs, env: Add __guarded_by and __must_hold
annotations
perf maps: Fix lock inversion in maps__load_first() and bounds check
in __maps__remove()perf maps: Add context analysis annotations
include/linux/compiler-context-analysis.h | 2 +- .../include/linux/compiler-context-analysis.h | 518 ++++++++++++++++-- tools/include/linux/compiler-gcc.h | 72 ++- tools/include/linux/compiler.h | 50 +- tools/include/linux/compiler_types.h | 206 ++++++- tools/perf/Makefile.config | 8 +- tools/perf/builtin-sched.c | 16 +- tools/perf/builtin-top.c | 4 +- tools/perf/check-headers.sh | 1 + tools/perf/tests/dso-data.c | 4 + tools/perf/util/annotate.c | 4 +- tools/perf/util/annotate.h | 8 +- tools/perf/util/bpf-event.h | 5 +- tools/perf/util/comm.c | 10 +- tools/perf/util/config.c | 43 +- tools/perf/util/dso.c | 140 +++-- tools/perf/util/dso.h | 15 +- tools/perf/util/dsos.c | 31 +- tools/perf/util/dsos.h | 12 +- tools/perf/util/env.c | 1 + tools/perf/util/env.h | 19 +- tools/perf/util/intel-tpebs.c | 104 ++-- tools/perf/util/libbfd.c | 4 +- tools/perf/util/maps.c | 147 +++-- tools/perf/util/mutex.c | 4 +- tools/perf/util/mutex.h | 90 +-- tools/perf/util/rwsem.c | 8 +- tools/perf/util/rwsem.h | 10 +- tools/perf/util/thread.c | 10 +- tools/perf/util/thread.h | 30 +- tools/perf/util/threads.c | 4 + tools/perf/util/threads.h | 6 +- tools/perf/util/vdso.c | 17 +- 33 files changed, 1144 insertions(+), 459 deletions(-)
Signature · 1 line
2.56.0.212.g129ede20d9-goog
Ian Rogers
reviewerPATCH v3 1/17 compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias()
_context_unsafe_alias() does not use its parameter 'p', which triggers -Wunused-parameter when building code that enables -Wextra (such as tools/perf, tools/lib/perf, tools/lib/subcmd, and tools/lib/symbol). Explicitly cast 'p' to void to silence the warning, matching __assume_ctx_lock() and __assume_shared_ctx_lock().
--- include/linux/compiler-context-analysis.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/compiler-context-analysis.h +1 -1
@@ -243,7 +243,7 @@* alias as a function argument). */ #define context_unsafe_alias (p) _context_unsafe_alias((void **)&(p)) -static inline void _context_unsafe_alias (void **p) { } +static inline void _context_unsafe_alias (void **p) { (void )p; }/** * token_context_lock() - declare an abstract global context lock instance
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v3 01/17] compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias()
Sashiko has reviewed this patch and found no issues.
Quoted 8 lines
_context_unsafe_alias()does not use its parameter 'p', which triggers -Wunused-parameter when building code that enables -Wextra (such astools/perf,tools/lib/perf,tools/lib/subcmd, andtools/lib/symbol). Explicitly cast 'p' to void to silence the warning, matching__assume_ctx_lock()and__assume_shared_ctx_lock().Reviewed-by Marco Elver <[email protected]>Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Ian Rogers
reviewerPATCH v3 2/17 tools headers compiler: Synchronize compiler_types.h with the kernel sources
In reply to Ian RogersSynchronize the non-__KERNEL__ sections of tools/include/linux/compiler_types.h and tools/include/linux/compiler-gcc.h with the kernel sources (including ___PASTE/__PASTE, BTF_TYPE_TAG, object-size helpers, asm_goto_output, ASM_INPUT_*, asm_inline, __typeof_unqual__/__unqual_scalar_typeof, __signed_scalar_typeof, __native_word, compiletime_assert, and the __diag pragma helpers required by compiler-context-analysis.h), and remove the duplicated definitions from tools/include/linux/compiler.h.
--- tools/include/linux/compiler-gcc.h | 72 +++++++++- tools/include/linux/compiler.h | 50 +------ tools/include/linux/compiler_types.h | 206 ++++++++++++++++++++++++++- 3 files changed, 275 insertions(+), 53 deletions(-)
tools/include/linux/compiler-gcc.h +69 -3
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _TOOLS_LINUX_COMPILER_H_ +#ifndef __LINUX_COMPILER_TYPES_H#error "Please do not include <linux/compiler-gcc.h> directly, include <linux/compiler.h> instead." -#endif +#endif /* __LINUX_COMPILER_TYPES_H */ /* * Common definitions for all gcc versions go here.
@@ -33,10 +33,76 @@#define __packed __attribute__((packed))#endif #ifndef __noreturn -#define __noreturn __attribute__((noreturn)) +#define __noreturn __attribute__((__noreturn__))#endif #ifndef __aligned#define __aligned (x) __attribute__((aligned(x)))#endif #define __printf (a, b) __attribute__((format(printf, a, b)))#define __scanf (a, b) __attribute__((format(scanf, a, b))) + +/* +* Turn individual warnings and errors on and off locally, depending +* on version. +*/ +#define __diag_str1 (s) #s +#define __diag_str (s) __diag_str1(s) + +#ifdef __clang__ +#define __diag_clang (version, severity, s) \ + __diag_clang_ ## version(__diag_clang_ ## severity s) + +/* Severity used in pragma directives */ +#define __diag_clang_ignore ignored +#define __diag_clang_warn warning +#define __diag_clang_error error + +#define __diag (s) _Pragma(__diag_str(clang diagnostic s)) + +#if __clang_major__ >=23 +#define __diag_clang_23 (s) __diag(s) +#else +#define __diag_clang_23 (s) +#endif + +#define __diag_clang_all (s) __diag(s) + +#define __diag_ignore_all (option, comment) \ + __diag_clang(all, ignore, option) + +/* +* clang has horrible behavior with "g" or "rm" constraints for asm +* inputs, turning them into something worse than "m". Avoid using +* constraints with multiple possible uses (but "ir" seems to be ok): +* +* https://github.com/llvm/llvm-project/issues/20571 +*/ +#define ASM_INPUT_G "ir" +#define ASM_INPUT_RM "r" +#define ASM_OUTPUT_RM "=r" + +#define CC_HAS_TYPEOF_UNQUAL (__clang_major__ > 19 || (__clang_major__ == 19 && __clang_minor__ > 0)) +#else /* !__clang__ */ +#define __diag_GCC (version, severity, s) \ + __diag_GCC_ ## version(__diag_GCC_ ## severity s) + +/* Severity used in pragma directives */ +#define __diag_GCC_ignore ignored +#define __diag_GCC_warn warning +#define __diag_GCC_error error + +#define __diag (s) _Pragma(__diag_str(GCC diagnostic s)) + +#if GCC_VERSION >=80000 +#define __diag_GCC_8 (s) __diag(s) +#else +#define __diag_GCC_8 (s) +#endif + +#define __diag_GCC_all (s) __diag(s) + +#define __diag_ignore_all (option, comment) \ + __diag(__diag_GCC_ignore option) + +#define CC_HAS_TYPEOF_UNQUAL (__GNUC__ >= 14) +#endif /* __clang__ */
tools/include/linux/compiler.h +3 -47
80 lines not on this page · raw message
tools/include/linux/compiler_types.h +203 -3
236 lines not on this page · raw message
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v3 02/17] tools headers compiler: Synchronize compiler_types.h with the kernel sources
Sashiko has reviewed this patch and found no issues.
Quoted 10 lines
Synchronize the non-__KERNEL__ sections of
tools/include/linux/compiler_types.handtools/include/linux/compiler-gcc.hwith the kernel sources (including ___PASTE/__PASTE,BTF_TYPE_TAG, object-size helpers,asm_goto_output, ASM_INPUT_*,asm_inline, __typeof_unqual__/__unqual_scalar_typeof,__signed_scalar_typeof,__native_word,compiletime_assert, and the__diagpragma helpers required bycompiler-context-analysis.h), and remove the duplicated definitions fromtools/include/linux/compiler.h.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
Ian Rogers
reviewerPATCH v3 3/17 tools headers: Synchronize linux/compiler-context-analysis.h with the kernel sources
In reply to Ian RogersReplace the no-op stub tools/include/linux/compiler-context-analysis.h with the full kernel implementation from include/linux/compiler-context-analysis.h and add it to tools/perf/check-headers.sh so future changes are tracked.
--- .../include/linux/compiler-context-analysis.h | 518 ++++++++++++++++-- tools/perf/check-headers.sh | 1 + 2 files changed, 480 insertions(+), 39 deletions(-)
tools/include/linux/compiler-context-analysis.h +479 -39
@@ -1,42 +1,482 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _TOOLS_LINUX_COMPILER_CONTEXT_ANALYSIS_H -#define _TOOLS_LINUX_COMPILER_CONTEXT_ANALYSIS_H -/* * Macros and attributes for compiler-based static context analysis. -* No-op stubs for tools. -*/ - -#define __guarded_by (...) -#define __pt_guarded_by (...) - -#define context_lock_struct (name, ...) struct __VA_ARGS__ name - -#define __no_context_analysis -#define __context_unsafe (comment) -#define context_unsafe (...) ({ __VA_ARGS__; }) -#define context_unsafe_alias (p) -#define disable_context_analysis () -#define enable_context_analysis () - -#define __must_hold (...) -#define __must_not_hold (...) -#define __acquires (...) -#define __cond_acquires (ret, x) -#define __releases (...) -#define __acquire (x) (void)0 -#define __release (x) (void)0 - -#define __must_hold_shared (...) -#define __acquires_shared (...) -#define __cond_acquires_shared (ret, x) -#define __releases_shared (...) -#define __acquire_shared (x) (void)0 -#define __release_shared (x) (void)0 - -#define __acquire_ret (call, expr) (call) -#define __acquire_shared_ret (call, expr) (call) -#define __acquires_ret -#define __acquires_shared_ret - -#endif /* _TOOLS_LINUX_COMPILER_CONTEXT_ANALYSIS_H */ +*/ + +#ifndef _LINUX_COMPILER_CONTEXT_ANALYSIS_H +#define _LINUX_COMPILER_CONTEXT_ANALYSIS_H + +#if defined(WARN_CONTEXT_ANALYSIS ) && !defined(__CHECKER__) && !defined(__GENKSYMS__) + +/* +* These attributes define new context lock (Clang: capability) types. +* Internal only. +*/ +# define __ctx_lock_type (name) __attribute__((capability(#name))) +# define __reentrant_ctx_lock __attribute__((reentrant_capability)) +# define __acquires_ctx_lock (...) __attribute__((acquire_capability(__VA_ARGS__))) +# define __acquires_shared_ctx_lock (...) __attribute__((acquire_shared_capability(__VA_ARGS__))) +# define __try_acquires_ctx_lock (ret, var) __attribute__((try_acquire_capability(ret, var))) +# define __try_acquires_shared_ctx_lock (ret, var) __attribute__((try_acquire_shared_capability(ret, var))) +# define __releases_ctx_lock (...) __attribute__((release_capability(__VA_ARGS__))) +# define __releases_shared_ctx_lock (...) __attribute__((release_shared_capability(__VA_ARGS__))) +# define __returns_ctx_lock (var) __attribute__((lock_returned(var))) + +/* +* The below are used to annotate code being checked. Internal only. +*/ +# define __excludes_ctx_lock (...) __attribute__((locks_excluded(__VA_ARGS__))) +# define __requires_ctx_lock (...) __attribute__((requires_capability(__VA_ARGS__))) +# define __requires_shared_ctx_lock (...) __attribute__((requires_shared_capability(__VA_ARGS__))) + +/* +* The "assert_capability" attribute is a bit confusingly named. It does not +* generate a check. Instead, it tells the analysis to *assume* the capability +* is held. This is used for augmenting runtime assertions, that can then help +* with patterns beyond the compiler's static reasoning abilities. +*/ +# define __assumes_ctx_lock (...) __attribute__((assert_capability(__VA_ARGS__))) +# define __assumes_shared_ctx_lock (...) __attribute__((assert_shared_capability(__VA_ARGS__))) + +/** +* __guarded_by() - struct member and globals attribute, declares variable +* only accessible within active context +* @...: context lock instance pointer(s) +* +* Declares that the struct member or global variable is only accessible within +* the context entered by the given context lock(s). Read operations on the data +* require shared access to at least one of the context locks, while write +* operations require exclusive access to all listed context locks. +* +* .. code-block:: c +* +* struct some_state { +* spinlock_t lock; +* long counter __guarded_by(&lock); +* }; +* +* struct some_state { +* spinlock_t lock1, lock2; +* long counter __guarded_by(&lock1, &lock2); +* }; +*/ +# define __guarded_by (...) __attribute__((guarded_by(__VA_ARGS__))) + +/** +* __pt_guarded_by() - struct member and globals attribute, declares pointed-to +* data only accessible within active context +* @...: context lock instance pointer(s) +* +* Declares that the data pointed to by the struct member pointer or global +* pointer is only accessible within the context entered by the given context +* lock(s). Read operations on the data require shared access to at least one +* of the context locks, while write operations require exclusive access to all +* listed context locks. +* +* .. code-block:: c +* +* struct some_state { +* spinlock_t lock; +* long *counter __pt_guarded_by(&lock); +* }; +* +* struct some_state { +* spinlock_t lock1, lock2; +* long *counter __pt_guarded_by(&lock1, &lock2); +* }; +*/ +# define __pt_guarded_by (...) __attribute__((pt_guarded_by(__VA_ARGS__))) + +/** +* context_lock_struct() - declare or define a context lock struct +* @name: struct name +* +* Helper to declare or define a struct type that is also a context lock. +* +* .. code-block:: c +* +* context_lock_struct(my_handle) { +* int foo; +* long bar; +* }; +* +* struct some_state { +* ... +* }; +* // ... declared elsewhere ... +* context_lock_struct(some_state); +* +* Note: The implementation defines several helper functions that can acquire +* and release the context lock. +*/ +# define context_lock_struct (name, ...) \ + struct __ctx_lock_type(name) __VA_ARGS__ name; \ + static __always_inline void __acquire_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __no_context_analysis __acquires_ctx_lock(var) { } \ + static __always_inline void __acquire_shared_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __no_context_analysis __acquires_shared_ctx_lock(var) { } \ + static __always_inline bool __try_acquire_ctx_lock(const struct name *var, bool ret) \ + __attribute__((overloadable)) __no_context_analysis __try_acquires_ctx_lock(1, var) \ + { return ret; } \ + static __always_inline bool __try_acquire_shared_ctx_lock(const struct name *var, bool ret) \ + __attribute__((overloadable)) __no_context_analysis __try_acquires_shared_ctx_lock(1, var) \ + { return ret; } \ + static __always_inline void __release_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __no_context_analysis __releases_ctx_lock(var) { } \ + static __always_inline void __release_shared_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __no_context_analysis __releases_shared_ctx_lock(var) { } \ + static __always_inline void __assume_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __assumes_ctx_lock(var) { } \ + static __always_inline void __assume_shared_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __assumes_shared_ctx_lock(var) { } \ + struct name + +/** +* disable_context_analysis() - disables context analysis +* +* Disables context analysis. Must be paired with a later +* enable_context_analysis(). +*/ +# define disable_context_analysis () \ + __diag_push(); \ + __diag_ignore_all("-Wunknown-warning-option", "") \ + __diag_ignore_all("-Wthread-safety", "") \ + __diag_ignore_all("-Wthread-safety-pointer", "") + +/** +* enable_context_analysis() - re-enables context analysis +* +* Re-enables context analysis. Must be paired with a prior +* disable_context_analysis(). +*/ +# define enable_context_analysis () __diag_pop() + +/** +* __no_context_analysis - function attribute, disables context analysis +* +* Function attribute denoting that context analysis is disabled for the +* whole function. Prefer use of `context_unsafe()` where possible. +*/ +# define __no_context_analysis __attribute__((no_thread_safety_analysis)) + +#else /* !WARN_CONTEXT_ANALYSIS */ + +# define __ctx_lock_type (name) +# define __reentrant_ctx_lock +# define __acquires_ctx_lock (...) +# define __acquires_shared_ctx_lock (...) +# define __try_acquires_ctx_lock (ret, var) +# define __try_acquires_shared_ctx_lock (ret, var) +# define __releases_ctx_lock (...) +# define __releases_shared_ctx_lock (...) +# define __assumes_ctx_lock (...) +# define __assumes_shared_ctx_lock (...) +# define __returns_ctx_lock (var) +# define __guarded_by (...) +# define __pt_guarded_by (...) +# define __excludes_ctx_lock (...) +# define __requires_ctx_lock (...) +# define __requires_shared_ctx_lock (...) +# define __acquire_ctx_lock (var) do { } while (0) +# define __acquire_shared_ctx_lock (var) do { } while (0) +# define __try_acquire_ctx_lock (var, ret) (ret) +# define __try_acquire_shared_ctx_lock (var, ret) (ret) +# define __release_ctx_lock (var) do { } while (0) +# define __release_shared_ctx_lock (var) do { } while (0) +# define __assume_ctx_lock (var) do { (void)(var); } while (0) +# define __assume_shared_ctx_lock (var) do { (void)(var); } while (0) +# define context_lock_struct (name, ...) struct __VA_ARGS__ name +# define disable_context_analysis () +# define enable_context_analysis () +# define __no_context_analysis + +#endif /* WARN_CONTEXT_ANALYSIS */ + +/** +* context_unsafe() - disable context checking for contained code +* +* Disables context checking for contained statements or expression. +* +* .. code-block:: c +* +* struct some_data { +* spinlock_t lock; +* int counter __guarded_by(&lock); +* }; +* +* int foo(struct some_data *d) +* { +* // ... +* // other code that is still checked ... +* // ... +* return context_unsafe(d->counter); +* } +*/ +#define context_unsafe (...) \ +({ \ + disable_context_analysis(); \ + __VA_ARGS__; \ + enable_context_analysis() \ +}) + +/** +* __context_unsafe() - function attribute, disable context checking +* @comment: comment explaining why opt-out is safe +* +* Function attribute denoting that context analysis is disabled for the +* whole function. Forces adding an inline comment as argument. +*/ +#define __context_unsafe (comment) __no_context_analysis + +/** +* context_unsafe_alias() - helper to insert a context lock "alias barrier" +* @p: pointer aliasing a context lock or object containing context locks +* +* No-op function that acts as a "context lock alias barrier", where the +* analysis rightfully detects that we're switching aliases, but the switch is +* considered safe but beyond the analysis reasoning abilities. +* +* This should be inserted before the first use of such an alias. +* +* Implementation Note: The compiler ignores aliases that may be reassigned but +* their value cannot be determined (e.g. when passing a non-const pointer to an +* alias as a function argument). +*/ +#define context_unsafe_alias (p) _context_unsafe_alias((void **)&(p)) +static inline void _context_unsafe_alias (void **p) { (void )p; } + +/** +* token_context_lock() - declare an abstract global context lock instance +* @name: token context lock name +* +* Helper that declares an abstract global context lock instance @name, but not +* backed by a real data structure (linker error if accidentally referenced). +* The type name is `__ctx_lock_@name`. +*/ +#define token_context_lock (name, ...) \ + context_lock_struct(__ctx_lock_##name, ##__VA_ARGS__) {}; \ + extern const struct __ctx_lock_##name *name + +/** +* token_context_lock_instance() - declare another instance of a global context lock +* @ctx: token context lock previously declared with token_context_lock() +* @name: name of additional global context lock instance +* +* Helper that declares an additional instance @name of the same token context +* lock class @ctx. This is helpful where multiple related token contexts are +* declared, to allow using the same underlying type (`__ctx_lock_@ctx`) as +* function arguments. +*/ +#define token_context_lock_instance (ctx, name) \ + extern const struct __ctx_lock_##ctx *name + +/* +* Common keywords for static context analysis. +*/ + +/** +* __must_hold() - function attribute, caller must hold exclusive context lock +* +* Function attribute declaring that the caller must hold the given context +* lock instance(s) exclusively. +*/ +#define __must_hold (...) __requires_ctx_lock(__VA_ARGS__) + +/** +* __must_not_hold() - function attribute, caller must not hold context lock +* +* Function attribute declaring that the caller must not hold the given context +* lock instance(s). +*/ +#define __must_not_hold (...) __excludes_ctx_lock(__VA_ARGS__) + +/** +* __acquires() - function attribute, function acquires context lock exclusively +* +* Function attribute declaring that the function acquires the given context +* lock instance(s) exclusively, but does not release them. +*/ +#define __acquires (...) __acquires_ctx_lock(__VA_ARGS__) + +/* +* Clang's analysis does not care precisely about the value, only that it is +* either zero or non-zero. So the __cond_acquires() interface might be +* misleading if we say that @ret is the value returned if acquired. Instead, +* provide symbolic variants which we translate. +*/ +#define __cond_acquires_impl_true (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_false (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_nonzero (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_0 (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_nonnull (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_NULL (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) + +/** +* __cond_acquires() - function attribute, function conditionally +* acquires a context lock exclusively +* @ret: abstract value returned by function if context lock acquired +* @x: context lock instance pointer +* +* Function attribute declaring that the function conditionally acquires the +* given context lock instance @x exclusively, but does not release it. The +* function return value @ret denotes when the context lock is acquired. +* +* @ret may be one of: true, false, nonzero, 0, nonnull, NULL. +*/ +#define __cond_acquires (ret, x) __cond_acquires_impl_##ret(x) + +/** +* __releases() - function attribute, function releases a context lock exclusively +* +* Function attribute declaring that the function releases the given context +* lock instance(s) exclusively. The associated context(s) must be active on +* entry. +*/ +#define __releases (...) __releases_ctx_lock(__VA_ARGS__) + +/* +* Clang's analysis does not care precisely about the value, only that it is +* either zero or non-zero. So the __cond_acquires() interface might be +* misleading if we say that @ret is the value returned if acquired. Instead, +* provide symbolic variants which we translate. +*/ +#define __cond_acquires_impl_not_true (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_not_false (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_not_nonzero (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_not_0 (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_not_nonnull (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_not_NULL (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) + +/** +* __cond_releases() - function attribute, function conditionally +* releases a context lock exclusively +* @ret: abstract value returned by function if context lock releases +* @x: context lock instance pointer +* +* Function attribute declaring that the function conditionally releases the +* given context lock instance @x exclusively. The associated context(s) must +* be active on entry. The function return value @ret denotes when the context +* lock is released. +* +* @ret may be one of: true, false, nonzero, 0, nonnull, NULL. +* +* NOTE: clang does not have a native attribute for this; instead implement +* it as an unconditional release and a conditional acquire for the +* inverted condition -- which is semantically equivalent. +*/ +#define __cond_releases (ret, x) __releases(x) __cond_acquires_impl_not_##ret(x) + +/** +* __acquire() - function to acquire context lock exclusively +* @x: context lock instance pointer +* +* No-op function that acquires the given context lock instance @x exclusively. +*/ +#define __acquire (x) __acquire_ctx_lock(x) + +/** +* __release() - function to release context lock exclusively +* @x: context lock instance pointer +* +* No-op function that releases the given context lock instance @x. +*/ +#define __release (x) __release_ctx_lock(x) + +/** +* __must_hold_shared() - function attribute, caller must hold shared context lock +* +* Function attribute declaring that the caller must hold the given context +* lock instance(s) with shared access. +*/ +#define __must_hold_shared (...) __requires_shared_ctx_lock(__VA_ARGS__) + +/** +* __acquires_shared() - function attribute, function acquires context lock shared +* +* Function attribute declaring that the function acquires the given +* context lock instance(s) with shared access, but does not release them. +*/ +#define __acquires_shared (...) __acquires_shared_ctx_lock(__VA_ARGS__) + +/** +* __cond_acquires_shared() - function attribute, function conditionally +* acquires a context lock shared +* @ret: abstract value returned by function if context lock acquired +* @x: context lock instance pointer +* +* Function attribute declaring that the function conditionally acquires the +* given context lock instance @x with shared access, but does not release it. +* The function return value @ret denotes when the context lock is acquired. +* +* @ret may be one of: true, false, nonzero, 0, nonnull, NULL. +*/ +#define __cond_acquires_shared (ret, x) __cond_acquires_impl_##ret(x, _shared) + +/** +* __releases_shared() - function attribute, function releases a +* context lock shared +* +* Function attribute declaring that the function releases the given context +* lock instance(s) with shared access. The associated context(s) must be +* active on entry. +*/ +#define __releases_shared (...) __releases_shared_ctx_lock(__VA_ARGS__) + +/** +* __acquire_shared() - function to acquire context lock shared +* @x: context lock instance pointer +* +* No-op function that acquires the given context lock instance @x with shared +* access. +*/ +#define __acquire_shared (x) __acquire_shared_ctx_lock(x) + +/** +* __release_shared() - function to release context lock shared +* @x: context lock instance pointer +* +* No-op function that releases the given context lock instance @x with shared +* access. +*/ +#define __release_shared (x) __release_shared_ctx_lock(x) + +/** +* __acquire_ret() - helper to acquire context lock of return value +* @call: call expression +* @ret_expr: acquire expression that uses __ret +*/ +#define __acquire_ret (call, ret_expr) \ + ({ \ + __auto_type __ret = call; \ + __acquire(ret_expr); \ + __ret; \ + }) + +/** +* __acquire_shared_ret() - helper to acquire context lock shared of return value +* @call: call expression +* @ret_expr: acquire shared expression that uses __ret +*/ +#define __acquire_shared_ret (call, ret_expr) \ + ({ \ + __auto_type __ret = call; \ + __acquire_shared(ret_expr); \ + __ret; \ + }) + +/* +* Attributes to mark functions returning acquired context locks. +* +* This is purely cosmetic to help readability, and should be used with the +* above macros as follows: +* +* struct foo { spinlock_t lock; ... }; +* ... +* #define myfunc(...) __acquire_ret(_myfunc(__VA_ARGS__), &__ret->lock) +* struct foo *_myfunc(int bar) __acquires_ret; +* ... +*/ +#define __acquires_ret __no_context_analysis +#define __acquires_shared_ret __no_context_analysis + +#endif /* _LINUX_COMPILER_CONTEXT_ANALYSIS_H */
tools/perf/check-headers.sh +1 -0
@@ -23,6 +23,7 @@ declare -a FILES=( "include/linux/bits.h" "include/vdso/bits.h" "include/linux/cfi_types.h" + "include/linux/compiler-context-analysis.h" "include/linux/const.h" "include/vdso/const.h" "include/vdso/unaligned.h"
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v3 03/17] tools headers: Synchronize linux/compiler-context-analysis.h with the kernel sources
Sashiko has reviewed this patch and found no issues.
Quoted 6 lines
Replace the no-op stub
tools/include/linux/compiler-context-analysis.hwith the full kernel implementation frominclude/linux/compiler-context-analysis.hand add it totools/perf/check-headers.shso future changes are tracked.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
Ian Rogers
reviewerPATCH v3 4/17 perf mutex: Use kernel style compiler-context-analysis.h annotations
In reply to Ian RogersEnable -DWARN_CONTEXT_ANALYSIS alongside -Wthread-safety for Clang builds in tools/perf/Makefile.config, replace the custom lock safety macros in tools/perf with the kernel's compiler-context-analysis.h annotations (context_lock_struct, __guarded_by, __acquires, __acquires_shared, __releases, __releases_shared, __cond_acquires, __must_hold, __must_hold_shared, __must_not_hold, __returns_ctx_lock, __no_context_analysis, and __context_unsafe), and remove the redundant macro definitions from tools/perf/util/mutex.h.
--- tools/perf/Makefile.config | 2 +- tools/perf/builtin-sched.c | 16 +++---- tools/perf/builtin-top.c | 4 +- tools/perf/util/annotate.c | 4 +- tools/perf/util/annotate.h | 8 ++-- tools/perf/util/comm.c | 4 +- tools/perf/util/dso.c | 30 ++++++------ tools/perf/util/dso.h | 9 ++-- tools/perf/util/dsos.c | 6 +-- tools/perf/util/intel-tpebs.c | 6 +-- tools/perf/util/libbfd.c | 4 +- tools/perf/util/mutex.c | 4 +- tools/perf/util/mutex.h | 90 +++-------------------------------- tools/perf/util/rwsem.c | 8 ++-- tools/perf/util/rwsem.h | 10 ++-- tools/perf/util/thread.c | 8 ++-- tools/perf/util/thread.h | 2 +- 17 files changed, 69 insertions(+), 146 deletions(-)
tools/perf/Makefile.config +1 -1
@@ -64,7 +64,7 @@ ifeq ($(CC_NO_CLANG), 0) endif # Enabled Wthread-safety analysis for clang builds. - CFLAGS += -Wthread-safety + CFLAGS += -Wthread-safety -DWARN_CONTEXT_ANALYSIS endif include $(srctree)/tools/scripts/Makefile.arch
tools/perf/builtin-sched.c +8 -8
@@ -828,8 +828,8 @@ static void *thread_func(void *ctx) }static void create_tasks (struct perf_sched *sched) - EXCLUSIVE_LOCK_FUNCTION(sched->start_work_mutex) - EXCLUSIVE_LOCK_FUNCTION(sched->work_done_wait_mutex) + __acquires(&sched->start_work_mutex) + __acquires(&sched->work_done_wait_mutex) {struct task_desc *task;pthread_attr_t attr;
@@ -858,8 +858,8 @@ static void create_tasks(struct perf_sched *sched) }static void destroy_tasks (struct perf_sched *sched) - UNLOCK_FUNCTION(sched->start_work_mutex) - UNLOCK_FUNCTION(sched->work_done_wait_mutex) + __releases(&sched->start_work_mutex) + __releases(&sched->work_done_wait_mutex) {struct task_desc *task;unsigned long i;
@@ -878,8 +878,8 @@ static void destroy_tasks(struct perf_sched *sched) }static void wait_for_tasks (struct perf_sched *sched) - EXCLUSIVE_LOCKS_REQUIRED(sched->work_done_wait_mutex) - EXCLUSIVE_LOCKS_REQUIRED(sched->start_work_mutex) + __must_hold(&sched->work_done_wait_mutex) + __must_hold(&sched->start_work_mutex) {u64 cpu_usage_0, cpu_usage_1;struct task_desc *task;
@@ -930,8 +930,8 @@ static void wait_for_tasks(struct perf_sched *sched) }static void run_one_test (struct perf_sched *sched) - EXCLUSIVE_LOCKS_REQUIRED(sched->work_done_wait_mutex) - EXCLUSIVE_LOCKS_REQUIRED(sched->start_work_mutex) + __must_hold(&sched->work_done_wait_mutex) + __must_hold(&sched->start_work_mutex) {u64 T0 ,T1 , delta, avg_delta, fluct;
tools/perf/builtin-top.c +2 -2
@@ -201,7 +201,7 @@ static void perf_top__record_precise_ip(struct perf_top *top,struct hist_entry *he, struct perf_sample *sample, u64 ip) - EXCLUSIVE_LOCKS_REQUIRED(he->hists->lock) + __must_hold(&he->hists->lock) { struct annotation *notes;struct symbol *sym = he->ms.sym;
@@ -730,7 +730,7 @@ static void *display_thread(void *arg)static int hist_iter__top_callback (struct hist_entry_iter *iter,struct addr_location *al,bool single,void *arg) - EXCLUSIVE_LOCKS_REQUIRED(iter->he->hists->lock) + __must_hold(&iter->he->hists->lock) {struct perf_top *top = arg;
tools/perf/util/annotate.c +2 -2
@@ -655,7 +655,7 @@ static struct mutex *annotation__get_mutex(const struct annotation *notes) }void annotation__lock (struct annotation *notes) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {struct mutex *mutex =annotation__get_mutex (notes);
@@ -664,7 +664,7 @@ void annotation__lock(struct annotation *notes) }void annotation__unlock (struct annotation *notes) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {struct mutex *mutex =annotation__get_mutex (notes);
tools/perf/util/annotate.h +4 -4
@@ -369,7 +369,7 @@ struct annotated_branch {u64 *br_cntr; }; -struct LOCKABLE annotation { +context_lock_struct (annotation) {struct annotated_source *src;struct annotated_branch *branch; };
@@ -379,9 +379,9 @@ static inline void annotation__init(struct annotation *notes __maybe_unused) }void annotation__exit (struct annotation *notes); -void annotation__lock(struct annotation *notes) EXCLUSIVE_LOCK_FUNCTION(*notes); -void annotation__unlock(struct annotation *notes) UNLOCK_FUNCTION(*notes); -bool annotation__trylock(struct annotation *notes) EXCLUSIVE_TRYLOCK_FUNCTION(true, *notes); +void annotation__lock(struct annotation *notes) __acquires(notes); +void annotation__unlock(struct annotation *notes) __releases(notes); +bool annotation__trylock(struct annotation *notes) __cond_acquires(true, notes);static inline int annotation__cycles_width (struct annotation *notes) {
tools/perf/util/comm.c +2 -2
@@ -24,7 +24,7 @@ static struct comm_strs {static void comm_strs__remove_if_last (struct comm_str *cs);static void comm_strs__init (void ) -NO_THREAD_SAFETY_ANALYSIS /* Inherently single threaded due to pthread_once. */ +__context_unsafe (/* Inherently single threaded due to pthread_once. */ ) {init_rwsem (&_comm_strs.lock); _comm_strs.capacity =16 ;
@@ -120,7 +120,7 @@ static void comm_strs__remove_if_last(struct comm_str *cs) }static struct comm_str *__comm_strs__find (struct comm_strs *comm_strs,const char *str) - SHARED_LOCKS_REQUIRED(comm_strs->lock) + __must_hold_shared(&comm_strs->lock) {struct comm_str **result;
tools/perf/util/dso.c +15 -15
@@ -525,14 +525,14 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,*/ struct mutex _dso__data_open_lock;static LIST_HEAD (dso__data_open); -static long dso__data_open_cnt GUARDED_BY (_dso__data_open_lock ); +static long dso__data_open_cnt __guarded_by(&_dso__data_open_lock);static void dso__data_open_lock_init (void ) {mutex_init (&_dso__data_open_lock); } -static struct mutex *dso__data_open_lock (void )LOCK_RETURNED (_dso__data_open_lock) +static struct mutex *dso__data_open_lock(void) __returns_ctx_lock(&_dso__data_open_lock) {static pthread_once_t data_open_lock_once =PTHREAD_ONCE_INIT ;
@@ -541,7 +541,7 @@ static struct mutex *dso__data_open_lock(void) LOCK_RETURNED(_dso__data_open_locreturn &_dso__data_open_lock; } -static void dso__list_add (struct dso *dso)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void dso__list_add(struct dso *dso) __must_hold(&_dso__data_open_lock) {list_add_tail (&dso__data (dso)->open_entry, &dso__data_open);#ifdef REFCNT_CHECKING
@@ -552,7 +552,7 @@ static void dso__list_add(struct dso *dso) EXCLUSIVE_LOCKS_REQUIRED(_dso__data_o dso__data_open_cnt++; } -static void dso__list_del (struct dso *dso)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void dso__list_del(struct dso *dso) __must_hold(&_dso__data_open_lock) {list_del_init (&dso__data (dso)->open_entry);#ifdef REFCNT_CHECKING
@@ -567,7 +567,7 @@ static void dso__list_del(struct dso *dso) EXCLUSIVE_LOCKS_REQUIRED(_dso__data_ostatic void close_first_dso (void ); -static int do_open (char *name)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static int do_open(char *name) __must_hold(&_dso__data_open_lock) { do { int fd = open(name, O_RDONLY|O_CLOEXEC);
@@ -670,7 +670,7 @@ void dso__put_filename(struct dso *dso __maybe_unused, char *filename, bool deco }static int __open_dso (struct dso *dso,struct machine *machine) -EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) + __must_hold(&_dso__data_open_lock) {int fd = -EINVAL ;char *name;
@@ -703,7 +703,7 @@ static void check_data_close(void);* list/count of open DSO objects. */ static int open_dso (struct dso *dso,struct machine *machine) -EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) + __must_hold(&_dso__data_open_lock) {int fd;struct nscookie nsc;
@@ -729,7 +729,7 @@ static int open_dso(struct dso *dso, struct machine *machine)return fd; } -static void close_data_fd (struct dso *dso)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void close_data_fd(struct dso *dso) __must_hold(&_dso__data_open_lock) {if (dso__data (dso)->fd >=0 ) {close (dso__data (dso)->fd);
@@ -746,12 +746,12 @@ static void close_data_fd(struct dso *dso) EXCLUSIVE_LOCKS_REQUIRED(_dso__data_o* Close @dso's data file descriptor and updates * list/count of open DSO objects. */ -static void close_dso (struct dso *dso)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void close_dso(struct dso *dso) __must_hold(&_dso__data_open_lock) {close_data_fd (dso); } -static void close_first_dso (void )EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void close_first_dso(void) __must_hold(&_dso__data_open_lock) {struct dso_data *dso_data;struct dso *dso;
@@ -796,7 +796,7 @@ void reset_fd_limit(void) fd_limit =0 ; } -static bool may_cache_fd (void )EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static bool may_cache_fd(void) __must_hold(&_dso__data_open_lock) {if (!fd_limit) fd_limit =get_fd_limit ();
@@ -812,7 +812,7 @@ static bool may_cache_fd(void) EXCLUSIVE_LOCKS_REQUIRED(_dso__data_open_lock)* for opened dso file descriptors. The limit is half * of the RLIMIT_NOFILE files opened. */ -static void check_data_close (void )EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void check_data_close(void) __must_hold(&_dso__data_open_lock) {bool cache_fd =may_cache_fd ();
@@ -834,7 +834,7 @@ void dso__data_close(struct dso *dso) }static int dso__find_binary_type_locked (struct dso *dso) -EXCLUSIVE_LOCKS_REQUIRED (dso__lock (dso)) +__must_hold (dso__lock (dso)) {enum dso_binary_type binary_type_data[] = {DSO_BINARY_TYPE__BUILD_ID_CACHE ,
@@ -926,7 +926,7 @@ static int dso__find_binary_type_locked(struct dso *dso)#define FIND_MAX_RETRY 3static int __dso__find_binary_type (struct dso *dso) -EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) + __must_hold(&_dso__data_open_lock) {int ret;int retry =0 ;
@@ -966,7 +966,7 @@ enum dso_binary_type dso__find_binary_type(struct dso *dso) }static void try_to_open_dso (struct dso *dso,struct machine *machine) -EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) + __must_hold(&_dso__data_open_lock) {struct dso_data *dso_data =dso__data (dso);
tools/perf/util/dso.h +5 -4
@@ -629,6 +629,7 @@ static inline void dso__set_loaded(struct dso *dso) }static inline struct mutex *dso__lock (struct dso *dso) + __returns_ctx_lock(&RC_CHK_ACCESS(dso)->lock) {return &RC_CHK_ACCESS (dso)->lock; }
@@ -809,7 +810,7 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id);int dso__name_len (const struct dso *dso);struct dso *dso__get (struct dso *dso); -void dso__put(struct dso *dso) LOCKS_EXCLUDED(_dso__data_open_lock); +void dso__put(struct dso *dso) __must_not_hold(&_dso__data_open_lock);static inline void __dso__zput (struct dso **dso) {
@@ -919,9 +920,9 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,* TODO */ bool dso__data_get_fd(struct dso *dso, struct machine *machine, int *fd) - EXCLUSIVE_TRYLOCK_FUNCTION(true, _dso__data_open_lock); -void dso__data_put_fd(struct dso *dso) UNLOCK_FUNCTION(_dso__data_open_lock); -void dso__data_close(struct dso *dso) LOCKS_EXCLUDED(_dso__data_open_lock); + __cond_acquires(true, &_dso__data_open_lock); +void dso__data_put_fd(struct dso *dso) __releases(&_dso__data_open_lock); +void dso__data_close(struct dso *dso) __must_not_hold(&_dso__data_open_lock);int dso__data_file_size (struct dso *dso,struct machine *machine);off_t dso__data_size (struct dso *dso,struct machine *machine);
tools/perf/util/dsos.c +3 -3
@@ -157,7 +157,7 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos, const char *name, const struct dso_id *id, bool write_locked) - SHARED_LOCKS_REQUIRED(dsos->lock) + __must_hold_shared(&dsos->lock) { struct dsos__key key = { .long_name = name,
@@ -266,7 +266,7 @@ static int dsos__find_id_cb(struct dso *dso, void *data)static struct dso *__dsos__find_id (struct dsos *dsos,const char *name,const struct dso_id *id,bool cmp_short,bool write_locked) - SHARED_LOCKS_REQUIRED(dsos->lock) + __must_hold_shared(&dsos->lock) {struct dso *res;
@@ -330,7 +330,7 @@ static struct dso *__dsos__addnew_id(struct dsos *dsos, const char *name, const }static struct dso *__dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) - SHARED_LOCKS_REQUIRED(dsos->lock) + __must_hold_shared(&dsos->lock) {struct dso *dso =__dsos__find_id (dsos, name, id, false,/*write_locked=*/ true);
tools/perf/util/intel-tpebs.c +3 -3
@@ -69,7 +69,7 @@ static struct mutex *tpebs_mtx_get(void) }static struct tpebs_retire_lat *tpebs_retire_lat__find (struct evsel *evsel) -EXCLUSIVE_LOCKS_REQUIRED (tpebs_mtx_get ()); +__must_hold (tpebs_mtx_get ());static int evsel__tpebs_start_perf_record (struct evsel *evsel) {
@@ -244,7 +244,7 @@ static void *__sample_reader(void *arg __maybe_unused)return NULL ; } -static int tpebs_send_record_cmd (const char *msg)EXCLUSIVE_LOCKS_REQUIRED (tpebs_mtx_get ()) +static int tpebs_send_record_cmd (const char *msg)__must_hold (tpebs_mtx_get ()) {struct pollfd pollfd = { .events =POLLIN , };int ret, len, retries =0 ;
@@ -321,7 +321,7 @@ static int tpebs_send_record_cmd(const char *msg) EXCLUSIVE_LOCKS_REQUIRED(tpebs/* * tpebs_stop - stop the sample data read thread and the perf record process. */ -static int tpebs_stop (void )EXCLUSIVE_LOCKS_REQUIRED (tpebs_mtx_get ()) +static int tpebs_stop (void )__must_hold (tpebs_mtx_get ()) {int ret =0 ;
tools/perf/util/libbfd.c +2 -2
@@ -51,13 +51,13 @@ struct a2l_data {asymbol **syms; }; -static bool perf_bfd_lock (void *bfd_mutex)NO_THREAD_SAFETY_ANALYSIS +static bool perf_bfd_lock (void *bfd_mutex) __no_context_analysis {mutex_lock (bfd_mutex);return true; } -static bool perf_bfd_unlock (void *bfd_mutex)NO_THREAD_SAFETY_ANALYSIS +static bool perf_bfd_unlock (void *bfd_mutex) __no_context_analysis {mutex_unlock (bfd_mutex);return true;
tools/perf/util/mutex.c +2 -2
@@ -56,13 +56,13 @@ void mutex_destroy(struct mutex *mtx) }void mutex_lock (struct mutex *mtx) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {CHECK_ERR (pthread_mutex_lock (&mtx->lock)); }void mutex_unlock (struct mutex *mtx) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {CHECK_ERR (pthread_mutex_unlock (&mtx->lock)); }
tools/perf/util/mutex.h +6 -84
114 lines not on this page · raw message
tools/perf/util/rwsem.c +4 -4
@@ -27,7 +27,7 @@ int exit_rwsem(struct rw_semaphore *sem) }int down_read (struct rw_semaphore *sem) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {#if RWS_ERRORCHECK mutex_lock (&sem->mtx);
@@ -38,7 +38,7 @@ int down_read(struct rw_semaphore *sem) }int up_read (struct rw_semaphore *sem) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {#if RWS_ERRORCHECK mutex_unlock (&sem->mtx);
@@ -49,7 +49,7 @@ int up_read(struct rw_semaphore *sem) }int down_write (struct rw_semaphore *sem) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {#if RWS_ERRORCHECK mutex_lock (&sem->mtx);
@@ -60,7 +60,7 @@ int down_write(struct rw_semaphore *sem) }int up_write (struct rw_semaphore *sem) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {#if RWS_ERRORCHECK mutex_unlock (&sem->mtx);
tools/perf/util/rwsem.h +5 -5
@@ -10,7 +10,7 @@*/ #define RWS_ERRORCHECK 0 -struct LOCKABLE rw_semaphore { +context_lock_struct (rw_semaphore) {#if RWS_ERRORCHECK struct mutex mtx;#else
@@ -21,10 +21,10 @@ struct LOCKABLE rw_semaphore {int init_rwsem (struct rw_semaphore *sem);int exit_rwsem (struct rw_semaphore *sem); -int down_read(struct rw_semaphore *sem) SHARED_LOCK_FUNCTION(sem); -int up_read(struct rw_semaphore *sem) UNLOCK_FUNCTION(sem); +int down_read(struct rw_semaphore *sem) __acquires_shared(sem); +int up_read(struct rw_semaphore *sem) __releases_shared(sem); -int down_write(struct rw_semaphore *sem) EXCLUSIVE_LOCK_FUNCTION(sem); -int up_write(struct rw_semaphore *sem) UNLOCK_FUNCTION(sem); +int down_write(struct rw_semaphore *sem) __acquires(sem); +int up_write(struct rw_semaphore *sem) __releases(sem);#endif /* _PERF_RWSEM_H */
tools/perf/util/thread.c +4 -4
@@ -41,7 +41,7 @@ int thread__init_maps(struct thread *thread, struct machine *machine) }struct thread *thread__new (pid_t pid,pid_t tid) -NO_THREAD_SAFETY_ANALYSIS /* Allocation/creation is inherently single threaded. */ +__context_unsafe (/* Allocation/creation is inherently single threaded. */ ) {RC_STRUCT (thread) *_thread =zalloc (sizeof (*_thread));struct thread *thread;
@@ -203,7 +203,7 @@ int thread__set_namespaces(struct thread *thread, u64 timestamp, }static struct comm *__thread__comm (struct thread *thread) -SHARED_LOCKS_REQUIRED (thread__comm_lock (thread)) +__must_hold_shared (thread__comm_lock (thread)) {if (list_empty (thread__comm_list (thread)))return NULL ;
@@ -250,7 +250,7 @@ struct comm *thread__exec_comm(struct thread *thread)static int ____thread__set_comm (struct thread *thread,const char *str,u64 timestamp,bool exec) -EXCLUSIVE_LOCKS_REQUIRED (thread__comm_lock (thread)) +__must_hold (thread__comm_lock (thread)) {struct comm *new, *curr =__thread__comm (thread);
@@ -308,7 +308,7 @@ int thread__set_comm_from_proc(struct thread *thread) }static const char *__thread__comm_str (struct thread *thread) -SHARED_LOCKS_REQUIRED (thread__comm_lock (thread)) +__must_hold_shared (thread__comm_lock (thread)) {const struct comm *comm =__thread__comm (thread);
tools/perf/util/thread.h +1 -1
@@ -251,7 +251,7 @@ static inline struct rw_semaphore *thread__comm_lock(struct thread *thread) }static inline struct list_head *thread__comm_list (struct thread *thread) -SHARED_LOCKS_REQUIRED (thread__comm_lock (thread)) +__must_hold_shared (thread__comm_lock (thread)) {return &RC_CHK_ACCESS (thread)->comm_list; }
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v3 04/17] perf mutex: Use kernel style compiler-context-analysis.h annotations
Sashiko has reviewed this patch and found no issues.
Quoted 10 lines
Enable -DWARN_CONTEXT_ANALYSIS alongside -Wthread-safety for Clang builds in
tools/perf/Makefile.config, replace the custom lock safety macros intools/perfwith the kernel'scompiler-context-analysis.hannotations (context_lock_struct,__guarded_by,__acquires,__acquires_shared,__releases,__releases_shared,__cond_acquires,__must_hold,__must_hold_shared,__must_not_hold,__returns_ctx_lock,__no_context_analysis, and__context_unsafe), and remove the redundant macro definitions fromtools/perf/util/mutex.h.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=4
Ian Rogers
reviewerPATCH v3 5/17 perf build: Enable additional Clang thread-safety flags
In reply to Ian RogersAlign tools/perf's Clang thread-safety flags with the kernel's scripts/Makefile.context-analysis by adding -Wthread-safety-pointer, -Wthread-safety-beta, and (when supported by the compiler) -fexperimental-late-parse-attributes.
--- tools/perf/Makefile.config | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/perf/Makefile.config +7 -1
@@ -64,7 +64,13 @@ ifeq ($(CC_NO_CLANG), 0) endif # Enabled Wthread-safety analysis for clang builds. - CFLAGS += -Wthread-safety -DWARN_CONTEXT_ANALYSIS + CFLAGS += -DWARN_CONTEXT_ANALYSIS -Wthread-safety + ifeq ($(shell $(CC) -Werror -Wthread-safety-pointer -Wthread-safety-beta -c -x c /dev/null -o /dev/null >/dev/null 2>&1 && echo 1), 1) + CFLAGS += -Wthread-safety-pointer -Wthread-safety-beta + endif + ifeq ($(shell $(CC) -Werror -fexperimental-late-parse-attributes -c -x c /dev/null -o /dev/null >/dev/null 2>&1 && echo 1), 1) + CFLAGS += -fexperimental-late-parse-attributes + endif endif include $(srctree)/tools/scripts/Makefile.arch
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v3 05/17] perf build: Enable additional Clang thread-safety flags
Sashiko has reviewed this patch and found no issues.
Quoted 6 lines
Align tools/perf's Clang thread-safety flags with the kernel's
scripts/Makefile.context-analysisby adding -Wthread-safety-pointer,(quoted diff) +0
-2-Wthread-safety-beta, and (when supported by the compiler) -fexperimental-late-parse-attributes.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=5
Ian Rogers
reviewerPATCH v3 6/17 perf comm: Add __guarded_by annotations to struct comm_strs
In reply to Ian RogersAnnotate strs, num_strs, and capacity in struct comm_strs with __guarded_by(&lock) and __pt_guarded_by(&lock) so Clang verifies all accesses hold comm_strs->lock.
--- tools/perf/util/comm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/comm.c +3 -3
@@ -16,9 +16,9 @@ DECLARE_RC_STRUCT(comm_str) {static struct comm_strs {struct rw_semaphore lock; -struct comm_str **strs; -int num_strs; -int capacity; + struct comm_str **strs __pt_guarded_by(&lock) __guarded_by(&lock); + int num_strs __guarded_by(&lock); + int capacity __guarded_by(&lock); } _comm_strs;static void comm_strs__remove_if_last (struct comm_str *cs);
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v3 06/17] perf comm: Add __guarded_by annotations to struct comm_strs
Sashiko has reviewed this patch and found no issues.
Quoted 5 lines
Annotate strs,
num_strs, and capacity in structcomm_strswith__guarded_by(&lock)and__pt_guarded_by(&lock)so Clang verifies all accesses holdcomm_strs->lock.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=6
Ian Rogers
reviewerPATCH v3 7/17 perf vdso: Fix unlocked __dsos__add() and race in __machine__addnew_vdso()
In reply to Ian Rogers__machine__addnew_vdso() called __dsos__add(&machine->dsos, dso) without holding machine->dsos.lock. Acquire machine->dsos.lock in write mode, double-check __dsos__find() to avoid inserting duplicate VDSO entries when racing with another thread, and set the long name before calling __dsos__add() so it does not attempt to re-acquire machine->dsos.lock.
--- tools/perf/util/dsos.c | 7 ++++++- tools/perf/util/dsos.h | 1 + tools/perf/util/vdso.c | 17 +++++++++++++++-- 3 files changed, 22 insertions(+), 3 deletions(-)
tools/perf/util/dsos.c +6 -1
@@ -284,12 +284,17 @@ static struct dso *__dsos__find_id(struct dsos *dsos, const char *name, const streturn res; } +struct dso *__dsos__find (struct dsos *dsos,const char *name,bool cmp_short,bool write_locked) +{ +return __dsos__find_id (dsos, name, &dso_id_empty, cmp_short, write_locked); +} +struct dso *dsos__find (struct dsos *dsos,const char *name,bool cmp_short) {struct dso *res;down_read (&dsos->lock); - res =__dsos__find_id (dsos, name, &dso_id_empty, cmp_short,/*write_locked=*/ false); + res =__dsos__find (dsos, name, cmp_short,/*write_locked=*/ false);up_read (&dsos->lock);return res; }
tools/perf/util/dsos.h +1 -0
@@ -30,6 +30,7 @@ void dsos__exit(struct dsos *dsos);int __dsos__add (struct dsos *dsos,struct dso *dso);int dsos__add (struct dsos *dsos,struct dso *dso); +struct dso *__dsos__find (struct dsos *dsos,const char *name,bool cmp_short,bool write_locked);struct dso *dsos__find (struct dsos *dsos,const char *name,bool cmp_short);struct dso *dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id);
tools/perf/util/vdso.c +15 -2
@@ -127,13 +127,26 @@ void machine__exit_vdso(struct machine *machine)static struct dso *__machine__addnew_vdso (struct machine *machine,const char *short_name,const char *long_name) { -struct dso *dso; +struct dso *dso, *existing; + +down_write (&machine->dsos.lock); + existing =__dsos__find (&machine->dsos, short_name, true,/*write_locked=*/ true); +if (existing) { +up_write (&machine->dsos.lock); +return existing; + } dso =dso__new (short_name);if (dso !=NULL ) { -__dsos__add (&machine->dsos, dso); +/* +* Set the long name before adding to machine->dsos so that +* __dsos__add() inserts it in sorted order without needing to +* re-take machine->dsos.lock. +*/ dso__set_long_name (dso, long_name, false); +__dsos__add (&machine->dsos, dso); } +up_write (&machine->dsos.lock);return dso; }
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v3 07/17] perf vdso: Fix unlocked __dsos__add() and race in __machine__addnew_vdso()
Sashiko has reviewed this patch and found no issues.
Quoted 7 lines
__machine__addnew_vdso()called__dsos__add(&machine->dsos, dso)without holdingmachine->dsos.lock. Acquiremachine->dsos.lockin write mode, double-check__dsos__find()to avoid inserting duplicate VDSO entries when racing with another thread, and set the long name before calling__dsos__add()so it does not attempt to re-acquiremachine->dsos.lock.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=7
Ian Rogers
reviewerPATCH v3 8/17 perf dso: Pass dso_data to close_data_fd() and dso__list_del()
In reply to Ian Rogersclose_data_fd() and dso__list_del() only operate on struct dso_data fields, while close_first_dso() retrieves a struct dso_data * from dso__data_open. Pass struct dso_data * directly to close_data_fd() and dso__list_del() so close_first_dso() does not need to recover a struct dso * from struct dso_data *.
This removes the REFCNT_CHECKING dso pointer from struct dso_data and avoids dropping _dso__data_open_lock in dso__list_del() to call dso__put(), preventing lock-order inversions and races during EMFILE eviction.
--- tools/perf/util/dso.c | 44 ++++++++++++------------------------------- tools/perf/util/dso.h | 3 --- 2 files changed, 12 insertions(+), 35 deletions(-)
tools/perf/util/dso.c +12 -32
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include "dso.h" +#include <assert.h> #include <errno.h> #include <stdlib.h>
@@ -544,22 +545,14 @@ static struct mutex *dso__data_open_lock(void) __returns_ctx_lock(&_dso__data_op static void dso__list_add(struct dso *dso) __must_hold(&_dso__data_open_lock) {list_add_tail (&dso__data (dso)->open_entry, &dso__data_open); -#ifdef REFCNT_CHECKING -dso__data (dso)->dso =dso__get (dso); -#endif -/* Assume the dso is part of dsos, hence the optional reference count above. */ +/* Assume the dso is part of dsos, holding it live while on dso__data_open. */ assert (dso__dsos (dso)); dso__data_open_cnt++; } -static void dso__list_del(struct dso *dso) __must_hold(&_dso__data_open_lock) +static void dso__list_del(struct dso_data *dso_data) __must_hold(&_dso__data_open_lock) { -list_del_init (&dso__data (dso)->open_entry); -#ifdef REFCNT_CHECKING -mutex_unlock (dso__data_open_lock ()); -dso__put (dso__data (dso)->dso); -mutex_lock (dso__data_open_lock ()); -#endif +list_del_init (&dso_data->open_entry);WARN_ONCE (dso__data_open_cnt <=0 ,"DSO data fd counter out of bounds." ); dso__data_open_cnt--;
@@ -729,13 +722,13 @@ static int open_dso(struct dso *dso, struct machine *machine)return fd; } -static void close_data_fd(struct dso *dso) __must_hold(&_dso__data_open_lock) +static void close_data_fd(struct dso_data *dso_data) __must_hold(&_dso__data_open_lock) { -if (dso__data (dso)->fd >=0 ) { -close (dso__data (dso)->fd); -dso__data (dso)->fd =-1 ; -dso__data (dso)->file_size =0 ; -dso__list_del (dso); +if (dso_data->fd >=0 ) { +close (dso_data->fd); + dso_data->fd =-1 ; + dso_data->file_size =0 ; +dso__list_del (dso_data); } }
@@ -748,21 +741,15 @@ static void close_data_fd(struct dso *dso) __must_hold(&_dso__data_open_lock)*/ static void close_dso(struct dso *dso) __must_hold(&_dso__data_open_lock) { -close_data_fd (dso); +close_data_fd (dso__data (dso)); } static void close_first_dso(void) __must_hold(&_dso__data_open_lock) {struct dso_data *dso_data; -struct dso *dso; dso_data = list_first_entry(&dso__data_open, struct dso_data, open_entry); -#ifdef REFCNT_CHECKING - dso = dso_data->dso; -#else - dso = container_of(dso_data, struct dso, data); -#endif -close_dso (dso); +close_data_fd (dso_data); }static rlim_t get_fd_limit (void )
@@ -1858,9 +1845,6 @@ struct dso *dso__new_id(const char *name, const struct dso_id *id) data->fd =-1 ; data->status =DSO_DATA_STATUS_UNKNOWN ;INIT_LIST_HEAD (&data->open_entry); -#ifdef REFCNT_CHECKING - data->dso =NULL ;/* Set when on the open_entry list. */ -#endif }return res; }
@@ -1918,10 +1902,6 @@ struct dso *dso__get(struct dso *dso)void dso__put (struct dso *dso) { -#ifdef REFCNT_CHECKING -if (dso &&dso__data (dso) &&refcount_read (&RC_CHK_ACCESS (dso)->refcnt) ==2 ) -dso__data_close (dso); -#endif if (dso &&refcount_dec_and_test (&RC_CHK_ACCESS (dso)->refcnt))dso__delete (dso);else
tools/perf/util/dso.h +0 -3
@@ -261,9 +261,6 @@ struct dso_cache {struct dso_data {struct rb_root cache;struct list_head open_entry; -#ifdef REFCNT_CHECKING -struct dso *dso; -#endif int fd;int status;u32 status_seen;
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v3 08/17] perf dso: Pass dso_data to close_data_fd() and dso__list_del()
Sashiko has reviewed this patch and found no issues.
Quoted 6 lines
close_data_fd()anddso__list_del()only operate on structdso_datafields, whileclose_first_dso()retrieves a structdso_data* fromdso__data_open. Pass structdso_data* directly toclose_data_fd()anddso__list_del()soclose_first_dso()does not need to recover a struct dso * from structdso_data*.
Quoted 6 lines
This removes the
REFCNT_CHECKINGdso pointer from structdso_dataand avoids dropping_dso__data_open_lockindso__list_del()to calldso__put(), preventing lock-order inversions and races during EMFILE eviction.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=8
Ian Rogers
reviewerPATCH v3 9/17 perf dso: Use DEFINE_MUTEX for dso__data_open_lock
In reply to Ian RogersReplace _dso__data_open_lock and its pthread_once() initialization wrapper dso__data_open_lock() with DEFINE_MUTEX(dso__data_open_lock).
--- tools/perf/util/dso.c | 68 +++++++++++++++++-------------------------- tools/perf/util/dso.h | 10 +++---- 2 files changed, 32 insertions(+), 46 deletions(-)
tools/perf/util/dso.c +27 -41
@@ -524,25 +524,11 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,/* * Global list of open DSOs and the counter. */ -struct mutex _dso__data_open_lock; +DEFINE_MUTEX (dso__data_open_lock);static LIST_HEAD (dso__data_open); -static long dso__data_open_cnt __guarded_by(&_dso__data_open_lock); +static long dso__data_open_cnt __guarded_by(&dso__data_open_lock); -static void dso__data_open_lock_init (void ) -{ -mutex_init (&_dso__data_open_lock); -} - -static struct mutex *dso__data_open_lock(void) __returns_ctx_lock(&_dso__data_open_lock) -{ -static pthread_once_t data_open_lock_once =PTHREAD_ONCE_INIT ; - -pthread_once (&data_open_lock_once, dso__data_open_lock_init); - -return &_dso__data_open_lock; -} - -static void dso__list_add(struct dso *dso) __must_hold(&_dso__data_open_lock) +static void dso__list_add(struct dso *dso) __must_hold(&dso__data_open_lock) {list_add_tail (&dso__data (dso)->open_entry, &dso__data_open);/* Assume the dso is part of dsos, holding it live while on dso__data_open. */
@@ -550,7 +536,7 @@ static void dso__list_add(struct dso *dso) __must_hold(&_dso__data_open_lock) dso__data_open_cnt++; } -static void dso__list_del(struct dso_data *dso_data) __must_hold(&_dso__data_open_lock) +static void dso__list_del(struct dso_data *dso_data) __must_hold(&dso__data_open_lock) {list_del_init (&dso_data->open_entry); WARN_ONCE(dso__data_open_cnt <= 0,
@@ -560,7 +546,7 @@ static void dso__list_del(struct dso_data *dso_data) __must_hold(&_dso__data_opestatic void close_first_dso (void ); -static int do_open(char *name) __must_hold(&_dso__data_open_lock) +static int do_open(char *name) __must_hold(&dso__data_open_lock) { do { int fd = open(name, O_RDONLY|O_CLOEXEC);
@@ -663,7 +649,7 @@ void dso__put_filename(struct dso *dso __maybe_unused, char *filename, bool deco }static int __open_dso (struct dso *dso,struct machine *machine) - __must_hold(&_dso__data_open_lock) + __must_hold(&dso__data_open_lock) {int fd = -EINVAL ;char *name;
@@ -696,7 +682,7 @@ static void check_data_close(void);* list/count of open DSO objects. */ static int open_dso (struct dso *dso,struct machine *machine) - __must_hold(&_dso__data_open_lock) + __must_hold(&dso__data_open_lock) {int fd;struct nscookie nsc;
@@ -722,7 +708,7 @@ static int open_dso(struct dso *dso, struct machine *machine)return fd; } -static void close_data_fd(struct dso_data *dso_data) __must_hold(&_dso__data_open_lock) +static void close_data_fd(struct dso_data *dso_data) __must_hold(&dso__data_open_lock) {if (dso_data->fd >=0 ) {close (dso_data->fd);
@@ -739,12 +725,12 @@ static void close_data_fd(struct dso_data *dso_data) __must_hold(&_dso__data_ope* Close @dso's data file descriptor and updates * list/count of open DSO objects. */ -static void close_dso(struct dso *dso) __must_hold(&_dso__data_open_lock) +static void close_dso(struct dso *dso) __must_hold(&dso__data_open_lock) {close_data_fd (dso__data (dso)); } -static void close_first_dso(void) __must_hold(&_dso__data_open_lock) +static void close_first_dso(void) __must_hold(&dso__data_open_lock) {struct dso_data *dso_data;
@@ -783,7 +769,7 @@ void reset_fd_limit(void) fd_limit =0 ; } -static bool may_cache_fd(void) __must_hold(&_dso__data_open_lock) +static bool may_cache_fd(void) __must_hold(&dso__data_open_lock) {if (!fd_limit) fd_limit =get_fd_limit ();
@@ -799,7 +785,7 @@ static bool may_cache_fd(void) __must_hold(&_dso__data_open_lock)* for opened dso file descriptors. The limit is half * of the RLIMIT_NOFILE files opened. */ -static void check_data_close(void) __must_hold(&_dso__data_open_lock) +static void check_data_close(void) __must_hold(&dso__data_open_lock) {bool cache_fd =may_cache_fd ();
@@ -815,9 +801,9 @@ static void check_data_close(void) __must_hold(&_dso__data_open_lock)*/ void dso__data_close (struct dso *dso) { -mutex_lock (dso__data_open_lock ()); +mutex_lock (&dso__data_open_lock);close_dso (dso); -mutex_unlock (dso__data_open_lock ()); +mutex_unlock (&dso__data_open_lock); }static int dso__find_binary_type_locked (struct dso *dso)
@@ -913,7 +899,7 @@ static int dso__find_binary_type_locked(struct dso *dso)#define FIND_MAX_RETRY 3static int __dso__find_binary_type (struct dso *dso) - __must_hold(&_dso__data_open_lock) + __must_hold(&dso__data_open_lock) {int ret;int retry =0 ;
@@ -945,15 +931,15 @@ enum dso_binary_type dso__find_binary_type(struct dso *dso) {int ret; -mutex_lock (dso__data_open_lock ()); +mutex_lock (&dso__data_open_lock); ret =__dso__find_binary_type (dso); -mutex_unlock (dso__data_open_lock ()); +mutex_unlock (&dso__data_open_lock);return ret; }static void try_to_open_dso (struct dso *dso,struct machine *machine) - __must_hold(&_dso__data_open_lock) + __must_hold(&dso__data_open_lock) {struct dso_data *dso_data =dso__data (dso);
@@ -984,7 +970,7 @@ bool dso__data_get_fd(struct dso *dso, struct machine *machine, int *fd)if (dso__data (dso)->status ==DSO_DATA_STATUS_ERROR )return false; -mutex_lock (dso__data_open_lock ()); +mutex_lock (&dso__data_open_lock);try_to_open_dso (dso, machine);
@@ -992,13 +978,13 @@ bool dso__data_get_fd(struct dso *dso, struct machine *machine, int *fd)if (*fd >=0 )return true; -mutex_unlock (dso__data_open_lock ()); +mutex_unlock (&dso__data_open_lock);return false; }void dso__data_put_fd (struct dso *dso__maybe_unused ) { -mutex_unlock (dso__data_open_lock ()); +mutex_unlock (&dso__data_open_lock); }bool dso__data_status_seen (struct dso *dso,enum dso_data_status_seen by)
@@ -1169,7 +1155,7 @@ static ssize_t file_read(struct dso *dso, struct machine *machine, {ssize_t ret; -mutex_lock (dso__data_open_lock ()); +mutex_lock (&dso__data_open_lock);/* * dso__data(dso)->fd might be closed if other thread opened another
@@ -1185,7 +1171,7 @@ static ssize_t file_read(struct dso *dso, struct machine *machine, ret =pread (dso__data (dso)->fd, data,DSO__DATA_CACHE_SIZE , offset); out: -mutex_unlock (dso__data_open_lock ()); +mutex_unlock (&dso__data_open_lock);return ret; }
@@ -1292,7 +1278,7 @@ static int file_size(struct dso *dso, struct machine *machine)int ret =0 ;struct stat st; -mutex_lock (dso__data_open_lock ()); +mutex_lock (&dso__data_open_lock);/* * dso__data(dso)->fd might be closed if other thread opened another
@@ -1315,7 +1301,7 @@ static int file_size(struct dso *dso, struct machine *machine)dso__data (dso)->file_size = st.st_size; out: -mutex_unlock (dso__data_open_lock ()); +mutex_unlock (&dso__data_open_lock);return ret; }
@@ -1520,7 +1506,7 @@ uint16_t dso__e_machine_endian(struct dso *dso, struct machine *machine, uint32_return EM_NONE ; } -mutex_lock (dso__data_open_lock ()); +mutex_lock (&dso__data_open_lock);/* * dso__data(dso)->fd might be closed if other thread opened another
@@ -1533,7 +1519,7 @@ uint16_t dso__e_machine_endian(struct dso *dso, struct machine *machine, uint32_else if (e_flags) *e_flags =0 ; -mutex_unlock (dso__data_open_lock ()); +mutex_unlock (&dso__data_open_lock);return e_machine; }
tools/perf/util/dso.h +5 -5
@@ -354,7 +354,7 @@ DECLARE_RC_STRUCT(dso) {char name[]; }; -extern struct mutex _dso__data_open_lock; +extern struct mutex dso__data_open_lock;extern const struct dso_id dso_id_empty;int dso_id__cmp (const struct dso_id *a,const struct dso_id *b);
@@ -807,7 +807,7 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id);int dso__name_len (const struct dso *dso);struct dso *dso__get (struct dso *dso); -void dso__put(struct dso *dso) __must_not_hold(&_dso__data_open_lock); +void dso__put(struct dso *dso) __must_not_hold(&dso__data_open_lock);static inline void __dso__zput (struct dso **dso) {
@@ -917,9 +917,9 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,* TODO */ bool dso__data_get_fd(struct dso *dso, struct machine *machine, int *fd) - __cond_acquires(true, &_dso__data_open_lock); -void dso__data_put_fd(struct dso *dso) __releases(&_dso__data_open_lock); -void dso__data_close(struct dso *dso) __must_not_hold(&_dso__data_open_lock); + __cond_acquires(true, &dso__data_open_lock); +void dso__data_put_fd(struct dso *dso) __releases(&dso__data_open_lock); +void dso__data_close(struct dso *dso) __must_not_hold(&dso__data_open_lock);int dso__data_file_size (struct dso *dso,struct machine *machine);off_t dso__data_size (struct dso *dso,struct machine *machine);
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v3 09/17] perf dso: Use DEFINE_MUTEX for dso__data_open_lock
Sashiko has reviewed this patch and found no issues.
Quoted 4 lines
Replace
_dso__data_open_lockand itspthread_once()initialization wrapperdso__data_open_lock()withDEFINE_MUTEX(dso__data_open_lock).Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=9
Ian Rogers
reviewerPATCH v3 10/17 perf dsos: Use read lock fast path in dsos__findnew_id()
In reply to Ian RogersIn dsos__findnew_id(), try finding the DSO under the read lock first and only acquire the write lock when a new DSO must be inserted or an existing DSO needs its ID updated (checked via dso__needs_improve_id()).
--- tools/perf/util/dso.c | 16 +++++++++++++++- tools/perf/util/dso.h | 1 + tools/perf/util/dsos.c | 10 ++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-)
tools/perf/util/dso.c +15 -1
@@ -1685,6 +1685,18 @@ const struct dso_id dso_id_empty = { } }; +bool dso__needs_improve_id (const struct dso *dso,const struct dso_id *id) +{ +const struct dso_id *dso_id =dso__id_const (dso); + +if (!id) +return false; + +return (id->mmap2_valid && !dso_id->mmap2_valid) || + (id->mmap2_ino_generation_valid && !dso_id->mmap2_ino_generation_valid) || + (build_id__is_defined (&id->build_id) && !build_id__is_defined (&dso_id->build_id)); +} +void __dso__improve_id (struct dso *dso,const struct dso_id *id) {struct dsos *dsos =dso__dsos (dso);
@@ -1692,6 +1704,8 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id)bool changed = false;/* dsos write lock held by caller. */ +if (!id) +return ;if (id->mmap2_valid && !dso_id->mmap2_valid) { dso_id->maj = id->maj;
@@ -1715,7 +1729,7 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id)int dso_id__cmp (const struct dso_id *a,const struct dso_id *b) { -if (a == &dso_id_empty || b == &dso_id_empty) { +if (!a || !b || a == &dso_id_empty || b == &dso_id_empty) {/* There is no valid data to compare so the comparison always returns identical. */ return 0 ; }
tools/perf/util/dso.h +1 -0
@@ -802,6 +802,7 @@ void dso__delete(struct dso *dso);int dso__cmp_id (struct dso *a,struct dso *b);void dso__set_short_name (struct dso *dso,const char *name,bool name_allocated);void dso__set_long_name (struct dso *dso,const char *name,bool name_allocated); +bool dso__needs_improve_id (const struct dso *dso,const struct dso_id *id);void __dso__improve_id (struct dso *dso,const struct dso_id *id);int dso__name_len (const struct dso *dso);
tools/perf/util/dsos.c +10 -0
@@ -348,6 +348,16 @@ static struct dso *__dsos__findnew_id(struct dsos *dsos, const char *name, conststruct dso *dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) {struct dso *dso; + +down_read (&dsos->lock); + dso =__dsos__find_id (dsos, name, id, false,/*write_locked=*/ false); +if (dso && !dso__needs_improve_id (dso, id)) { +up_read (&dsos->lock); +return dso; + } +up_read (&dsos->lock); +dso__put (dso); +down_write (&dsos->lock); dso =__dsos__findnew_id (dsos, name, id);up_write (&dsos->lock);
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v3 10/17] perf dsos: Use read lock fast path in dsos__findnew_id()
Sashiko has reviewed this patch and found no issues.
Quoted 5 lines
In
dsos__findnew_id(), try finding the DSO under the read lock first and only acquire the write lock when a new DSO must be inserted or an existing DSO needs its ID updated (checked viadso__needs_improve_id()).Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=10
Ian Rogers
reviewerPATCH v3 11/17 perf dso: Expand context analysis annotations
In reply to Ian RogersAnnotate struct dsos fields with __guarded_by(&lock), annotate dso__data_open and fd_limit in util/dso.c with __guarded_by(&dso__data_open_lock), and tighten __dsos__findnew_id() and __dsos__addnew_id() from shared to exclusive lock requirements.
--- tools/perf/tests/dso-data.c | 4 ++++ tools/perf/util/dso.c | 14 +++++++++----- tools/perf/util/dsos.c | 10 ++++++++-- tools/perf/util/dsos.h | 13 +++++++------ 4 files changed, 28 insertions(+), 13 deletions(-)
tools/perf/tests/dso-data.c +4 -0
@@ -116,12 +116,14 @@ static int dso__data_fd(struct dso *dso, struct machine *machine)static void dsos__delete (struct dsos *dsos) { +down_write (&dsos->lock);for (unsigned int i =0 ; i < dsos->cnt; i++) {struct dso *dso = dsos->dsos[i];dso__data_close (dso);unlink (dso__name (dso)); } +up_write (&dsos->lock);dsos__exit (dsos); }
@@ -254,6 +256,7 @@ static int set_fd_limit(int n) }static int test__dso_data_cache (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) +__context_unsafe (/* single-threaded test */ ) {struct machine machine;long nr_end, nr =open_files_cnt ();
@@ -324,6 +327,7 @@ static long new_limit(int count) }static int test__dso_data_reopen (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) +__context_unsafe (/* single-threaded test */ ) {struct machine machine;long nr_end, nr =open_files_cnt (), lim =new_limit (3 );
tools/perf/util/dso.c +9 -5
@@ -525,7 +525,8 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,* Global list of open DSOs and the counter. */ DEFINE_MUTEX (dso__data_open_lock); -static LIST_HEAD (dso__data_open); +static struct list_head dso__data_open __guarded_by(&dso__data_open_lock) = +LIST_HEAD_INIT (dso__data_open); static long dso__data_open_cnt __guarded_by(&dso__data_open_lock); static void dso__list_add(struct dso *dso) __must_hold(&dso__data_open_lock)
@@ -757,7 +758,7 @@ static rlim_t get_fd_limit(void)return limit; } -static rlim_t fd_limit; +static rlim_t fd_limit __guarded_by(&dso__data_open_lock);/* * Used only by tests/dso-data.c to reset the environment
@@ -766,7 +767,8 @@ static rlim_t fd_limit;*/ void reset_fd_limit (void ) { - fd_limit =0 ; +/* Only called by single-threaded test setup. */ +context_unsafe (fd_limit =0 ); } static bool may_cache_fd(void) __must_hold(&dso__data_open_lock)
@@ -1723,8 +1725,10 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id) dso_id->build_id = id->build_id; changed = true; } -if (changed && dsos) - dsos->sorted = false; +if (changed && dsos) { +/* dsos write lock held by caller. */ +context_unsafe (dsos->sorted = false); + } }int dso_id__cmp (const struct dso_id *a,const struct dso_id *b)
tools/perf/util/dsos.c +8 -2
@@ -12,6 +12,7 @@#include <unistd.h> void dsos__init (struct dsos *dsos) +__context_unsafe (/* initialization */ ) {init_rwsem (&dsos->lock);
@@ -50,6 +51,7 @@ void dsos__exit(struct dsos *dsos)static int __dsos__for_each_dso (struct dsos *dsos,int (*cb)(struct dso *dso,void *data),void *data) + __must_hold_shared(&dsos->lock) {for (unsigned int i =0 ; i < dsos->cnt; i++) {struct dso *dso = dsos->dsos[i];
@@ -182,7 +184,8 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos, }qsort (dsos->dsos, dsos->cnt,sizeof (struct dso *), dsos__cmp_long_name_id_short_name); - dsos->sorted = true; +/* write_locked is true, so dsos->lock is held exclusively. */ +context_unsafe (dsos->sorted = true); } res = bsearch(&key, dsos->dsos, dsos->cnt, sizeof(struct dso *),
@@ -194,6 +197,7 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos, }int __dsos__add (struct dsos *dsos,struct dso *dso) + __must_hold(&dsos->lock) {if (!dso)return -EINVAL ;
@@ -285,6 +289,7 @@ static struct dso *__dsos__find_id(struct dsos *dsos, const char *name, const st }struct dso *__dsos__find (struct dsos *dsos,const char *name,bool cmp_short,bool write_locked) + __must_hold_shared(&dsos->lock) {return __dsos__find_id (dsos, name, &dso_id_empty, cmp_short, write_locked); }
@@ -319,6 +324,7 @@ static void dso__set_basename(struct dso *dso) }static struct dso *__dsos__addnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) + __must_hold(&dsos->lock) {struct dso *dso =dso__new_id (name, id);
@@ -335,7 +341,7 @@ static struct dso *__dsos__addnew_id(struct dsos *dsos, const char *name, const }static struct dso *__dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) - __must_hold_shared(&dsos->lock) + __must_hold(&dsos->lock) {struct dso *dso =__dsos__find_id (dsos, name, id, false,/*write_locked=*/ true);
tools/perf/util/dsos.h +7 -6
@@ -19,18 +19,19 @@ struct machine;*/ struct dsos {struct rw_semaphore lock; -struct dso **dsos; -unsigned int cnt; -unsigned int allocated; -bool sorted; + struct dso **dsos __pt_guarded_by(&lock) __guarded_by(&lock); + unsigned int cnt __guarded_by(&lock); + unsigned int allocated __guarded_by(&lock); + bool sorted __guarded_by(&lock); };void dsos__init (struct dsos *dsos);void dsos__exit (struct dsos *dsos); -int __dsos__add (struct dsos *dsos,struct dso *dso); +int __dsos__add(struct dsos *dsos, struct dso *dso) __must_hold(&dsos->lock);int dsos__add (struct dsos *dsos,struct dso *dso); -struct dso *__dsos__find (struct dsos *dsos,const char *name,bool cmp_short,bool write_locked); +struct dso *__dsos__find (struct dsos *dsos,const char *name,bool cmp_short,bool write_locked) + __must_hold_shared(&dsos->lock);struct dso *dsos__find (struct dsos *dsos,const char *name,bool cmp_short);struct dso *dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id);
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v3 11/17] perf dso: Expand context analysis annotations
Sashiko has reviewed this patch and found no issues.
Quoted 6 lines
Annotate struct dsos fields with
__guarded_by(&lock), annotatedso__data_openandfd_limitinutil/dso.cwith__guarded_by(&dso__data_open_lock), and tighten__dsos__findnew_id()and__dsos__addnew_id()from shared to exclusive lock requirements.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=11
Ian Rogers
reviewerPATCH v3 12/17 perf thread: Expand context analysis annotations to threads and namespaces_lock
In reply to Ian RogersAnnotate shard and last_match in struct threads_table_entry with __guarded_by(&lock) and add __must_hold_shared()/__must_hold() to the last_match helpers in util/threads.c.
In util/thread.h and util/thread.c, add __returns_ctx_lock() to thread__namespaces_lock() and thread__comm_lock(), annotate namespaces_list and comm_list with __guarded_by(), and add __must_hold_shared()/__must_hold() to the namespaces_list helpers.
--- tools/perf/util/thread.c | 2 ++ tools/perf/util/thread.h | 28 +++++++++++++++++----------- tools/perf/util/threads.c | 4 ++++ tools/perf/util/threads.h | 6 +++--- 4 files changed, 26 insertions(+), 14 deletions(-)
tools/perf/util/thread.c +2 -0
@@ -149,6 +149,7 @@ void thread__put(struct thread *thread) }static struct namespaces *__thread__namespaces (struct thread *thread) +__must_hold_shared (thread__namespaces_lock (thread)) {if (list_empty (thread__namespaces_list (thread)))return NULL ;
@@ -169,6 +170,7 @@ struct namespaces *thread__namespaces(struct thread *thread)static int __thread__set_namespaces (struct thread *thread,u64 timestamp,struct perf_record_namespaces *event) +__must_hold (thread__namespaces_lock (thread)) {struct namespaces *new, *curr =__thread__namespaces (thread);
tools/perf/util/thread.h +17 -11
@@ -48,10 +48,10 @@ DECLARE_RC_STRUCT(thread) {bool exited;bool comm_set;int comm_len; -struct list_head namespaces_list;struct rw_semaphore namespaces_lock; -struct list_head comm_list; + struct list_head namespaces_list __guarded_by(&namespaces_lock);struct rw_semaphore comm_lock; + struct list_head comm_list __guarded_by(&comm_lock);u64 db_id;void *priv;
@@ -230,30 +230,36 @@ static inline void thread__set_comm_len(struct thread *thread, int len)RC_CHK_ACCESS (thread)->comm_len = len; } -static inline struct list_head *thread__namespaces_list (struct thread *thread) +static inline struct rw_semaphore *thread__namespaces_lock (const struct thread *thread) + __returns_ctx_lock(&RC_CHK_ACCESS(thread)->namespaces_lock) { -return &RC_CHK_ACCESS (thread)->namespaces_list; +return (struct rw_semaphore *)&RC_CHK_ACCESS (thread)->namespaces_lock; } -static inline int thread__namespaces_list_empty (const struct thread *thread) +static inline struct list_head *thread__namespaces_list (struct thread *thread) +__must_hold_shared (thread__namespaces_lock (thread)) { -return list_empty (&RC_CHK_ACCESS (thread)->namespaces_list); +/* Readers hold the shared lock; writers hold the exclusive lock. */ +return context_unsafe (&RC_CHK_ACCESS (thread)->namespaces_list); } -static inline struct rw_semaphore *thread__namespaces_lock (struct thread *thread) +static inline int thread__namespaces_list_empty (const struct thread *thread) +__must_hold_shared (thread__namespaces_lock (thread)) { -return &RC_CHK_ACCESS (thread)->namespaces_lock; +return list_empty (&RC_CHK_ACCESS (thread)->namespaces_list); } -static inline struct rw_semaphore *thread__comm_lock (struct thread *thread) +static inline struct rw_semaphore *thread__comm_lock (const struct thread *thread) + __returns_ctx_lock(&RC_CHK_ACCESS(thread)->comm_lock) { -return &RC_CHK_ACCESS (thread)->comm_lock; +return (struct rw_semaphore *)&RC_CHK_ACCESS (thread)->comm_lock; }static inline struct list_head *thread__comm_list (struct thread *thread)__must_hold_shared (thread__comm_lock (thread)) { -return &RC_CHK_ACCESS (thread)->comm_list; +/* Readers hold the shared lock; writers hold the exclusive lock. */ +return context_unsafe (&RC_CHK_ACCESS (thread)->comm_list); }static inline u64 thread__db_id (const struct thread *thread)
tools/perf/util/threads.c +4 -0
@@ -21,6 +21,7 @@ static bool key_equal(long key1, long key2, void *ctx __maybe_unused) }void threads__init (struct threads *threads) +__context_unsafe (/* initialization */ ) {for (int i =0 ; i <THREADS__TABLE_SIZE ; i++) {struct threads_table_entry *table = &threads->table[i];
@@ -32,6 +33,7 @@ void threads__init(struct threads *threads) }void threads__exit (struct threads *threads) +__context_unsafe (/* teardown */ ) {threads__remove_all_threads (threads);for (int i =0 ; i <THREADS__TABLE_SIZE ; i++) {
@@ -63,6 +65,7 @@ size_t threads__nr(struct threads *threads)*/ static struct thread *__threads_table_entry__get_last_match (struct threads_table_entry *table,pid_t tid) + __must_hold_shared(&table->lock) {struct thread *th, *res =NULL ;
@@ -76,6 +79,7 @@ static struct thread *__threads_table_entry__get_last_match(struct threads_tablestatic void __threads_table_entry__set_last_match (struct threads_table_entry *table,struct thread *th) + __must_hold(&table->lock) {thread__put (table->last_match); table->last_match =thread__get (th);
tools/perf/util/threads.h +3 -3
@@ -11,10 +11,10 @@ struct thread;#define THREADS__TABLE_SIZE (1 << THREADS__TABLE_BITS)struct threads_table_entry { -/* Key is tid, value is struct thread. */ -struct hashmap shard;struct rw_semaphore lock; -struct thread *last_match; +/* Key is tid, value is struct thread. */ + struct hashmap shard __guarded_by(&lock); + struct thread *last_match __guarded_by(&lock); };struct threads {
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v3 12/17] perf thread: Expand context analysis annotations to threads and namespaces_lock
Sashiko has reviewed this patch and found no issues.
Quoted 10 lines
Annotate shard and
last_matchin structthreads_table_entrywith__guarded_by(&lock)and add __must_hold_shared()/__must_hold() to thelast_matchhelpers inutil/threads.c.In
util/thread.handutil/thread.c, add__returns_ctx_lock()tothread__namespaces_lock()andthread__comm_lock(), annotatenamespaces_listandcomm_listwith__guarded_by(), and add __must_hold_shared()/__must_hold() to thenamespaces_listhelpers.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=12
Ian Rogers
reviewerPATCH v3 13/17 perf intel-tpebs: Fix race in tpebs_stop() and tpebs_cmd.out fd handling
In reply to Ian RogersIn tpebs_stop(), read tpebs_reader_thread into a local variable before releasing tpebs_mtx to call pthread_join().
Transfer ownership of tpebs_cmd.out to __sample_reader() by passing it as the thread argument and setting tpebs_cmd.out = -1 in evsel__tpebs_open() so tpebs_stop() does not double-close the fd closed by perf_session__delete(). Also reset tpebs_cmd.out = -1 if start_command() fails in evsel__tpebs_start_perf_record(), as start_command() closes the pipe internally on error without resetting cmd->out.
Include <stdint.h>, <stdlib.h>, <string.h>, and <unistd.h> explicitly for intptr_t, close(), read(), write(), malloc(), and strlen().
--- tools/perf/util/intel-tpebs.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
tools/perf/util/intel-tpebs.c +17 -5
@@ -27,6 +27,10 @@#include <errno.h> #include <poll.h> #include <math.h> +#include <stdint.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> #define PERF_DATA "-"
@@ -119,6 +123,8 @@ static int evsel__tpebs_start_perf_record(struct evsel *evsel) tpebs_cmd.argv = record_argv; tpebs_cmd.out =-1 ; ret =start_command (&tpebs_cmd); +if (ret) + tpebs_cmd.out =-1 ;zfree (&tpebs_cmd.argv);list_for_each_entry (t, &tpebs_results, nd) t->started = true;
@@ -220,13 +226,13 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused,return 0 ; } -static void *__sample_reader (void *arg__maybe_unused ) +static void *__sample_reader (void *arg) {struct perf_session *session;struct perf_data data = { .mode =PERF_DATA_MODE_READ , .path =PERF_DATA , - .file.fd = tpebs_cmd.out, + .file.fd = (int )(intptr_t )arg, };struct perf_tool tool;
@@ -236,8 +242,10 @@ static void *__sample_reader(void *arg __maybe_unused) tool.attr = perf_event__process_attr; session =perf_session__new (&data, &tool); -if (IS_ERR (session)) +if (IS_ERR (session)) { +close (data.file.fd);return NULL ; + }perf_session__process_events (session);perf_session__delete (session);
@@ -331,12 +339,14 @@ static int tpebs_stop(void) __must_hold(tpebs_mtx_get())/* Like tpebs_start, we should only run tpebs_end once. */ if (tpebs_cmd.pid !=0 ) {pid_t actual_pid = tpebs_cmd.pid; +pthread_t reader_thread; tpebs_stopping = true;tpebs_send_record_cmd (EVLIST_CTL_CMD_STOP_TAG ); tpebs_cmd.pid =0 ; + reader_thread = tpebs_reader_thread;mutex_unlock (tpebs_mtx_get ()); -pthread_join (tpebs_reader_thread,NULL ); +pthread_join (reader_thread,NULL );mutex_lock (tpebs_mtx_get ());if (control_fd[0 ] >=0 ) {close (control_fd[0 ]);
@@ -567,12 +577,14 @@ int evsel__tpebs_open(struct evsel *evsel) goto out;if (pthread_create (&tpebs_reader_thread,/*attr=*/ NULL , __sample_reader, -/*arg=*/ NULL )) { + (void *)(intptr_t )tpebs_cmd.out)) {kill (tpebs_cmd.pid,SIGTERM );pr_err ("Could not create thread to process sample data.\n" ); ret =-1 ; goto out; } +/* __sample_reader now owns and closes the output fd. */ + tpebs_cmd.out =-1 ; ret =tpebs_send_record_cmd (EVLIST_CTL_CMD_ENABLE_TAG ); } out:
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v3 13/17] perf intel-tpebs: Fix race in tpebs_stop() and tpebs_cmd.out fd handling
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider: - [High] perf: Samples dropped during teardown due to premature tpebs_cmd.pid clearance - [Medium] perf…
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
- [High] perf: Samples dropped during teardown due to premature tpebs_cmd.pid clearance
- [Medium] perf: thread leak on tpebs_send_record_cmd error path
--
commit 12668ca70c2a83aae9686820143aafd887a3a879
Author: Ian Rogers <[email protected]>
perf intel-tpebs: Fix race in tpebs_stop() and tpebs_cmd.out fd handling
This commit fixes a race by releasing tpebs_mtx before calling pthread_join() in tpebs_stop(). It also transfers ownership of the tpebs_cmd.out file descriptor to the sample reader thread to prevent a double-close.
Quoted 4 lines
tools/perf/util/intel-tpebs.c +0
-0
[ ... ]
tools/perf/util/intel-tpebs.c static int tpebs_stop(void) __must_hold(tpebs_mtx_get()) · line 349
Quoted 13 lines
tools/perf/util/intel-tpebs.c +3
-1@@ -331,12 +339,14 @@ static int tpebs_stop(void) __must_hold(tpebs_mtx_get())/* Like tpebs_start, we should only run tpebs_end once. */ if (tpebs_cmd.pid !=0 ) {pid_t actual_pid = tpebs_cmd.pid; +pthread_t reader_thread; tpebs_stopping = true;tpebs_send_record_cmd (EVLIST_CTL_CMD_STOP_TAG ); tpebs_cmd.pid =0 ; + reader_thread = tpebs_reader_thread;mutex_unlock (tpebs_mtx_get ()); -pthread_join (tpebs_reader_thread,NULL ); +pthread_join (reader_thread,NULL );
[Severity: High]
Does clearing tpebs_cmd.pid before waiting for the reader thread to finish cause valid samples to be silently dropped?
When tpebs_stop() clears the PID and releases tpebs_mtx, the reader thread can run concurrently and drain the pipe. Because process_sample_event() acquires the mutex and checks if tpebs_cmd.pid is 0, it may erroneously assume the record has entirely terminated:
tools/perf/util/intel-tpebs.c:process_sample_event() {
...
mutex_lock(tpebs_mtx_get());
if (tpebs_cmd.pid == 0) {
/* Record has terminated. */
mutex_unlock(tpebs_mtx_get());
return 0;
}
...
}Should tpebs_cmd.pid remain set until after the reader thread is joined so flushed samples are fully processed?
Quoted 2 lines
tools/perf/util/intel-tpebs.c +0
-0mutex_lock (tpebs_mtx_get ());if (control_fd[0 ] >=0 ) {
[ ... ]
Quoted 6 lines
tools/perf/util/intel-tpebs.c +1
-1@@ -567,12 +577,14 @@ int evsel__tpebs_open(struct evsel *evsel) goto out;if (pthread_create (&tpebs_reader_thread,/*attr=*/ NULL , __sample_reader, -/*arg=*/ NULL )) { + (void *)(intptr_t )tpebs_cmd.out)) {
tools/perf/util/intel-tpebs.c int evsel__tpebs_open(struct evsel *evsel) · line 590
Quoted 10 lines
tools/perf/util/intel-tpebs.c +2
-0kill (tpebs_cmd.pid,SIGTERM );pr_err ("Could not create thread to process sample data.\n" ); ret =-1 ; goto out; } +/* __sample_reader now owns and closes the output fd. */ + tpebs_cmd.out =-1 ; ret =tpebs_send_record_cmd (EVLIST_CTL_CMD_ENABLE_TAG ); } out:
[Severity: Medium]
If tpebs_send_record_cmd() fails, execution jumps to the "out:" error cleanup block without joining the newly created thread.
In the error path, tpebs_cmd.pid is cleared:
tools/perf/util/intel-tpebs.c:evsel__tpebs_open() {
...
if (started_process) {
if (tpebs_cmd.pid > 0) {
kill(tpebs_cmd.pid, SIGTERM);
finish_command(&tpebs_cmd);
tpebs_cmd.pid = 0;
}
...
}Since the error cleanup fails to join tpebs_reader_thread, and sets tpebs_cmd.pid to 0 (which prevents tpebs_stop() from ever joining it later), does this leak the thread resources?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=13
Ian Rogers
reviewerPATCH v3 14/17 perf intel-tpebs: Use DEFINE_MUTEX for tpebs_mtx
In reply to Ian RogersReplace tpebs_mtx_get() and its pthread_once() initialization helper tpebs_init() with DEFINE_MUTEX(tpebs_mtx) and static initializers for control_fd and ack_fd.
--- tools/perf/util/intel-tpebs.c | 75 ++++++++++++++--------------------- 1 file changed, 30 insertions(+), 45 deletions(-)
tools/perf/util/intel-tpebs.c +30 -45
@@ -36,11 +36,11 @@bool tpebs_recording;enum tpebs_mode tpebs_mode; +static DEFINE_MUTEX (tpebs_mtx);static LIST_HEAD (tpebs_results);static pthread_t tpebs_reader_thread;static struct child_process tpebs_cmd; -static int control_fd[2 ], ack_fd[2 ]; -static struct mutex tpebs_mtx; +static int control_fd[2 ] = {-1 ,-1 }, ack_fd[2 ] = {-1 ,-1 };static bool tpebs_stopping;struct tpebs_retire_lat {
@@ -57,23 +57,8 @@ struct tpebs_retire_lat {bool started; }; -static void tpebs_init (void ) -{ -mutex_init (&tpebs_mtx); - control_fd[0 ] = control_fd[1 ] =-1 ; - ack_fd[0 ] = ack_fd[1 ] =-1 ; -} - -static struct mutex *tpebs_mtx_get (void ) -{ -static pthread_once_t tpebs_once =PTHREAD_ONCE_INIT ; - -pthread_once (&tpebs_once, tpebs_init); -return &tpebs_mtx; -} -static struct tpebs_retire_lat *tpebs_retire_lat__find (struct evsel *evsel) -__must_hold (tpebs_mtx_get ()); + __must_hold(&tpebs_mtx);static int evsel__tpebs_start_perf_record (struct evsel *evsel) {
@@ -200,19 +185,19 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused, {struct tpebs_retire_lat *t; -mutex_lock (tpebs_mtx_get ()); +mutex_lock (&tpebs_mtx);if (tpebs_cmd.pid ==0 ) {/* Record has terminated. */ -mutex_unlock (tpebs_mtx_get ()); +mutex_unlock (&tpebs_mtx);return 0 ; } t =tpebs_retire_lat__find (sample->evsel);if (!t) { -mutex_unlock (tpebs_mtx_get ()); +mutex_unlock (&tpebs_mtx);return -EINVAL ; }if (should_ignore_sample (sample, t)) { -mutex_unlock (tpebs_mtx_get ()); +mutex_unlock (&tpebs_mtx);return 0 ; }/*
@@ -222,7 +207,7 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused,*/ t->last = sample->weight3;update_stats (&t->stats, sample->weight3); -mutex_unlock (tpebs_mtx_get ()); +mutex_unlock (&tpebs_mtx);return 0 ; }
@@ -252,7 +237,7 @@ static void *__sample_reader(void *arg)return NULL ; } -static int tpebs_send_record_cmd (const char *msg)__must_hold (tpebs_mtx_get ()) +static int tpebs_send_record_cmd(const char *msg) __must_hold(&tpebs_mtx) {struct pollfd pollfd = { .events =POLLIN , };int ret, len, retries =0 ;
@@ -266,7 +251,7 @@ static int tpebs_send_record_cmd(const char *msg) __must_hold(tpebs_mtx_get())* Let go of the lock while sending/receiving as blocking can starve the * sample reading thread. */ -mutex_unlock (tpebs_mtx_get ()); +mutex_unlock (&tpebs_mtx);/* Send perf record command.*/ len =strlen (msg);
@@ -322,14 +307,14 @@ static int tpebs_send_record_cmd(const char *msg) __must_hold(tpebs_mtx_get())pr_err ("tpebs: perf record control ack failed\n" ); out:/* Re-take lock as expected by caller. */ -mutex_lock (tpebs_mtx_get ()); +mutex_lock (&tpebs_mtx);return ret; }/* * tpebs_stop - stop the sample data read thread and the perf record process. */ -static int tpebs_stop (void )__must_hold (tpebs_mtx_get ()) +static int tpebs_stop(void) __must_hold(&tpebs_mtx) {int ret =0 ;
@@ -345,9 +330,9 @@ static int tpebs_stop(void) __must_hold(tpebs_mtx_get())tpebs_send_record_cmd (EVLIST_CTL_CMD_STOP_TAG ); tpebs_cmd.pid =0 ; reader_thread = tpebs_reader_thread; -mutex_unlock (tpebs_mtx_get ()); +mutex_unlock (&tpebs_mtx);pthread_join (reader_thread,NULL ); -mutex_lock (tpebs_mtx_get ()); +mutex_lock (&tpebs_mtx);if (control_fd[0 ] >=0 ) {close (control_fd[0 ]); control_fd[0 ] =-1 ;
@@ -483,20 +468,20 @@ static int evsel__tpebs_prepare(struct evsel *evsel)struct evsel *pos;struct tpebs_retire_lat *tpebs_event; -mutex_lock (tpebs_mtx_get ()); +mutex_lock (&tpebs_mtx); tpebs_event =tpebs_retire_lat__find (evsel);if (tpebs_event) {/* evsel, or an identically named one, was already prepared. */ -mutex_unlock (tpebs_mtx_get ()); +mutex_unlock (&tpebs_mtx);return 0 ; } tpebs_event =tpebs_retire_lat__new (evsel);if (!tpebs_event) { -mutex_unlock (tpebs_mtx_get ()); +mutex_unlock (&tpebs_mtx);return -ENOMEM ; }list_add_tail (&tpebs_event->nd, &tpebs_results); -mutex_unlock (tpebs_mtx_get ()); +mutex_unlock (&tpebs_mtx);/* * Eagerly prepare all other evsels on the list to try to ensure that by
@@ -530,9 +515,9 @@ int evsel__tpebs_open(struct evsel *evsel)if (!tpebs_recording)return 0 ; -mutex_lock (tpebs_mtx_get ()); +mutex_lock (&tpebs_mtx);if (tpebs_stopping) { -mutex_unlock (tpebs_mtx_get ()); +mutex_unlock (&tpebs_mtx);return -EBUSY ; }/* Only start the events once. */
@@ -542,17 +527,17 @@ int evsel__tpebs_open(struct evsel *evsel) t =tpebs_retire_lat__find (evsel); valid = t && t->started; -mutex_unlock (tpebs_mtx_get ()); +mutex_unlock (&tpebs_mtx);/* May fail as the event wasn't started. */ return valid ?0 : -EBUSY ; } -mutex_unlock (tpebs_mtx_get ()); +mutex_unlock (&tpebs_mtx); ret =evsel__tpebs_prepare (evsel);if (ret)return ret; -mutex_lock (tpebs_mtx_get ()); +mutex_lock (&tpebs_mtx);if (tpebs_stopping || tpebs_cmd.pid !=0 ) { ret = -EBUSY ; goto out;
@@ -624,7 +609,7 @@ int evsel__tpebs_open(struct evsel *evsel) } } } -mutex_unlock (tpebs_mtx_get ()); +mutex_unlock (&tpebs_mtx);return ret; }
@@ -644,7 +629,7 @@ int evsel__tpebs_read(struct evsel *evsel, int cpu_map_idx, int thread) count =perf_counts (evsel->counts, cpu_map_idx, thread); -mutex_lock (tpebs_mtx_get ()); +mutex_lock (&tpebs_mtx); t =tpebs_retire_lat__find (evsel);/* * If reading the first tpebs result, send a ping to the record
@@ -653,10 +638,10 @@ int evsel__tpebs_read(struct evsel *evsel, int cpu_map_idx, int thread)*/ if (t && &t->nd == tpebs_results.next) { ret =tpebs_send_record_cmd (EVLIST_CTL_CMD_PING_TAG ); -mutex_unlock (tpebs_mtx_get ()); +mutex_unlock (&tpebs_mtx);if (ret)return ret; -mutex_lock (tpebs_mtx_get ()); +mutex_lock (&tpebs_mtx); }if (t ==NULL || t->stats.n ==0 ) {/* No sample data, use default. */
@@ -695,7 +680,7 @@ int evsel__tpebs_read(struct evsel *evsel, int cpu_map_idx, int thread)break ; } } -mutex_unlock (tpebs_mtx_get ()); +mutex_unlock (&tpebs_mtx);if (old_count) { count->val = old_count->val + val;
@@ -720,7 +705,7 @@ void evsel__tpebs_close(struct evsel *evsel) {struct tpebs_retire_lat *t; -mutex_lock (tpebs_mtx_get ()); +mutex_lock (&tpebs_mtx); t =tpebs_retire_lat__find (evsel);if (t) {list_del_init (&t->nd);
@@ -729,5 +714,5 @@ void evsel__tpebs_close(struct evsel *evsel)if (list_empty (&tpebs_results))tpebs_stop (); } -mutex_unlock (tpebs_mtx_get ()); +mutex_unlock (&tpebs_mtx); }
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v3 14/17] perf intel-tpebs: Use DEFINE_MUTEX for tpebs_mtx
Sashiko has reviewed this patch and found no issues.
Quoted 5 lines
Replace
tpebs_mtx_get()and itspthread_once()initialization helpertpebs_init()withDEFINE_MUTEX(tpebs_mtx)and static initializers forcontrol_fdandack_fd.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=14
Ian Rogers
reviewerPATCH v3 15/17 perf config, intel-tpebs, env: Add __guarded_by and __must_hold annotations
In reply to Ian RogersAdd __guarded_by() and __must_hold() annotations to static parser and config state in util/config.c, TPEBS state in util/intel-tpebs.c, and bpf_progs and cgroups trees in struct perf_env.
--- tools/perf/util/bpf-event.h | 5 ++-- tools/perf/util/config.c | 43 ++++++++++++++++++++++------------- tools/perf/util/env.c | 1 + tools/perf/util/env.h | 19 +++++++++------- tools/perf/util/intel-tpebs.c | 7 +++--- 5 files changed, 46 insertions(+), 29 deletions(-)
tools/perf/util/bpf-event.h +3 -2
@@ -6,11 +6,11 @@#include <linux/rbtree.h> #include <api/fd/array.h> #include <stdio.h> +#include "env.h" struct bpf_prog_info ;struct machine ;union perf_event ; -struct perf_env ;struct perf_sample ;struct perf_session ;struct record_opts ;
@@ -42,7 +42,8 @@ int machine__process_bpf(struct machine *machine, union perf_event *event,int evlist__add_bpf_sb_event (struct evlist *evlist,struct perf_env *env); void __bpf_event__print_bpf_prog_info(struct perf_bpil *info_linear, struct perf_env *env, -FILE *fp); + FILE *fp) + __must_hold_shared(&env->bpf_progs.lock);void bpf_metadata_free (struct bpf_metadata *metadata);#else static inline int machine__process_bpf(struct machine *machine __maybe_unused,
tools/perf/util/config.c +27 -16
108 lines not on this page · raw message
tools/perf/util/env.c +1 -0
@@ -302,6 +302,7 @@ void perf_env__exit(struct perf_env *env) }void perf_env__init (struct perf_env *env) +__context_unsafe (/* initialization */ ) {memset (env,0 ,sizeof (*env));#ifdef HAVE_LIBBPF_SUPPORT
tools/perf/util/env.h +11 -8
@@ -139,16 +139,16 @@ struct perf_env {*/ struct {struct rw_semaphore lock; -struct rb_root infos; -u32 infos_cnt; -struct rb_root btfs; -u32 btfs_cnt; + struct rb_root infos __guarded_by(&lock); + u32 infos_cnt __guarded_by(&lock); + struct rb_root btfs __guarded_by(&lock); + u32 btfs_cnt __guarded_by(&lock); } bpf_progs;#endif // HAVE_LIBBPF_SUPPORT /* same reason as above (for perf-top) */ struct {struct rw_semaphore lock; -struct rb_root tree; + struct rb_root tree __guarded_by(&lock); } cgroups;/* For fast cpu to numa node lookup via perf_env__numa_node */
@@ -223,7 +223,8 @@ int perf_env__nr_cpus_avail(struct perf_env *env);void perf_env__init (struct perf_env *env);#ifdef HAVE_LIBBPF_SUPPORT bool __perf_env__insert_bpf_prog_info(struct perf_env *env, -struct bpf_prog_info_node *info_node); + struct bpf_prog_info_node *info_node) + __must_hold(&env->bpf_progs.lock);bool perf_env__insert_bpf_prog_info (struct perf_env *env,struct bpf_prog_info_node *info_node); struct bpf_prog_info_node *perf_env__find_bpf_prog_info(struct perf_env *env,
@@ -233,9 +234,11 @@ void perf_env__iterate_bpf_prog_info(struct perf_env *env, void *data), void *data);bool perf_env__insert_btf (struct perf_env *env,struct btf_node *btf_node); -bool __perf_env__insert_btf (struct perf_env *env,struct btf_node *btf_node); +bool __perf_env__insert_btf(struct perf_env *env, struct btf_node *btf_node) + __must_hold(&env->bpf_progs.lock);struct btf_node *perf_env__find_btf (struct perf_env *env,__u32 btf_id); -struct btf_node *__perf_env__find_btf (struct perf_env *env,__u32 btf_id); +struct btf_node *__perf_env__find_btf (struct perf_env *env,__u32 btf_id) + __must_hold_shared(&env->bpf_progs.lock);#endif // HAVE_LIBBPF_SUPPORT int perf_env__numa_node (struct perf_env *env,struct perf_cpu cpu);
tools/perf/util/intel-tpebs.c +4 -3
@@ -37,11 +37,11 @@bool tpebs_recording;enum tpebs_mode tpebs_mode;static DEFINE_MUTEX (tpebs_mtx); -static LIST_HEAD (tpebs_results); -static pthread_t tpebs_reader_thread; +static struct list_head tpebs_results __guarded_by(&tpebs_mtx) = LIST_HEAD_INIT(tpebs_results); +static pthread_t tpebs_reader_thread __guarded_by(&tpebs_mtx);static struct child_process tpebs_cmd;static int control_fd[2 ] = {-1 ,-1 }, ack_fd[2 ] = {-1 ,-1 }; -static bool tpebs_stopping; +static bool tpebs_stopping __guarded_by(&tpebs_mtx);struct tpebs_retire_lat {struct list_head nd;
@@ -61,6 +61,7 @@ static struct tpebs_retire_lat *tpebs_retire_lat__find(struct evsel *evsel)__must_hold (&tpebs_mtx);static int evsel__tpebs_start_perf_record (struct evsel *evsel) + __must_hold(&tpebs_mtx) {const char **record_argv;int tpebs_event_size =0 , i =0 , ret;
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v3 15/17] perf config, intel-tpebs, env: Add __guarded_by and __must_hold annotations
Sashiko has reviewed this patch and found no issues.
Quoted 5 lines
Add
__guarded_by()and__must_hold()annotations to static parser and config state inutil/config.c, TPEBS state inutil/intel-tpebs.c, andbpf_progsand cgroups trees in structperf_env.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=15
Ian Rogers
reviewerPATCH v3 16/17 perf maps: Fix lock inversion in maps__load_first() and bounds check in __maps__remove()
In reply to Ian RogersIn maps__load_first(), take a reference to the first map and drop maps__lock(maps) before calling map__load() to avoid a read-to-write self-deadlock when loading kernel maps inserts extra trampoline maps.
In __maps__remove(), check that the index returned by maps__by_address_index() and maps__by_name_index() is within nr_maps before indexing and removing the entry, in case a concurrent thread already removed the map.
--- tools/perf/util/maps.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-)
tools/perf/util/maps.c +18 -7
@@ -548,6 +548,8 @@ static void __maps__remove(struct maps *maps, struct map *map)/* Slide later mappings over the one to remove */ address_idx =maps__by_address_index (maps, map); +if (address_idx >= nr_maps) +return ;map__put (maps_by_address[address_idx]); memmove(&maps_by_address[address_idx], &maps_by_address[address_idx + 1],
@@ -556,10 +558,14 @@ static void __maps__remove(struct maps *maps, struct map *map)if (maps_by_name) {unsigned int name_idx =maps__by_name_index (maps, map); -map__put (maps_by_name[name_idx]); -memmove (&maps_by_name[name_idx], - &maps_by_name[name_idx +1 ], - (nr_maps - name_idx -1 ) *sizeof (*maps_by_name)); +if (name_idx < nr_maps) { +map__put (maps_by_name[name_idx]); +memmove (&maps_by_name[name_idx], + &maps_by_name[name_idx +1 ], + (nr_maps - name_idx -1 ) *sizeof (*maps_by_name)); + }else { +__maps__free_maps_by_name (maps); + } } --RC_CHK_ACCESS (maps)->nr_maps;
@@ -1459,10 +1465,15 @@ int maps__merge_in(struct maps *kmaps, struct map *new_map)void maps__load_first (struct maps *maps) { -down_read (maps__lock (maps)); +struct map *first =NULL ; +down_read (maps__lock (maps));if (maps__nr_maps (maps) >0 ) -map__load (maps__maps_by_address (maps)[0 ]); - + first =map__get (maps__maps_by_address (maps)[0 ]);up_read (maps__lock (maps)); + +if (first) { +map__load (first); +map__put (first); + } }
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v3 16/17] perf maps: Fix lock inversion in maps__load_first() and bounds check in __maps__remove()
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] perf: missing <string.h> inclusion for string operations --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] perf: missing <string.h> inclusion for string operations
--
commit ea7ae95649777ad210584a0f4110f0b3b715c591
Author: Ian Rogers <[email protected]>
perf maps: Fix lock inversion in maps__load_first() and bounds check in __maps__remove()
This commit addresses a read-to-write self-deadlock in maps__load_first() and adds bounds checking in __maps__remove() to handle concurrent map removals.
Quoted 4 lines
tools/perf/util/maps.c +0
-0
[ ... ]
tools/perf/util/maps.c static void __maps__remove(struct maps *maps, struct map *map) · line 565
Quoted 13 lines
tools/perf/util/maps.c +5
-4@@ -556,10 +558,14 @@ static void __maps__remove(struct maps *maps, struct map *map)if (maps_by_name) {unsigned int name_idx =maps__by_name_index (maps, map); -map__put (maps_by_name[name_idx]); -memmove (&maps_by_name[name_idx], - &maps_by_name[name_idx +1 ], - (nr_maps - name_idx -1 ) *sizeof (*maps_by_name)); +if (name_idx < nr_maps) { +map__put (maps_by_name[name_idx]); +memmove (&maps_by_name[name_idx], + &maps_by_name[name_idx +1 ], + (nr_maps - name_idx -1 ) *sizeof (*maps_by_name));
[Severity: Low]
Does this file need an explicit #include <string.h>?
The perf subsystem guidelines require developers to explicitly include the POSIX-specified headers for any libc functions used (specifically citing <string.h>) to ensure musl compatibility.
This file invokes memmove() but lacks an explicit #include <string.h>. Since the patch directly modifies a block invoking memmove() without adding the requisite header, could this cause build failures on musl libc where standard headers are not implicitly included?
Quoted 6 lines
tools/perf/util/maps.c +3
-0+ }else { +__maps__free_maps_by_name (maps); + } } --RC_CHK_ACCESS (maps)->nr_maps;
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=16
Ian Rogers
reviewerPATCH v3 17/17 perf maps: Add context analysis annotations
In reply to Ian RogersAdd __returns_ctx_lock() to maps__lock(), annotate DECLARE_RC_STRUCT(maps) members protected by lock with __guarded_by(&lock), and annotate internal maps helpers with __must_hold() and __must_hold_shared().
--- tools/perf/util/maps.c | 122 ++++++++++++++++++++++++++--------------- 1 file changed, 78 insertions(+), 44 deletions(-)
tools/perf/util/maps.c +78 -44
@@ -30,12 +30,12 @@ DECLARE_RC_STRUCT(maps) {* @maps_by_address: array of maps sorted by their starting address if * maps_by_address_sorted is true. */ -struct map **maps_by_address; + struct map **maps_by_address __guarded_by(&lock);/** * @maps_by_name: optional array of maps sorted by their dso name if * maps_by_name_sorted is true. */ -struct map **maps_by_name; + struct map **maps_by_name __guarded_by(&lock);struct machine *machine;#ifdef HAVE_LIBUNWIND_SUPPORT void *addr_space;
@@ -50,26 +50,33 @@ DECLARE_RC_STRUCT(maps) {* @nr_maps: number of maps_by_address, and possibly maps_by_name, * entries that contain maps. */ -unsigned int nr_maps; + unsigned int nr_maps __guarded_by(&lock);/** * @nr_maps_allocated: number of entries in maps_by_address and possibly * maps_by_name. */ -unsigned int nr_maps_allocated; + unsigned int nr_maps_allocated __guarded_by(&lock);/** * @last_search_by_name_idx: cache of last found by name entry's index * as frequent searches for the same dso name are common. */ unsigned int last_search_by_name_idx;/** @maps_by_address_sorted: is maps_by_address sorted. */ -bool maps_by_address_sorted; + bool maps_by_address_sorted __guarded_by(&lock);/** @maps_by_name_sorted: is maps_by_name sorted. */ -bool maps_by_name_sorted; + bool maps_by_name_sorted __guarded_by(&lock);/** @ends_broken: does the map contain a map where end values are unset/unsorted? */ -bool ends_broken; + bool ends_broken __guarded_by(&lock); }; +static struct rw_semaphore *maps__lock (const struct maps *maps) + __returns_ctx_lock(&RC_CHK_ACCESS(maps)->lock) +{ +return (struct rw_semaphore *)&RC_CHK_ACCESS (maps)->lock; +} +static void check_invariants (const struct maps *maps__maybe_unused ) +__must_hold_shared (maps__lock (maps)) {#ifndef NDEBUG assert (RC_CHK_ACCESS (maps)->nr_maps <=RC_CHK_ACCESS (maps)->nr_maps_allocated);
@@ -119,55 +126,65 @@ static void check_invariants(const struct maps *maps __maybe_unused) }static struct map **maps__maps_by_address (const struct maps *maps) +__must_hold_shared (maps__lock (maps)) {return RC_CHK_ACCESS (maps)->maps_by_address; }static void maps__set_maps_by_address (struct maps *maps,struct map **new) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->maps_by_address = new; }static void maps__set_nr_maps_allocated (struct maps *maps,unsigned int nr_maps_allocated) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->nr_maps_allocated = nr_maps_allocated; }static void maps__set_nr_maps (struct maps *maps,unsigned int nr_maps) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->nr_maps = nr_maps; }/* Not in the header, to aid reference counting. */ static struct map **maps__maps_by_name (const struct maps *maps) +__must_hold_shared (maps__lock (maps)) {return RC_CHK_ACCESS (maps)->maps_by_name; }static void maps__set_maps_by_name (struct maps *maps,struct map **new) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->maps_by_name = new; }static bool maps__maps_by_address_sorted (const struct maps *maps) +__must_hold_shared (maps__lock (maps)) {return RC_CHK_ACCESS (maps)->maps_by_address_sorted; }static void maps__set_maps_by_address_sorted (struct maps *maps,bool value) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->maps_by_address_sorted = value; }static bool maps__maps_by_name_sorted (const struct maps *maps) +__must_hold_shared (maps__lock (maps)) {return RC_CHK_ACCESS (maps)->maps_by_name_sorted; }static void maps__set_maps_by_name_sorted (struct maps *maps,bool value) +__must_hold (maps__lock (maps)) {RC_CHK_ACCESS (maps)->maps_by_name_sorted = value; }
@@ -177,11 +194,22 @@ struct machine *maps__machine(const struct maps *maps)return RC_CHK_ACCESS (maps)->machine; } -unsigned int maps__nr_maps (const struct maps *maps) +static unsigned int __maps__nr_maps (const struct maps *maps) +__must_hold_shared (maps__lock (maps)) {return RC_CHK_ACCESS (maps)->nr_maps; } +unsigned int maps__nr_maps (const struct maps *maps) +{ +unsigned int nr; + +down_read (maps__lock (maps)); + nr =__maps__nr_maps (maps); +up_read (maps__lock (maps)); +return nr; +} +refcount_t *maps__refcnt (struct maps *maps) {return &RC_CHK_ACCESS (maps)->refcnt;
@@ -220,12 +248,8 @@ void maps__set_libdw_addr_space_dwfl(struct maps *maps, void *dwfl) }#endif -static struct rw_semaphore *maps__lock (struct maps *maps) -{ -return &RC_CHK_ACCESS (maps)->lock; -} -static void maps__init (struct maps *maps,struct machine *machine) +__context_unsafe (/* initialization */ ) {init_rwsem (maps__lock (maps));RC_CHK_ACCESS (maps)->maps_by_address =NULL ;
@@ -247,11 +271,12 @@ static void maps__init(struct maps *maps, struct machine *machine) }static void maps__exit (struct maps *maps) +__context_unsafe (/* teardown */ ) {struct map **maps_by_address =maps__maps_by_address (maps);struct map **maps_by_name =maps__maps_by_name (maps); -for (unsigned int i =0 ; i <maps__nr_maps (maps); i++) { +for (unsigned int i =0 ; i <__maps__nr_maps (maps); i++) {map__zput (maps_by_address[i]);if (maps_by_name)map__zput (maps_by_name[i]);
@@ -300,6 +325,7 @@ void maps__put(struct maps *maps) }static void __maps__free_maps_by_name (struct maps *maps) +__must_hold (maps__lock (maps)) {if (!maps__maps_by_name (maps))return ;
@@ -307,7 +333,7 @@ static void __maps__free_maps_by_name(struct maps *maps)/* * Free everything to try to do it from the rbtree in the next search */ -for (unsigned int i =0 ; i <maps__nr_maps (maps); i++) +for (unsigned int i =0 ; i <__maps__nr_maps (maps); i++)map__put (maps__maps_by_name (maps)[i]);zfree (&RC_CHK_ACCESS (maps)->maps_by_name);
@@ -340,12 +366,13 @@ static int map__start_cmp(const void *a, const void *b) }static void __maps__sort_by_address (struct maps *maps) +__must_hold (maps__lock (maps)) {if (maps__maps_by_address_sorted (maps))return ;qsort (maps__maps_by_address (maps), -maps__nr_maps (maps), +__maps__nr_maps (maps),sizeof (struct map *), map__start_cmp);maps__set_maps_by_address_sorted (maps, true);
@@ -388,7 +415,7 @@ static int maps__sort_by_name(struct maps *maps) err = -ENOMEM ; else {struct map **maps_by_address =maps__maps_by_address (maps); -unsigned int n =maps__nr_maps (maps); +unsigned int n =__maps__nr_maps (maps);maps__set_maps_by_name (maps, maps_by_name);for (unsigned int i =0 ; i < n; i++)
@@ -397,7 +424,7 @@ static int maps__sort_by_name(struct maps *maps) }if (!err) {qsort (maps_by_name, -maps__nr_maps (maps), +__maps__nr_maps (maps),sizeof (struct map *), map__strcmp);maps__set_maps_by_name_sorted (maps, true);
@@ -409,18 +436,19 @@ static int maps__sort_by_name(struct maps *maps) }static unsigned int maps__by_address_index (const struct maps *maps,const struct map *map) +__must_hold_shared (maps__lock (maps)) {struct map **maps_by_address =maps__maps_by_address (maps);if (maps__maps_by_address_sorted (maps)) {struct map **mapp = -bsearch (&map,maps__maps_by_address (maps),maps__nr_maps (maps), +bsearch (&map,maps__maps_by_address (maps),__maps__nr_maps (maps),sizeof (*mapp), map__start_cmp);if (mapp)return mapp - maps_by_address; }else { -for (unsigned int i =0 ; i <maps__nr_maps (maps); i++) { +for (unsigned int i =0 ; i <__maps__nr_maps (maps); i++) {if (RC_CHK_ACCESS (maps_by_address[i]) ==RC_CHK_ACCESS (map))return i; }
@@ -430,18 +458,19 @@ static unsigned int maps__by_address_index(const struct maps *maps, const struct }static unsigned int maps__by_name_index (const struct maps *maps,const struct map *map) +__must_hold_shared (maps__lock (maps)) {struct map **maps_by_name =maps__maps_by_name (maps);if (maps__maps_by_name_sorted (maps)) {struct map **mapp = -bsearch (&map, maps_by_name,maps__nr_maps (maps), +bsearch (&map, maps_by_name,__maps__nr_maps (maps),sizeof (*mapp), map__strcmp);if (mapp)return mapp - maps_by_name; }else { -for (unsigned int i =0 ; i <maps__nr_maps (maps); i++) { +for (unsigned int i =0 ; i <__maps__nr_maps (maps); i++) {if (RC_CHK_ACCESS (maps_by_name[i]) ==RC_CHK_ACCESS (map))return i; }
@@ -470,10 +499,11 @@ static void map__set_kmap_maps(struct map *map, struct maps *maps) }static int __maps__insert (struct maps *maps,struct map *new) +__must_hold (maps__lock (maps)) {struct map **maps_by_address =maps__maps_by_address (maps);struct map **maps_by_name =maps__maps_by_name (maps); -unsigned int nr_maps =maps__nr_maps (maps); +unsigned int nr_maps =__maps__nr_maps (maps);unsigned int nr_allocate =RC_CHK_ACCESS (maps)->nr_maps_allocated;if (nr_maps +1 > nr_allocate) {
@@ -540,10 +570,11 @@ int maps__insert(struct maps *maps, struct map *map) }static void __maps__remove (struct maps *maps,struct map *map) +__must_hold (maps__lock (maps)) {struct map **maps_by_address =maps__maps_by_address (maps);struct map **maps_by_name =maps__maps_by_name (maps); -unsigned int nr_maps =maps__nr_maps (maps); +unsigned int nr_maps =__maps__nr_maps (maps);unsigned int address_idx;/* Slide later mappings over the one to remove */
@@ -629,7 +660,7 @@ bool maps__empty(struct maps *maps)bool res;down_read (maps__lock (maps)); - res =maps__nr_maps (maps) ==0 ; + res =__maps__nr_maps (maps) ==0 ;up_read (maps__lock (maps));return res;
@@ -657,7 +688,7 @@ int maps__for_each_map(struct maps *maps, int (*cb)(struct map *map, void *data)* the array - this may cause maps to be skipped or * repeated. */ -for (unsigned int i =0 ; i <maps__nr_maps (maps); i++) { +for (unsigned int i =0 ; i <__maps__nr_maps (maps); i++) {struct map **maps_by_address =maps__maps_by_address (maps);struct map *map = maps_by_address[i];
@@ -684,7 +715,7 @@ int maps__load_maps(struct maps *maps)return 0 ;down_read (maps__lock (maps)); - nr_maps =maps__nr_maps (maps); + nr_maps =__maps__nr_maps (maps);if (nr_maps ==0 ) {up_read (maps__lock (maps));return 0 ;
@@ -717,7 +748,7 @@ void maps__remove_maps(struct maps *maps, bool (*cb)(struct map *map, void *datadown_write (maps__lock (maps)); maps_by_address =maps__maps_by_address (maps); -for (unsigned int i =0 ; i <maps__nr_maps (maps);) { +for (unsigned int i =0 ; i <__maps__nr_maps (maps);) {if (cb (maps_by_address[i], data)) {__maps__remove (maps, maps_by_address[i]); removed = true;
@@ -771,7 +802,7 @@ struct symbol *maps__find_symbol_by_name(struct maps *maps, const char *name, st* This prevents deadlocking if iteration triggers further map insertions. */ down_read (maps__lock (maps)); - nr_maps =maps__nr_maps (maps); + nr_maps =__maps__nr_maps (maps); maps_copy =calloc (nr_maps,sizeof (*maps_copy));if (maps_copy) {for (unsigned int i =0 ; i < nr_maps; i++) {
@@ -856,9 +887,10 @@ size_t maps__fprintf(struct maps *maps, FILE *fp)* Same as find_vma() in kernel. */ static unsigned int first_ending_after (struct maps *maps,const struct map *map) +__must_hold_shared (maps__lock (maps)) {struct map **maps_by_address =maps__maps_by_address (maps); -int low =0 , high = (int )maps__nr_maps (maps) -1 , first = high +1 ; +int low =0 , high = (int )__maps__nr_maps (maps) -1 , first = high +1 ;assert (maps__maps_by_address_sorted (maps));if (low <= high &&map__end (maps_by_address[0 ]) >map__start (map))
@@ -883,10 +915,11 @@ static unsigned int first_ending_after(struct maps *maps, const struct map *map)static int __maps__insert_sorted (struct maps *maps,unsigned int first_after_index,struct map *new1,struct map *new2) +__must_hold (maps__lock (maps)) {struct map **maps_by_address =maps__maps_by_address (maps);struct map **maps_by_name =maps__maps_by_name (maps); -unsigned int nr_maps =maps__nr_maps (maps); +unsigned int nr_maps =__maps__nr_maps (maps);unsigned int nr_allocate =RC_CHK_ACCESS (maps)->nr_maps_allocated;unsigned int to_add = new2 ?2 :1 ;
@@ -943,6 +976,7 @@ static int __maps__insert_sorted(struct maps *maps, unsigned int first_after_ind* adjusted or removed so that new fits without overlapping any entries. */ static int __maps__fixup_overlap_and_insert (struct maps *maps,struct map *new) +__must_hold (maps__lock (maps)) {int err =0 ;unsigned int i, ni =INT_MAX ;// Some gcc complain, but depends on maps_by_name...
@@ -954,7 +988,7 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new)* Iterate through entries where the end of the existing entry is * greater-than the new map's start. */ -for (i =first_ending_after (maps, new); i <maps__nr_maps (maps); ) { +for (i =first_ending_after (maps, new); i <__maps__nr_maps (maps); ) {struct map **maps_by_address =maps__maps_by_address (maps);struct map **maps_by_name =maps__maps_by_name (maps);struct map *pos = maps_by_address[i];
@@ -1065,7 +1099,7 @@ static int __maps__fixup_overlap_and_insert(struct maps *maps, struct map *new)return err; }else {struct map *next =NULL ; -unsigned int nr_maps =maps__nr_maps (maps); +unsigned int nr_maps =__maps__nr_maps (maps);if (i +1 < nr_maps) next = maps_by_address[i +1 ];
@@ -1149,8 +1183,8 @@ int maps__copy_from(struct maps *dest, struct maps *parent) }#endif parent_maps_by_address =maps__maps_by_address (parent); - n =maps__nr_maps (parent); -if (maps__nr_maps (dest) ==0 ) { + n =__maps__nr_maps (parent); +if (__maps__nr_maps (dest) ==0 ) {/* No existing mappings so just copy from parent to avoid reallocs in insert. */ unsigned int nr_maps_allocated =RC_CHK_ACCESS (parent)->nr_maps_allocated; struct map **dest_maps_by_address =
@@ -1234,7 +1268,7 @@ struct map *maps__find(struct maps *maps, u64 ip)if (maps__maps_by_address_sorted (maps)) {struct map **mapp =NULL ;struct map **maps_by_address =maps__maps_by_address (maps); -unsigned int nr_maps =maps__nr_maps (maps); +unsigned int nr_maps =__maps__nr_maps (maps);if (maps_by_address && nr_maps) mapp = bsearch(&ip, maps_by_address, nr_maps, sizeof(*mapp),
@@ -1270,7 +1304,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name)/* First check last found entry. */ i =RC_CHK_ACCESS (maps)->last_search_by_name_idx; -if (i <maps__nr_maps (maps) &&maps__maps_by_name (maps)) { +if (i <__maps__nr_maps (maps) &&maps__maps_by_name (maps)) {struct dso *dso =map__dso (maps__maps_by_name (maps)[i]);if (dso &&strcmp (dso__short_name (dso), name) ==0 ) {
@@ -1282,7 +1316,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name)/* Second search sorted array. */ if (!done &&maps__maps_by_name_sorted (maps)) {struct map **mapp = -bsearch (name,maps__maps_by_name (maps),maps__nr_maps (maps), +bsearch (name,maps__maps_by_name (maps),__maps__nr_maps (maps),sizeof (*mapp), map__strcmp_name);if (mapp) {
@@ -1305,7 +1339,7 @@ struct map *maps__find_by_name(struct maps *maps, const char *name)down_read (maps__lock (maps)); maps_by_address =maps__maps_by_address (maps); - n =maps__nr_maps (maps); + n =__maps__nr_maps (maps);for (i =0 ; i < n; i++) {struct map *pos = maps_by_address[i];struct dso *dso =map__dso (pos);
@@ -1335,7 +1369,7 @@ struct map *maps__find_next_entry(struct maps *maps, struct map *map)down_read (maps__lock (maps)); } i =maps__by_address_index (maps, map); -if (++i <maps__nr_maps (maps)) +if (++i <__maps__nr_maps (maps)) result =map__get (maps__maps_by_address (maps)[i]);up_read (maps__lock (maps));
@@ -1352,7 +1386,7 @@ void maps__fixup_end(struct maps *maps)__maps__sort_by_address (maps); maps_by_address =maps__maps_by_address (maps); - n =maps__nr_maps (maps); + n =__maps__nr_maps (maps);for (unsigned int i =1 ; i < n; i++) {struct map *prev = maps_by_address[i -1 ];struct map *curr = maps_by_address[i];
@@ -1399,7 +1433,7 @@ int maps__merge_in(struct maps *kmaps, struct map *new_map) first_after_ =first_ending_after (kmaps, new_map); kmaps_maps_by_address =maps__maps_by_address (kmaps); -if (first_after_ >=maps__nr_maps (kmaps) || +if (first_after_ >=__maps__nr_maps (kmaps) ||map__start (kmaps_maps_by_address[first_after_]) >=map__end (new_map)) {/* No overlap so regular insert suffices. */ up_read (maps__lock (kmaps));
@@ -1414,7 +1448,7 @@ int maps__merge_in(struct maps *kmaps, struct map *new_map) first_after_ =first_ending_after (kmaps, new_map); kmaps_maps_by_address =maps__maps_by_address (kmaps); - kmaps__nr_maps =maps__nr_maps (kmaps); + kmaps__nr_maps =__maps__nr_maps (kmaps);if (first_after_ >= kmaps__nr_maps ||map__start (kmaps_maps_by_address[first_after_]) >=map__end (new_map)) {
@@ -1468,7 +1502,7 @@ void maps__load_first(struct maps *maps)struct map *first =NULL ;down_read (maps__lock (maps)); -if (maps__nr_maps (maps) >0 ) +if (__maps__nr_maps (maps) >0 ) first =map__get (maps__maps_by_address (maps)[0 ]);up_read (maps__lock (maps));
Signature · 1 line
2.56.0.212.g129ede20d9-goog
Ian Rogers
reviewerv4 cover tools/perf: Adopt kernel compiler-context-analysis.h annotations
In reply to Ian RogersThe perf tool previously added Clang thread-safety annotations in tools/perf/util/mutex.h (GUARDED_BY, LOCKABLE, EXCLUSIVE_LOCK_FUNCTION, UNLOCK_FUNCTION, etc.). Since then, the Linux kernel has adopted a unified set of static context analysis macros and attributes in include/linux/compiler-context-analysis.h (context_lock_struct, __guarded_by, __acquires, __releases, __must_hold, etc.).
This series makes tools/include/linux/compiler-context-analysis.h functional by synchronizing it and the required compiler_types.h helpers with the kernel headers, converts tools/perf from its custom mutex.h macros to the kernel-style compiler-context-analysis.h annotations, and expands context analysis coverage across comm, dso/dsos, thread/threads, config, intel-tpebs, env, and maps. Along the way, separate preparatory patches fix an unlocked __dsos__add() call and TOCTOU race in __machine__addnew_vdso(), avoid dropping _dso__data_open_lock in dso__list_del() under REFCNT_CHECKING, switch dso__data_open_lock and tpebs_mtx to DEFINE_MUTEX(), add a read-lock fast path to dsos__findnew_id(), fix an unlocked read of tpebs_reader_thread and double-close of tpebs_cmd.out in intel-tpebs, and avoid a potential read-to-write deadlock in maps__load_first() and out-of-bounds access in __maps__remove().
This series was developed and reviewed with assistance from an AI coding agent (Gemini 3.1 Pro) and reviewed with Sashiko.
v4:
- Place the DSO loaded in addr_filter__resolve_syms() into a dsos collection so dso__dsos(dso) is populated (patch 8).
- Join tpebs_reader_thread on error in evsel__tpebs_open(), document why tpebs_cmd.pid is cleared before pthread_join() in tpebs_stop(), and include <pthread.h> and <signal.h> in util/intel-tpebs.c (patch 13).
- Include <string.h> in util/maps.c (patch 16).
v3:
- Rebase onto perf-tools-next (converting the newly added dso__find_binary_type() lock annotations in util/dso.c).
- Separate bug fixes, DEFINE_MUTEX() cleanups, and improvements (vdso, dso_data, dso__data_open_lock, dsos__findnew_id, intel-tpebs, tpebs_mtx, maps) from the annotation patches.
- Move AI coding assistant attribution to the cover letter and drop per-commit Assisted-by tags per linux-next Documentation/process/coding-assistants.rst.
- Add Marco Elver's Reviewed-by to patch 1.
- Define __diag_clang_23() and Clang ASM_INPUT_G/ASM_INPUT_RM/ ASM_OUTPUT_RM overrides in tools/include/linux/compiler-gcc.h (patch 2).
- Probe for -Wthread-safety-pointer/-Wthread-safety-beta in Makefile.config (patch 5).
- Pass write_locked to __dsos__find() (patch 7).
- Pass struct dso_data * to close_data_fd() and dso__list_del() to remove the REFCNT_CHECKING dso pointer from struct dso_data and avoid dropping dso__data_open_lock in dso__list_del(), and include <assert.h> in util/dso.c (patch 8).
- Re-validate DSO lookup under the write lock in dsos__findnew_id()
via __dsos__findnew_id(), and handle NULL dso_id in
dso__needs_improve_id(), __dso__improve_id(), and dso_id__cmp()
(patch 10).
- Reset tpebs_cmd.out = -1 if start_command() fails and include
<stdint.h>, <stdlib.h>, <string.h>, and <unistd.h> in
util/intel-tpebs.c (patch 13). - Bounds-check the index in __maps__remove() (freeing maps_by_name if out of bounds) (patch 16).
v2:
- Use -c rather than -E when probing for -fexperimental-late-parse-attributes in Makefile.config to avoid -Werror,-Wunused-command-line-argument.
- Acquire machine->dsos.lock in write mode across duplicate checking,
dso__set_long_name(), and __dsos__add() in __machine__addnew_vdso().
- Avoid dropping dso__data_open_lock in dso__list_del() under REFCNT_CHECKING.
- Pass tpebs_cmd.out directly to __sample_reader() and set tpebs_cmd.out = -1 in evsel__tpebs_open() to avoid a double-close in tpebs_stop(), and clarify the config_set_mutex comment.
- Drop maps__lock before calling map__load() in maps__load_first() to avoid a read-to-write self-deadlock when loading kernel maps inserts additional trampoline maps.
Ian Rogers (17):
compiler-context-analysis: Avoid unused parameter warning in
_context_unsafe_alias()
tools headers compiler: Synchronize compiler_types.h with the kernel
sources
tools headers: Synchronize linux/compiler-context-analysis.h with the
kernel sources
perf mutex: Use kernel style compiler-context-analysis.h annotations perf build: Enable additional Clang thread-safety flags perf comm: Add __guarded_by annotations to struct comm_strs perf vdso: Fix unlocked __dsos__add() and race in
__machine__addnew_vdso()
perf dso: Pass dso_data to close_data_fd() and dso__list_del()
perf dso: Use DEFINE_MUTEX for dso__data_open_lock
perf dsos: Use read lock fast path in dsos__findnew_id()
perf dso: Expand context analysis annotations
perf thread: Expand context analysis annotations to threads and
namespaces_lock
perf intel-tpebs: Fix race in tpebs_stop() and tpebs_cmd.out fd
handling
perf intel-tpebs: Use DEFINE_MUTEX for tpebs_mtx
perf config, intel-tpebs, env: Add __guarded_by and __must_hold
annotations
perf maps: Fix lock inversion in maps__load_first() and bounds check
in __maps__remove()perf maps: Add context analysis annotations
include/linux/compiler-context-analysis.h | 2 +- .../include/linux/compiler-context-analysis.h | 518 ++++++++++++++++-- tools/include/linux/compiler-gcc.h | 72 ++- tools/include/linux/compiler.h | 50 +- tools/include/linux/compiler_types.h | 206 ++++++- tools/perf/Makefile.config | 8 +- tools/perf/builtin-sched.c | 16 +- tools/perf/builtin-top.c | 4 +- tools/perf/check-headers.sh | 1 + tools/perf/tests/dso-data.c | 4 + tools/perf/util/annotate.c | 4 +- tools/perf/util/annotate.h | 8 +- tools/perf/util/auxtrace.c | 16 +- tools/perf/util/bpf-event.h | 5 +- tools/perf/util/comm.c | 10 +- tools/perf/util/config.c | 43 +- tools/perf/util/dso.c | 140 +++-- tools/perf/util/dso.h | 15 +- tools/perf/util/dsos.c | 31 +- tools/perf/util/dsos.h | 12 +- tools/perf/util/env.c | 1 + tools/perf/util/env.h | 19 +- tools/perf/util/intel-tpebs.c | 128 +++-- tools/perf/util/libbfd.c | 4 +- tools/perf/util/maps.c | 148 +++-- tools/perf/util/mutex.c | 4 +- tools/perf/util/mutex.h | 90 +-- tools/perf/util/rwsem.c | 8 +- tools/perf/util/rwsem.h | 10 +- tools/perf/util/thread.c | 10 +- tools/perf/util/thread.h | 30 +- tools/perf/util/threads.c | 4 + tools/perf/util/threads.h | 6 +- tools/perf/util/vdso.c | 17 +- 34 files changed, 1181 insertions(+), 463 deletions(-)
Signature · 1 line
2.56.0.212.g129ede20d9-goog
Ian Rogers
reviewerPATCH v4 1/17 compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias()
_context_unsafe_alias() does not use its parameter 'p', which triggers -Wunused-parameter when building code that enables -Wextra (such as tools/perf, tools/lib/perf, tools/lib/subcmd, and tools/lib/symbol). Explicitly cast 'p' to void to silence the warning, matching __assume_ctx_lock() and __assume_shared_ctx_lock().
--- include/linux/compiler-context-analysis.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/compiler-context-analysis.h +1 -1
@@ -243,7 +243,7 @@* alias as a function argument). */ #define context_unsafe_alias (p) _context_unsafe_alias((void **)&(p)) -static inline void _context_unsafe_alias (void **p) { } +static inline void _context_unsafe_alias (void **p) { (void )p; }/** * token_context_lock() - declare an abstract global context lock instance
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v4 01/17] compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias()
Sashiko has reviewed this patch and found no issues.
Quoted 8 lines
_context_unsafe_alias()does not use its parameter 'p', which triggers -Wunused-parameter when building code that enables -Wextra (such astools/perf,tools/lib/perf,tools/lib/subcmd, andtools/lib/symbol). Explicitly cast 'p' to void to silence the warning, matching__assume_ctx_lock()and__assume_shared_ctx_lock().Reviewed-by Marco Elver <[email protected]>Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Ian Rogers
reviewerPATCH v4 2/17 tools headers compiler: Synchronize compiler_types.h with the kernel sources
In reply to Ian RogersSynchronize the non-__KERNEL__ sections of tools/include/linux/compiler_types.h and tools/include/linux/compiler-gcc.h with the kernel sources (including ___PASTE/__PASTE, BTF_TYPE_TAG, object-size helpers, asm_goto_output, ASM_INPUT_*, asm_inline, __typeof_unqual__/__unqual_scalar_typeof, __signed_scalar_typeof, __native_word, compiletime_assert, and the __diag pragma helpers required by compiler-context-analysis.h), and remove the duplicated definitions from tools/include/linux/compiler.h.
--- tools/include/linux/compiler-gcc.h | 72 +++++++++- tools/include/linux/compiler.h | 50 +------ tools/include/linux/compiler_types.h | 206 ++++++++++++++++++++++++++- 3 files changed, 275 insertions(+), 53 deletions(-)
tools/include/linux/compiler-gcc.h +69 -3
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _TOOLS_LINUX_COMPILER_H_ +#ifndef __LINUX_COMPILER_TYPES_H#error "Please do not include <linux/compiler-gcc.h> directly, include <linux/compiler.h> instead." -#endif +#endif /* __LINUX_COMPILER_TYPES_H */ /* * Common definitions for all gcc versions go here.
@@ -33,10 +33,76 @@#define __packed __attribute__((packed))#endif #ifndef __noreturn -#define __noreturn __attribute__((noreturn)) +#define __noreturn __attribute__((__noreturn__))#endif #ifndef __aligned#define __aligned (x) __attribute__((aligned(x)))#endif #define __printf (a, b) __attribute__((format(printf, a, b)))#define __scanf (a, b) __attribute__((format(scanf, a, b))) + +/* +* Turn individual warnings and errors on and off locally, depending +* on version. +*/ +#define __diag_str1 (s) #s +#define __diag_str (s) __diag_str1(s) + +#ifdef __clang__ +#define __diag_clang (version, severity, s) \ + __diag_clang_ ## version(__diag_clang_ ## severity s) + +/* Severity used in pragma directives */ +#define __diag_clang_ignore ignored +#define __diag_clang_warn warning +#define __diag_clang_error error + +#define __diag (s) _Pragma(__diag_str(clang diagnostic s)) + +#if __clang_major__ >=23 +#define __diag_clang_23 (s) __diag(s) +#else +#define __diag_clang_23 (s) +#endif + +#define __diag_clang_all (s) __diag(s) + +#define __diag_ignore_all (option, comment) \ + __diag_clang(all, ignore, option) + +/* +* clang has horrible behavior with "g" or "rm" constraints for asm +* inputs, turning them into something worse than "m". Avoid using +* constraints with multiple possible uses (but "ir" seems to be ok): +* +* https://github.com/llvm/llvm-project/issues/20571 +*/ +#define ASM_INPUT_G "ir" +#define ASM_INPUT_RM "r" +#define ASM_OUTPUT_RM "=r" + +#define CC_HAS_TYPEOF_UNQUAL (__clang_major__ > 19 || (__clang_major__ == 19 && __clang_minor__ > 0)) +#else /* !__clang__ */ +#define __diag_GCC (version, severity, s) \ + __diag_GCC_ ## version(__diag_GCC_ ## severity s) + +/* Severity used in pragma directives */ +#define __diag_GCC_ignore ignored +#define __diag_GCC_warn warning +#define __diag_GCC_error error + +#define __diag (s) _Pragma(__diag_str(GCC diagnostic s)) + +#if GCC_VERSION >=80000 +#define __diag_GCC_8 (s) __diag(s) +#else +#define __diag_GCC_8 (s) +#endif + +#define __diag_GCC_all (s) __diag(s) + +#define __diag_ignore_all (option, comment) \ + __diag(__diag_GCC_ignore option) + +#define CC_HAS_TYPEOF_UNQUAL (__GNUC__ >= 14) +#endif /* __clang__ */
tools/include/linux/compiler.h +3 -47
80 lines not on this page · raw message
tools/include/linux/compiler_types.h +203 -3
236 lines not on this page · raw message
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v4 02/17] tools headers compiler: Synchronize compiler_types.h with the kernel sources
Sashiko has reviewed this patch and found no issues.
Quoted 10 lines
Synchronize the non-__KERNEL__ sections of
tools/include/linux/compiler_types.handtools/include/linux/compiler-gcc.hwith the kernel sources (including ___PASTE/__PASTE,BTF_TYPE_TAG, object-size helpers,asm_goto_output, ASM_INPUT_*,asm_inline, __typeof_unqual__/__unqual_scalar_typeof,__signed_scalar_typeof,__native_word,compiletime_assert, and the__diagpragma helpers required bycompiler-context-analysis.h), and remove the duplicated definitions fromtools/include/linux/compiler.h.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
Ian Rogers
reviewerPATCH v4 3/17 tools headers: Synchronize linux/compiler-context-analysis.h with the kernel sources
In reply to Ian RogersReplace the no-op stub tools/include/linux/compiler-context-analysis.h with the full kernel implementation from include/linux/compiler-context-analysis.h and add it to tools/perf/check-headers.sh so future changes are tracked.
--- .../include/linux/compiler-context-analysis.h | 518 ++++++++++++++++-- tools/perf/check-headers.sh | 1 + 2 files changed, 480 insertions(+), 39 deletions(-)
tools/include/linux/compiler-context-analysis.h +479 -39
@@ -1,42 +1,482 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _TOOLS_LINUX_COMPILER_CONTEXT_ANALYSIS_H -#define _TOOLS_LINUX_COMPILER_CONTEXT_ANALYSIS_H -/* * Macros and attributes for compiler-based static context analysis. -* No-op stubs for tools. -*/ - -#define __guarded_by (...) -#define __pt_guarded_by (...) - -#define context_lock_struct (name, ...) struct __VA_ARGS__ name - -#define __no_context_analysis -#define __context_unsafe (comment) -#define context_unsafe (...) ({ __VA_ARGS__; }) -#define context_unsafe_alias (p) -#define disable_context_analysis () -#define enable_context_analysis () - -#define __must_hold (...) -#define __must_not_hold (...) -#define __acquires (...) -#define __cond_acquires (ret, x) -#define __releases (...) -#define __acquire (x) (void)0 -#define __release (x) (void)0 - -#define __must_hold_shared (...) -#define __acquires_shared (...) -#define __cond_acquires_shared (ret, x) -#define __releases_shared (...) -#define __acquire_shared (x) (void)0 -#define __release_shared (x) (void)0 - -#define __acquire_ret (call, expr) (call) -#define __acquire_shared_ret (call, expr) (call) -#define __acquires_ret -#define __acquires_shared_ret - -#endif /* _TOOLS_LINUX_COMPILER_CONTEXT_ANALYSIS_H */ +*/ + +#ifndef _LINUX_COMPILER_CONTEXT_ANALYSIS_H +#define _LINUX_COMPILER_CONTEXT_ANALYSIS_H + +#if defined(WARN_CONTEXT_ANALYSIS ) && !defined(__CHECKER__) && !defined(__GENKSYMS__) + +/* +* These attributes define new context lock (Clang: capability) types. +* Internal only. +*/ +# define __ctx_lock_type (name) __attribute__((capability(#name))) +# define __reentrant_ctx_lock __attribute__((reentrant_capability)) +# define __acquires_ctx_lock (...) __attribute__((acquire_capability(__VA_ARGS__))) +# define __acquires_shared_ctx_lock (...) __attribute__((acquire_shared_capability(__VA_ARGS__))) +# define __try_acquires_ctx_lock (ret, var) __attribute__((try_acquire_capability(ret, var))) +# define __try_acquires_shared_ctx_lock (ret, var) __attribute__((try_acquire_shared_capability(ret, var))) +# define __releases_ctx_lock (...) __attribute__((release_capability(__VA_ARGS__))) +# define __releases_shared_ctx_lock (...) __attribute__((release_shared_capability(__VA_ARGS__))) +# define __returns_ctx_lock (var) __attribute__((lock_returned(var))) + +/* +* The below are used to annotate code being checked. Internal only. +*/ +# define __excludes_ctx_lock (...) __attribute__((locks_excluded(__VA_ARGS__))) +# define __requires_ctx_lock (...) __attribute__((requires_capability(__VA_ARGS__))) +# define __requires_shared_ctx_lock (...) __attribute__((requires_shared_capability(__VA_ARGS__))) + +/* +* The "assert_capability" attribute is a bit confusingly named. It does not +* generate a check. Instead, it tells the analysis to *assume* the capability +* is held. This is used for augmenting runtime assertions, that can then help +* with patterns beyond the compiler's static reasoning abilities. +*/ +# define __assumes_ctx_lock (...) __attribute__((assert_capability(__VA_ARGS__))) +# define __assumes_shared_ctx_lock (...) __attribute__((assert_shared_capability(__VA_ARGS__))) + +/** +* __guarded_by() - struct member and globals attribute, declares variable +* only accessible within active context +* @...: context lock instance pointer(s) +* +* Declares that the struct member or global variable is only accessible within +* the context entered by the given context lock(s). Read operations on the data +* require shared access to at least one of the context locks, while write +* operations require exclusive access to all listed context locks. +* +* .. code-block:: c +* +* struct some_state { +* spinlock_t lock; +* long counter __guarded_by(&lock); +* }; +* +* struct some_state { +* spinlock_t lock1, lock2; +* long counter __guarded_by(&lock1, &lock2); +* }; +*/ +# define __guarded_by (...) __attribute__((guarded_by(__VA_ARGS__))) + +/** +* __pt_guarded_by() - struct member and globals attribute, declares pointed-to +* data only accessible within active context +* @...: context lock instance pointer(s) +* +* Declares that the data pointed to by the struct member pointer or global +* pointer is only accessible within the context entered by the given context +* lock(s). Read operations on the data require shared access to at least one +* of the context locks, while write operations require exclusive access to all +* listed context locks. +* +* .. code-block:: c +* +* struct some_state { +* spinlock_t lock; +* long *counter __pt_guarded_by(&lock); +* }; +* +* struct some_state { +* spinlock_t lock1, lock2; +* long *counter __pt_guarded_by(&lock1, &lock2); +* }; +*/ +# define __pt_guarded_by (...) __attribute__((pt_guarded_by(__VA_ARGS__))) + +/** +* context_lock_struct() - declare or define a context lock struct +* @name: struct name +* +* Helper to declare or define a struct type that is also a context lock. +* +* .. code-block:: c +* +* context_lock_struct(my_handle) { +* int foo; +* long bar; +* }; +* +* struct some_state { +* ... +* }; +* // ... declared elsewhere ... +* context_lock_struct(some_state); +* +* Note: The implementation defines several helper functions that can acquire +* and release the context lock. +*/ +# define context_lock_struct (name, ...) \ + struct __ctx_lock_type(name) __VA_ARGS__ name; \ + static __always_inline void __acquire_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __no_context_analysis __acquires_ctx_lock(var) { } \ + static __always_inline void __acquire_shared_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __no_context_analysis __acquires_shared_ctx_lock(var) { } \ + static __always_inline bool __try_acquire_ctx_lock(const struct name *var, bool ret) \ + __attribute__((overloadable)) __no_context_analysis __try_acquires_ctx_lock(1, var) \ + { return ret; } \ + static __always_inline bool __try_acquire_shared_ctx_lock(const struct name *var, bool ret) \ + __attribute__((overloadable)) __no_context_analysis __try_acquires_shared_ctx_lock(1, var) \ + { return ret; } \ + static __always_inline void __release_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __no_context_analysis __releases_ctx_lock(var) { } \ + static __always_inline void __release_shared_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __no_context_analysis __releases_shared_ctx_lock(var) { } \ + static __always_inline void __assume_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __assumes_ctx_lock(var) { } \ + static __always_inline void __assume_shared_ctx_lock(const struct name *var) \ + __attribute__((overloadable)) __assumes_shared_ctx_lock(var) { } \ + struct name + +/** +* disable_context_analysis() - disables context analysis +* +* Disables context analysis. Must be paired with a later +* enable_context_analysis(). +*/ +# define disable_context_analysis () \ + __diag_push(); \ + __diag_ignore_all("-Wunknown-warning-option", "") \ + __diag_ignore_all("-Wthread-safety", "") \ + __diag_ignore_all("-Wthread-safety-pointer", "") + +/** +* enable_context_analysis() - re-enables context analysis +* +* Re-enables context analysis. Must be paired with a prior +* disable_context_analysis(). +*/ +# define enable_context_analysis () __diag_pop() + +/** +* __no_context_analysis - function attribute, disables context analysis +* +* Function attribute denoting that context analysis is disabled for the +* whole function. Prefer use of `context_unsafe()` where possible. +*/ +# define __no_context_analysis __attribute__((no_thread_safety_analysis)) + +#else /* !WARN_CONTEXT_ANALYSIS */ + +# define __ctx_lock_type (name) +# define __reentrant_ctx_lock +# define __acquires_ctx_lock (...) +# define __acquires_shared_ctx_lock (...) +# define __try_acquires_ctx_lock (ret, var) +# define __try_acquires_shared_ctx_lock (ret, var) +# define __releases_ctx_lock (...) +# define __releases_shared_ctx_lock (...) +# define __assumes_ctx_lock (...) +# define __assumes_shared_ctx_lock (...) +# define __returns_ctx_lock (var) +# define __guarded_by (...) +# define __pt_guarded_by (...) +# define __excludes_ctx_lock (...) +# define __requires_ctx_lock (...) +# define __requires_shared_ctx_lock (...) +# define __acquire_ctx_lock (var) do { } while (0) +# define __acquire_shared_ctx_lock (var) do { } while (0) +# define __try_acquire_ctx_lock (var, ret) (ret) +# define __try_acquire_shared_ctx_lock (var, ret) (ret) +# define __release_ctx_lock (var) do { } while (0) +# define __release_shared_ctx_lock (var) do { } while (0) +# define __assume_ctx_lock (var) do { (void)(var); } while (0) +# define __assume_shared_ctx_lock (var) do { (void)(var); } while (0) +# define context_lock_struct (name, ...) struct __VA_ARGS__ name +# define disable_context_analysis () +# define enable_context_analysis () +# define __no_context_analysis + +#endif /* WARN_CONTEXT_ANALYSIS */ + +/** +* context_unsafe() - disable context checking for contained code +* +* Disables context checking for contained statements or expression. +* +* .. code-block:: c +* +* struct some_data { +* spinlock_t lock; +* int counter __guarded_by(&lock); +* }; +* +* int foo(struct some_data *d) +* { +* // ... +* // other code that is still checked ... +* // ... +* return context_unsafe(d->counter); +* } +*/ +#define context_unsafe (...) \ +({ \ + disable_context_analysis(); \ + __VA_ARGS__; \ + enable_context_analysis() \ +}) + +/** +* __context_unsafe() - function attribute, disable context checking +* @comment: comment explaining why opt-out is safe +* +* Function attribute denoting that context analysis is disabled for the +* whole function. Forces adding an inline comment as argument. +*/ +#define __context_unsafe (comment) __no_context_analysis + +/** +* context_unsafe_alias() - helper to insert a context lock "alias barrier" +* @p: pointer aliasing a context lock or object containing context locks +* +* No-op function that acts as a "context lock alias barrier", where the +* analysis rightfully detects that we're switching aliases, but the switch is +* considered safe but beyond the analysis reasoning abilities. +* +* This should be inserted before the first use of such an alias. +* +* Implementation Note: The compiler ignores aliases that may be reassigned but +* their value cannot be determined (e.g. when passing a non-const pointer to an +* alias as a function argument). +*/ +#define context_unsafe_alias (p) _context_unsafe_alias((void **)&(p)) +static inline void _context_unsafe_alias (void **p) { (void )p; } + +/** +* token_context_lock() - declare an abstract global context lock instance +* @name: token context lock name +* +* Helper that declares an abstract global context lock instance @name, but not +* backed by a real data structure (linker error if accidentally referenced). +* The type name is `__ctx_lock_@name`. +*/ +#define token_context_lock (name, ...) \ + context_lock_struct(__ctx_lock_##name, ##__VA_ARGS__) {}; \ + extern const struct __ctx_lock_##name *name + +/** +* token_context_lock_instance() - declare another instance of a global context lock +* @ctx: token context lock previously declared with token_context_lock() +* @name: name of additional global context lock instance +* +* Helper that declares an additional instance @name of the same token context +* lock class @ctx. This is helpful where multiple related token contexts are +* declared, to allow using the same underlying type (`__ctx_lock_@ctx`) as +* function arguments. +*/ +#define token_context_lock_instance (ctx, name) \ + extern const struct __ctx_lock_##ctx *name + +/* +* Common keywords for static context analysis. +*/ + +/** +* __must_hold() - function attribute, caller must hold exclusive context lock +* +* Function attribute declaring that the caller must hold the given context +* lock instance(s) exclusively. +*/ +#define __must_hold (...) __requires_ctx_lock(__VA_ARGS__) + +/** +* __must_not_hold() - function attribute, caller must not hold context lock +* +* Function attribute declaring that the caller must not hold the given context +* lock instance(s). +*/ +#define __must_not_hold (...) __excludes_ctx_lock(__VA_ARGS__) + +/** +* __acquires() - function attribute, function acquires context lock exclusively +* +* Function attribute declaring that the function acquires the given context +* lock instance(s) exclusively, but does not release them. +*/ +#define __acquires (...) __acquires_ctx_lock(__VA_ARGS__) + +/* +* Clang's analysis does not care precisely about the value, only that it is +* either zero or non-zero. So the __cond_acquires() interface might be +* misleading if we say that @ret is the value returned if acquired. Instead, +* provide symbolic variants which we translate. +*/ +#define __cond_acquires_impl_true (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_false (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_nonzero (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_0 (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_nonnull (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_NULL (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) + +/** +* __cond_acquires() - function attribute, function conditionally +* acquires a context lock exclusively +* @ret: abstract value returned by function if context lock acquired +* @x: context lock instance pointer +* +* Function attribute declaring that the function conditionally acquires the +* given context lock instance @x exclusively, but does not release it. The +* function return value @ret denotes when the context lock is acquired. +* +* @ret may be one of: true, false, nonzero, 0, nonnull, NULL. +*/ +#define __cond_acquires (ret, x) __cond_acquires_impl_##ret(x) + +/** +* __releases() - function attribute, function releases a context lock exclusively +* +* Function attribute declaring that the function releases the given context +* lock instance(s) exclusively. The associated context(s) must be active on +* entry. +*/ +#define __releases (...) __releases_ctx_lock(__VA_ARGS__) + +/* +* Clang's analysis does not care precisely about the value, only that it is +* either zero or non-zero. So the __cond_acquires() interface might be +* misleading if we say that @ret is the value returned if acquired. Instead, +* provide symbolic variants which we translate. +*/ +#define __cond_acquires_impl_not_true (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_not_false (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_not_nonzero (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_not_0 (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) +#define __cond_acquires_impl_not_nonnull (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(0, x) +#define __cond_acquires_impl_not_NULL (x, ...) __try_acquires##__VA_ARGS__##_ctx_lock(1, x) + +/** +* __cond_releases() - function attribute, function conditionally +* releases a context lock exclusively +* @ret: abstract value returned by function if context lock releases +* @x: context lock instance pointer +* +* Function attribute declaring that the function conditionally releases the +* given context lock instance @x exclusively. The associated context(s) must +* be active on entry. The function return value @ret denotes when the context +* lock is released. +* +* @ret may be one of: true, false, nonzero, 0, nonnull, NULL. +* +* NOTE: clang does not have a native attribute for this; instead implement +* it as an unconditional release and a conditional acquire for the +* inverted condition -- which is semantically equivalent. +*/ +#define __cond_releases (ret, x) __releases(x) __cond_acquires_impl_not_##ret(x) + +/** +* __acquire() - function to acquire context lock exclusively +* @x: context lock instance pointer +* +* No-op function that acquires the given context lock instance @x exclusively. +*/ +#define __acquire (x) __acquire_ctx_lock(x) + +/** +* __release() - function to release context lock exclusively +* @x: context lock instance pointer +* +* No-op function that releases the given context lock instance @x. +*/ +#define __release (x) __release_ctx_lock(x) + +/** +* __must_hold_shared() - function attribute, caller must hold shared context lock +* +* Function attribute declaring that the caller must hold the given context +* lock instance(s) with shared access. +*/ +#define __must_hold_shared (...) __requires_shared_ctx_lock(__VA_ARGS__) + +/** +* __acquires_shared() - function attribute, function acquires context lock shared +* +* Function attribute declaring that the function acquires the given +* context lock instance(s) with shared access, but does not release them. +*/ +#define __acquires_shared (...) __acquires_shared_ctx_lock(__VA_ARGS__) + +/** +* __cond_acquires_shared() - function attribute, function conditionally +* acquires a context lock shared +* @ret: abstract value returned by function if context lock acquired +* @x: context lock instance pointer +* +* Function attribute declaring that the function conditionally acquires the +* given context lock instance @x with shared access, but does not release it. +* The function return value @ret denotes when the context lock is acquired. +* +* @ret may be one of: true, false, nonzero, 0, nonnull, NULL. +*/ +#define __cond_acquires_shared (ret, x) __cond_acquires_impl_##ret(x, _shared) + +/** +* __releases_shared() - function attribute, function releases a +* context lock shared +* +* Function attribute declaring that the function releases the given context +* lock instance(s) with shared access. The associated context(s) must be +* active on entry. +*/ +#define __releases_shared (...) __releases_shared_ctx_lock(__VA_ARGS__) + +/** +* __acquire_shared() - function to acquire context lock shared +* @x: context lock instance pointer +* +* No-op function that acquires the given context lock instance @x with shared +* access. +*/ +#define __acquire_shared (x) __acquire_shared_ctx_lock(x) + +/** +* __release_shared() - function to release context lock shared +* @x: context lock instance pointer +* +* No-op function that releases the given context lock instance @x with shared +* access. +*/ +#define __release_shared (x) __release_shared_ctx_lock(x) + +/** +* __acquire_ret() - helper to acquire context lock of return value +* @call: call expression +* @ret_expr: acquire expression that uses __ret +*/ +#define __acquire_ret (call, ret_expr) \ + ({ \ + __auto_type __ret = call; \ + __acquire(ret_expr); \ + __ret; \ + }) + +/** +* __acquire_shared_ret() - helper to acquire context lock shared of return value +* @call: call expression +* @ret_expr: acquire shared expression that uses __ret +*/ +#define __acquire_shared_ret (call, ret_expr) \ + ({ \ + __auto_type __ret = call; \ + __acquire_shared(ret_expr); \ + __ret; \ + }) + +/* +* Attributes to mark functions returning acquired context locks. +* +* This is purely cosmetic to help readability, and should be used with the +* above macros as follows: +* +* struct foo { spinlock_t lock; ... }; +* ... +* #define myfunc(...) __acquire_ret(_myfunc(__VA_ARGS__), &__ret->lock) +* struct foo *_myfunc(int bar) __acquires_ret; +* ... +*/ +#define __acquires_ret __no_context_analysis +#define __acquires_shared_ret __no_context_analysis + +#endif /* _LINUX_COMPILER_CONTEXT_ANALYSIS_H */
tools/perf/check-headers.sh +1 -0
@@ -23,6 +23,7 @@ declare -a FILES=( "include/linux/bits.h" "include/vdso/bits.h" "include/linux/cfi_types.h" + "include/linux/compiler-context-analysis.h" "include/linux/const.h" "include/vdso/const.h" "include/vdso/unaligned.h"
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v4 03/17] tools headers: Synchronize linux/compiler-context-analysis.h with the kernel sources
Sashiko has reviewed this patch and found no issues.
Quoted 6 lines
Replace the no-op stub
tools/include/linux/compiler-context-analysis.hwith the full kernel implementation frominclude/linux/compiler-context-analysis.hand add it totools/perf/check-headers.shso future changes are tracked.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
Ian Rogers
reviewerPATCH v4 4/17 perf mutex: Use kernel style compiler-context-analysis.h annotations
In reply to Ian RogersEnable -DWARN_CONTEXT_ANALYSIS alongside -Wthread-safety for Clang builds in tools/perf/Makefile.config, replace the custom lock safety macros in tools/perf with the kernel's compiler-context-analysis.h annotations (context_lock_struct, __guarded_by, __acquires, __acquires_shared, __releases, __releases_shared, __cond_acquires, __must_hold, __must_hold_shared, __must_not_hold, __returns_ctx_lock, __no_context_analysis, and __context_unsafe), and remove the redundant macro definitions from tools/perf/util/mutex.h.
--- tools/perf/Makefile.config | 2 +- tools/perf/builtin-sched.c | 16 +++---- tools/perf/builtin-top.c | 4 +- tools/perf/util/annotate.c | 4 +- tools/perf/util/annotate.h | 8 ++-- tools/perf/util/comm.c | 4 +- tools/perf/util/dso.c | 30 ++++++------ tools/perf/util/dso.h | 9 ++-- tools/perf/util/dsos.c | 6 +-- tools/perf/util/intel-tpebs.c | 6 +-- tools/perf/util/libbfd.c | 4 +- tools/perf/util/mutex.c | 4 +- tools/perf/util/mutex.h | 90 +++-------------------------------- tools/perf/util/rwsem.c | 8 ++-- tools/perf/util/rwsem.h | 10 ++-- tools/perf/util/thread.c | 8 ++-- tools/perf/util/thread.h | 2 +- 17 files changed, 69 insertions(+), 146 deletions(-)
tools/perf/Makefile.config +1 -1
@@ -64,7 +64,7 @@ ifeq ($(CC_NO_CLANG), 0) endif # Enabled Wthread-safety analysis for clang builds. - CFLAGS += -Wthread-safety + CFLAGS += -Wthread-safety -DWARN_CONTEXT_ANALYSIS endif include $(srctree)/tools/scripts/Makefile.arch
tools/perf/builtin-sched.c +8 -8
@@ -828,8 +828,8 @@ static void *thread_func(void *ctx) }static void create_tasks (struct perf_sched *sched) - EXCLUSIVE_LOCK_FUNCTION(sched->start_work_mutex) - EXCLUSIVE_LOCK_FUNCTION(sched->work_done_wait_mutex) + __acquires(&sched->start_work_mutex) + __acquires(&sched->work_done_wait_mutex) {struct task_desc *task;pthread_attr_t attr;
@@ -858,8 +858,8 @@ static void create_tasks(struct perf_sched *sched) }static void destroy_tasks (struct perf_sched *sched) - UNLOCK_FUNCTION(sched->start_work_mutex) - UNLOCK_FUNCTION(sched->work_done_wait_mutex) + __releases(&sched->start_work_mutex) + __releases(&sched->work_done_wait_mutex) {struct task_desc *task;unsigned long i;
@@ -878,8 +878,8 @@ static void destroy_tasks(struct perf_sched *sched) }static void wait_for_tasks (struct perf_sched *sched) - EXCLUSIVE_LOCKS_REQUIRED(sched->work_done_wait_mutex) - EXCLUSIVE_LOCKS_REQUIRED(sched->start_work_mutex) + __must_hold(&sched->work_done_wait_mutex) + __must_hold(&sched->start_work_mutex) {u64 cpu_usage_0, cpu_usage_1;struct task_desc *task;
@@ -930,8 +930,8 @@ static void wait_for_tasks(struct perf_sched *sched) }static void run_one_test (struct perf_sched *sched) - EXCLUSIVE_LOCKS_REQUIRED(sched->work_done_wait_mutex) - EXCLUSIVE_LOCKS_REQUIRED(sched->start_work_mutex) + __must_hold(&sched->work_done_wait_mutex) + __must_hold(&sched->start_work_mutex) {u64 T0 ,T1 , delta, avg_delta, fluct;
tools/perf/builtin-top.c +2 -2
@@ -201,7 +201,7 @@ static void perf_top__record_precise_ip(struct perf_top *top,struct hist_entry *he, struct perf_sample *sample, u64 ip) - EXCLUSIVE_LOCKS_REQUIRED(he->hists->lock) + __must_hold(&he->hists->lock) { struct annotation *notes;struct symbol *sym = he->ms.sym;
@@ -730,7 +730,7 @@ static void *display_thread(void *arg)static int hist_iter__top_callback (struct hist_entry_iter *iter,struct addr_location *al,bool single,void *arg) - EXCLUSIVE_LOCKS_REQUIRED(iter->he->hists->lock) + __must_hold(&iter->he->hists->lock) {struct perf_top *top = arg;
tools/perf/util/annotate.c +2 -2
@@ -655,7 +655,7 @@ static struct mutex *annotation__get_mutex(const struct annotation *notes) }void annotation__lock (struct annotation *notes) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {struct mutex *mutex =annotation__get_mutex (notes);
@@ -664,7 +664,7 @@ void annotation__lock(struct annotation *notes) }void annotation__unlock (struct annotation *notes) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {struct mutex *mutex =annotation__get_mutex (notes);
tools/perf/util/annotate.h +4 -4
@@ -369,7 +369,7 @@ struct annotated_branch {u64 *br_cntr; }; -struct LOCKABLE annotation { +context_lock_struct (annotation) {struct annotated_source *src;struct annotated_branch *branch; };
@@ -379,9 +379,9 @@ static inline void annotation__init(struct annotation *notes __maybe_unused) }void annotation__exit (struct annotation *notes); -void annotation__lock(struct annotation *notes) EXCLUSIVE_LOCK_FUNCTION(*notes); -void annotation__unlock(struct annotation *notes) UNLOCK_FUNCTION(*notes); -bool annotation__trylock(struct annotation *notes) EXCLUSIVE_TRYLOCK_FUNCTION(true, *notes); +void annotation__lock(struct annotation *notes) __acquires(notes); +void annotation__unlock(struct annotation *notes) __releases(notes); +bool annotation__trylock(struct annotation *notes) __cond_acquires(true, notes);static inline int annotation__cycles_width (struct annotation *notes) {
tools/perf/util/comm.c +2 -2
@@ -24,7 +24,7 @@ static struct comm_strs {static void comm_strs__remove_if_last (struct comm_str *cs);static void comm_strs__init (void ) -NO_THREAD_SAFETY_ANALYSIS /* Inherently single threaded due to pthread_once. */ +__context_unsafe (/* Inherently single threaded due to pthread_once. */ ) {init_rwsem (&_comm_strs.lock); _comm_strs.capacity =16 ;
@@ -120,7 +120,7 @@ static void comm_strs__remove_if_last(struct comm_str *cs) }static struct comm_str *__comm_strs__find (struct comm_strs *comm_strs,const char *str) - SHARED_LOCKS_REQUIRED(comm_strs->lock) + __must_hold_shared(&comm_strs->lock) {struct comm_str **result;
tools/perf/util/dso.c +15 -15
@@ -525,14 +525,14 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,*/ struct mutex _dso__data_open_lock;static LIST_HEAD (dso__data_open); -static long dso__data_open_cnt GUARDED_BY (_dso__data_open_lock ); +static long dso__data_open_cnt __guarded_by(&_dso__data_open_lock);static void dso__data_open_lock_init (void ) {mutex_init (&_dso__data_open_lock); } -static struct mutex *dso__data_open_lock (void )LOCK_RETURNED (_dso__data_open_lock) +static struct mutex *dso__data_open_lock(void) __returns_ctx_lock(&_dso__data_open_lock) {static pthread_once_t data_open_lock_once =PTHREAD_ONCE_INIT ;
@@ -541,7 +541,7 @@ static struct mutex *dso__data_open_lock(void) LOCK_RETURNED(_dso__data_open_locreturn &_dso__data_open_lock; } -static void dso__list_add (struct dso *dso)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void dso__list_add(struct dso *dso) __must_hold(&_dso__data_open_lock) {list_add_tail (&dso__data (dso)->open_entry, &dso__data_open);#ifdef REFCNT_CHECKING
@@ -552,7 +552,7 @@ static void dso__list_add(struct dso *dso) EXCLUSIVE_LOCKS_REQUIRED(_dso__data_o dso__data_open_cnt++; } -static void dso__list_del (struct dso *dso)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void dso__list_del(struct dso *dso) __must_hold(&_dso__data_open_lock) {list_del_init (&dso__data (dso)->open_entry);#ifdef REFCNT_CHECKING
@@ -567,7 +567,7 @@ static void dso__list_del(struct dso *dso) EXCLUSIVE_LOCKS_REQUIRED(_dso__data_ostatic void close_first_dso (void ); -static int do_open (char *name)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static int do_open(char *name) __must_hold(&_dso__data_open_lock) { do { int fd = open(name, O_RDONLY|O_CLOEXEC);
@@ -670,7 +670,7 @@ void dso__put_filename(struct dso *dso __maybe_unused, char *filename, bool deco }static int __open_dso (struct dso *dso,struct machine *machine) -EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) + __must_hold(&_dso__data_open_lock) {int fd = -EINVAL ;char *name;
@@ -703,7 +703,7 @@ static void check_data_close(void);* list/count of open DSO objects. */ static int open_dso (struct dso *dso,struct machine *machine) -EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) + __must_hold(&_dso__data_open_lock) {int fd;struct nscookie nsc;
@@ -729,7 +729,7 @@ static int open_dso(struct dso *dso, struct machine *machine)return fd; } -static void close_data_fd (struct dso *dso)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void close_data_fd(struct dso *dso) __must_hold(&_dso__data_open_lock) {if (dso__data (dso)->fd >=0 ) {close (dso__data (dso)->fd);
@@ -746,12 +746,12 @@ static void close_data_fd(struct dso *dso) EXCLUSIVE_LOCKS_REQUIRED(_dso__data_o* Close @dso's data file descriptor and updates * list/count of open DSO objects. */ -static void close_dso (struct dso *dso)EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void close_dso(struct dso *dso) __must_hold(&_dso__data_open_lock) {close_data_fd (dso); } -static void close_first_dso (void )EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void close_first_dso(void) __must_hold(&_dso__data_open_lock) {struct dso_data *dso_data;struct dso *dso;
@@ -796,7 +796,7 @@ void reset_fd_limit(void) fd_limit =0 ; } -static bool may_cache_fd (void )EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static bool may_cache_fd(void) __must_hold(&_dso__data_open_lock) {if (!fd_limit) fd_limit =get_fd_limit ();
@@ -812,7 +812,7 @@ static bool may_cache_fd(void) EXCLUSIVE_LOCKS_REQUIRED(_dso__data_open_lock)* for opened dso file descriptors. The limit is half * of the RLIMIT_NOFILE files opened. */ -static void check_data_close (void )EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) +static void check_data_close(void) __must_hold(&_dso__data_open_lock) {bool cache_fd =may_cache_fd ();
@@ -834,7 +834,7 @@ void dso__data_close(struct dso *dso) }static int dso__find_binary_type_locked (struct dso *dso) -EXCLUSIVE_LOCKS_REQUIRED (dso__lock (dso)) +__must_hold (dso__lock (dso)) {enum dso_binary_type binary_type_data[] = {DSO_BINARY_TYPE__BUILD_ID_CACHE ,
@@ -926,7 +926,7 @@ static int dso__find_binary_type_locked(struct dso *dso)#define FIND_MAX_RETRY 3static int __dso__find_binary_type (struct dso *dso) -EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) + __must_hold(&_dso__data_open_lock) {int ret;int retry =0 ;
@@ -966,7 +966,7 @@ enum dso_binary_type dso__find_binary_type(struct dso *dso) }static void try_to_open_dso (struct dso *dso,struct machine *machine) -EXCLUSIVE_LOCKS_REQUIRED (_dso__data_open_lock) + __must_hold(&_dso__data_open_lock) {struct dso_data *dso_data =dso__data (dso);
tools/perf/util/dso.h +5 -4
@@ -629,6 +629,7 @@ static inline void dso__set_loaded(struct dso *dso) }static inline struct mutex *dso__lock (struct dso *dso) + __returns_ctx_lock(&RC_CHK_ACCESS(dso)->lock) {return &RC_CHK_ACCESS (dso)->lock; }
@@ -809,7 +810,7 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id);int dso__name_len (const struct dso *dso);struct dso *dso__get (struct dso *dso); -void dso__put(struct dso *dso) LOCKS_EXCLUDED(_dso__data_open_lock); +void dso__put(struct dso *dso) __must_not_hold(&_dso__data_open_lock);static inline void __dso__zput (struct dso **dso) {
@@ -919,9 +920,9 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,* TODO */ bool dso__data_get_fd(struct dso *dso, struct machine *machine, int *fd) - EXCLUSIVE_TRYLOCK_FUNCTION(true, _dso__data_open_lock); -void dso__data_put_fd(struct dso *dso) UNLOCK_FUNCTION(_dso__data_open_lock); -void dso__data_close(struct dso *dso) LOCKS_EXCLUDED(_dso__data_open_lock); + __cond_acquires(true, &_dso__data_open_lock); +void dso__data_put_fd(struct dso *dso) __releases(&_dso__data_open_lock); +void dso__data_close(struct dso *dso) __must_not_hold(&_dso__data_open_lock);int dso__data_file_size (struct dso *dso,struct machine *machine);off_t dso__data_size (struct dso *dso,struct machine *machine);
tools/perf/util/dsos.c +3 -3
@@ -157,7 +157,7 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos, const char *name, const struct dso_id *id, bool write_locked) - SHARED_LOCKS_REQUIRED(dsos->lock) + __must_hold_shared(&dsos->lock) { struct dsos__key key = { .long_name = name,
@@ -266,7 +266,7 @@ static int dsos__find_id_cb(struct dso *dso, void *data)static struct dso *__dsos__find_id (struct dsos *dsos,const char *name,const struct dso_id *id,bool cmp_short,bool write_locked) - SHARED_LOCKS_REQUIRED(dsos->lock) + __must_hold_shared(&dsos->lock) {struct dso *res;
@@ -330,7 +330,7 @@ static struct dso *__dsos__addnew_id(struct dsos *dsos, const char *name, const }static struct dso *__dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) - SHARED_LOCKS_REQUIRED(dsos->lock) + __must_hold_shared(&dsos->lock) {struct dso *dso =__dsos__find_id (dsos, name, id, false,/*write_locked=*/ true);
tools/perf/util/intel-tpebs.c +3 -3
@@ -69,7 +69,7 @@ static struct mutex *tpebs_mtx_get(void) }static struct tpebs_retire_lat *tpebs_retire_lat__find (struct evsel *evsel) -EXCLUSIVE_LOCKS_REQUIRED (tpebs_mtx_get ()); +__must_hold (tpebs_mtx_get ());static int evsel__tpebs_start_perf_record (struct evsel *evsel) {
@@ -244,7 +244,7 @@ static void *__sample_reader(void *arg __maybe_unused)return NULL ; } -static int tpebs_send_record_cmd (const char *msg)EXCLUSIVE_LOCKS_REQUIRED (tpebs_mtx_get ()) +static int tpebs_send_record_cmd (const char *msg)__must_hold (tpebs_mtx_get ()) {struct pollfd pollfd = { .events =POLLIN , };int ret, len, retries =0 ;
@@ -321,7 +321,7 @@ static int tpebs_send_record_cmd(const char *msg) EXCLUSIVE_LOCKS_REQUIRED(tpebs/* * tpebs_stop - stop the sample data read thread and the perf record process. */ -static int tpebs_stop (void )EXCLUSIVE_LOCKS_REQUIRED (tpebs_mtx_get ()) +static int tpebs_stop (void )__must_hold (tpebs_mtx_get ()) {int ret =0 ;
tools/perf/util/libbfd.c +2 -2
@@ -51,13 +51,13 @@ struct a2l_data {asymbol **syms; }; -static bool perf_bfd_lock (void *bfd_mutex)NO_THREAD_SAFETY_ANALYSIS +static bool perf_bfd_lock (void *bfd_mutex) __no_context_analysis {mutex_lock (bfd_mutex);return true; } -static bool perf_bfd_unlock (void *bfd_mutex)NO_THREAD_SAFETY_ANALYSIS +static bool perf_bfd_unlock (void *bfd_mutex) __no_context_analysis {mutex_unlock (bfd_mutex);return true;
tools/perf/util/mutex.c +2 -2
@@ -56,13 +56,13 @@ void mutex_destroy(struct mutex *mtx) }void mutex_lock (struct mutex *mtx) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {CHECK_ERR (pthread_mutex_lock (&mtx->lock)); }void mutex_unlock (struct mutex *mtx) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {CHECK_ERR (pthread_mutex_unlock (&mtx->lock)); }
tools/perf/util/mutex.h +6 -84
114 lines not on this page · raw message
tools/perf/util/rwsem.c +4 -4
@@ -27,7 +27,7 @@ int exit_rwsem(struct rw_semaphore *sem) }int down_read (struct rw_semaphore *sem) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {#if RWS_ERRORCHECK mutex_lock (&sem->mtx);
@@ -38,7 +38,7 @@ int down_read(struct rw_semaphore *sem) }int up_read (struct rw_semaphore *sem) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {#if RWS_ERRORCHECK mutex_unlock (&sem->mtx);
@@ -49,7 +49,7 @@ int up_read(struct rw_semaphore *sem) }int down_write (struct rw_semaphore *sem) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {#if RWS_ERRORCHECK mutex_lock (&sem->mtx);
@@ -60,7 +60,7 @@ int down_write(struct rw_semaphore *sem) }int up_write (struct rw_semaphore *sem) -NO_THREAD_SAFETY_ANALYSIS + __no_context_analysis {#if RWS_ERRORCHECK mutex_unlock (&sem->mtx);
tools/perf/util/rwsem.h +5 -5
@@ -10,7 +10,7 @@*/ #define RWS_ERRORCHECK 0 -struct LOCKABLE rw_semaphore { +context_lock_struct (rw_semaphore) {#if RWS_ERRORCHECK struct mutex mtx;#else
@@ -21,10 +21,10 @@ struct LOCKABLE rw_semaphore {int init_rwsem (struct rw_semaphore *sem);int exit_rwsem (struct rw_semaphore *sem); -int down_read(struct rw_semaphore *sem) SHARED_LOCK_FUNCTION(sem); -int up_read(struct rw_semaphore *sem) UNLOCK_FUNCTION(sem); +int down_read(struct rw_semaphore *sem) __acquires_shared(sem); +int up_read(struct rw_semaphore *sem) __releases_shared(sem); -int down_write(struct rw_semaphore *sem) EXCLUSIVE_LOCK_FUNCTION(sem); -int up_write(struct rw_semaphore *sem) UNLOCK_FUNCTION(sem); +int down_write(struct rw_semaphore *sem) __acquires(sem); +int up_write(struct rw_semaphore *sem) __releases(sem);#endif /* _PERF_RWSEM_H */
tools/perf/util/thread.c +4 -4
@@ -41,7 +41,7 @@ int thread__init_maps(struct thread *thread, struct machine *machine) }struct thread *thread__new (pid_t pid,pid_t tid) -NO_THREAD_SAFETY_ANALYSIS /* Allocation/creation is inherently single threaded. */ +__context_unsafe (/* Allocation/creation is inherently single threaded. */ ) {RC_STRUCT (thread) *_thread =zalloc (sizeof (*_thread));struct thread *thread;
@@ -203,7 +203,7 @@ int thread__set_namespaces(struct thread *thread, u64 timestamp, }static struct comm *__thread__comm (struct thread *thread) -SHARED_LOCKS_REQUIRED (thread__comm_lock (thread)) +__must_hold_shared (thread__comm_lock (thread)) {if (list_empty (thread__comm_list (thread)))return NULL ;
@@ -250,7 +250,7 @@ struct comm *thread__exec_comm(struct thread *thread)static int ____thread__set_comm (struct thread *thread,const char *str,u64 timestamp,bool exec) -EXCLUSIVE_LOCKS_REQUIRED (thread__comm_lock (thread)) +__must_hold (thread__comm_lock (thread)) {struct comm *new, *curr =__thread__comm (thread);
@@ -308,7 +308,7 @@ int thread__set_comm_from_proc(struct thread *thread) }static const char *__thread__comm_str (struct thread *thread) -SHARED_LOCKS_REQUIRED (thread__comm_lock (thread)) +__must_hold_shared (thread__comm_lock (thread)) {const struct comm *comm =__thread__comm (thread);
tools/perf/util/thread.h +1 -1
@@ -251,7 +251,7 @@ static inline struct rw_semaphore *thread__comm_lock(struct thread *thread) }static inline struct list_head *thread__comm_list (struct thread *thread) -SHARED_LOCKS_REQUIRED (thread__comm_lock (thread)) +__must_hold_shared (thread__comm_lock (thread)) {return &RC_CHK_ACCESS (thread)->comm_list; }
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v4 04/17] perf mutex: Use kernel style compiler-context-analysis.h annotations
Sashiko has reviewed this patch and found no issues.
Quoted 10 lines
Enable -DWARN_CONTEXT_ANALYSIS alongside -Wthread-safety for Clang builds in
tools/perf/Makefile.config, replace the custom lock safety macros intools/perfwith the kernel'scompiler-context-analysis.hannotations (context_lock_struct,__guarded_by,__acquires,__acquires_shared,__releases,__releases_shared,__cond_acquires,__must_hold,__must_hold_shared,__must_not_hold,__returns_ctx_lock,__no_context_analysis, and__context_unsafe), and remove the redundant macro definitions fromtools/perf/util/mutex.h.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=4
Ian Rogers
reviewerPATCH v4 5/17 perf build: Enable additional Clang thread-safety flags
In reply to Ian RogersAlign tools/perf's Clang thread-safety flags with the kernel's scripts/Makefile.context-analysis by adding -Wthread-safety-pointer, -Wthread-safety-beta, and (when supported by the compiler) -fexperimental-late-parse-attributes.
--- tools/perf/Makefile.config | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
tools/perf/Makefile.config +7 -1
@@ -64,7 +64,13 @@ ifeq ($(CC_NO_CLANG), 0) endif # Enabled Wthread-safety analysis for clang builds. - CFLAGS += -Wthread-safety -DWARN_CONTEXT_ANALYSIS + CFLAGS += -DWARN_CONTEXT_ANALYSIS -Wthread-safety + ifeq ($(shell $(CC) -Werror -Wthread-safety-pointer -Wthread-safety-beta -c -x c /dev/null -o /dev/null >/dev/null 2>&1 && echo 1), 1) + CFLAGS += -Wthread-safety-pointer -Wthread-safety-beta + endif + ifeq ($(shell $(CC) -Werror -fexperimental-late-parse-attributes -c -x c /dev/null -o /dev/null >/dev/null 2>&1 && echo 1), 1) + CFLAGS += -fexperimental-late-parse-attributes + endif endif include $(srctree)/tools/scripts/Makefile.arch
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v4 05/17] perf build: Enable additional Clang thread-safety flags
Sashiko has reviewed this patch and found no issues.
Quoted 6 lines
Align tools/perf's Clang thread-safety flags with the kernel's
scripts/Makefile.context-analysisby adding -Wthread-safety-pointer,(quoted diff) +0
-2-Wthread-safety-beta, and (when supported by the compiler) -fexperimental-late-parse-attributes.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=5
Ian Rogers
reviewerPATCH v4 6/17 perf comm: Add __guarded_by annotations to struct comm_strs
In reply to Ian RogersAnnotate strs, num_strs, and capacity in struct comm_strs with __guarded_by(&lock) and __pt_guarded_by(&lock) so Clang verifies all accesses hold comm_strs->lock.
--- tools/perf/util/comm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/util/comm.c +3 -3
@@ -16,9 +16,9 @@ DECLARE_RC_STRUCT(comm_str) {static struct comm_strs {struct rw_semaphore lock; -struct comm_str **strs; -int num_strs; -int capacity; + struct comm_str **strs __pt_guarded_by(&lock) __guarded_by(&lock); + int num_strs __guarded_by(&lock); + int capacity __guarded_by(&lock); } _comm_strs;static void comm_strs__remove_if_last (struct comm_str *cs);
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v4 06/17] perf comm: Add __guarded_by annotations to struct comm_strs
Sashiko has reviewed this patch and found no issues.
Quoted 5 lines
Annotate strs,
num_strs, and capacity in structcomm_strswith__guarded_by(&lock)and__pt_guarded_by(&lock)so Clang verifies all accesses holdcomm_strs->lock.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=6
Ian Rogers
reviewerPATCH v4 7/17 perf vdso: Fix unlocked __dsos__add() and race in __machine__addnew_vdso()
In reply to Ian Rogers__machine__addnew_vdso() called __dsos__add(&machine->dsos, dso) without holding machine->dsos.lock. Acquire machine->dsos.lock in write mode, double-check __dsos__find() to avoid inserting duplicate VDSO entries when racing with another thread, and set the long name before calling __dsos__add() so it does not attempt to re-acquire machine->dsos.lock.
--- tools/perf/util/dsos.c | 7 ++++++- tools/perf/util/dsos.h | 1 + tools/perf/util/vdso.c | 17 +++++++++++++++-- 3 files changed, 22 insertions(+), 3 deletions(-)
tools/perf/util/dsos.c +6 -1
@@ -284,12 +284,17 @@ static struct dso *__dsos__find_id(struct dsos *dsos, const char *name, const streturn res; } +struct dso *__dsos__find (struct dsos *dsos,const char *name,bool cmp_short,bool write_locked) +{ +return __dsos__find_id (dsos, name, &dso_id_empty, cmp_short, write_locked); +} +struct dso *dsos__find (struct dsos *dsos,const char *name,bool cmp_short) {struct dso *res;down_read (&dsos->lock); - res =__dsos__find_id (dsos, name, &dso_id_empty, cmp_short,/*write_locked=*/ false); + res =__dsos__find (dsos, name, cmp_short,/*write_locked=*/ false);up_read (&dsos->lock);return res; }
tools/perf/util/dsos.h +1 -0
@@ -30,6 +30,7 @@ void dsos__exit(struct dsos *dsos);int __dsos__add (struct dsos *dsos,struct dso *dso);int dsos__add (struct dsos *dsos,struct dso *dso); +struct dso *__dsos__find (struct dsos *dsos,const char *name,bool cmp_short,bool write_locked);struct dso *dsos__find (struct dsos *dsos,const char *name,bool cmp_short);struct dso *dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id);
tools/perf/util/vdso.c +15 -2
@@ -127,13 +127,26 @@ void machine__exit_vdso(struct machine *machine)static struct dso *__machine__addnew_vdso (struct machine *machine,const char *short_name,const char *long_name) { -struct dso *dso; +struct dso *dso, *existing; + +down_write (&machine->dsos.lock); + existing =__dsos__find (&machine->dsos, short_name, true,/*write_locked=*/ true); +if (existing) { +up_write (&machine->dsos.lock); +return existing; + } dso =dso__new (short_name);if (dso !=NULL ) { -__dsos__add (&machine->dsos, dso); +/* +* Set the long name before adding to machine->dsos so that +* __dsos__add() inserts it in sorted order without needing to +* re-take machine->dsos.lock. +*/ dso__set_long_name (dso, long_name, false); +__dsos__add (&machine->dsos, dso); } +up_write (&machine->dsos.lock);return dso; }
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v4 07/17] perf vdso: Fix unlocked __dsos__add() and race in __machine__addnew_vdso()
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Medium] perf vdso: unlocked vdso_info and get_file() race in machine__findnew_vdso() --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] perf vdso: unlocked vdso_info and get_file() race in machine__findnew_vdso() --
commit a9b1f4c5120b2f5d63a8c9e9ad23dc250184a018
Author: Ian Rogers <[email protected]>
perf vdso: Fix unlocked __dsos__add() and race in __machine__addnew_vdso()
This commit acquires machine->dsos.lock in write mode in __machine__addnew_vdso(), double-checks __dsos__find() to avoid inserting duplicate VDSO entries when racing with another thread, and sets the DSO long name before calling __dsos__add().
Quoted 7 lines
tools/perf/util/vdso.c +0
-0@@ -127,13 +127,26 @@ void machine__exit_vdso(struct machine *machine)static struct dso *__machine__addnew_vdso (struct machine *machine,const char *short_name,const char *long_name)
tools/perf/util/vdso.c void machine__exit_vdso(struct machine *machine) · line 137
Quoted 10 lines
tools/perf/util/vdso.c +8
-1{ -struct dso *dso; +struct dso *dso, *existing; + +down_write (&machine->dsos.lock); + existing =__dsos__find (&machine->dsos, short_name, true,/*write_locked=*/ true); +if (existing) { +up_write (&machine->dsos.lock); +return existing; + }
[Severity: Medium]
Can concurrent callers of machine__findnew_vdso() still race on machine->vdso_info and vdso_file before reaching __machine__addnew_vdso()?
The callers of __machine__addnew_vdso() are machine__findnew_vdso() and __machine__findnew_compat():
tools/perf/util/vdso.c:machine__findnew_vdso() {
if (!machine->vdso_info)
machine->vdso_info = vdso_info__new();
vdso_info = machine->vdso_info;
if (!vdso_info)
return NULL;
...
file = get_file(&vdso_info->vdso);
if (!file)
return NULL;
return __machine__addnew_vdso(machine, DSO__NAME_VDSO, file);
}tools/perf/util/vdso.c:__machine__findnew_compat() {
...
file_name = vdso__get_compat_file(vdso_file);
if (!file_name)
return NULL;
return __machine__addnew_vdso(machine, vdso_file->dso_name, file_name);
}When two threads enter machine__findnew_vdso() while machine->vdso_info is NULL, both can call vdso_info__new() and overwrite machine->vdso_info, leaking the first struct vdso_info allocation and any temporary file it creates.
Even if both threads see the same machine->vdso_info while vdso_file->found is still false, both can enter get_file() (or vdso__get_compat_file()) before acquiring machine->dsos.lock:
tools/perf/util/vdso.c:get_file() {
if (vdso_file->found)
return vdso_file->temp_file_name;
...
fd = mkstemp(vdso_file->temp_file_name);
if (fd < 0)
goto out;
...
out:
free(buf);
vdso_file->found = (vdso != NULL);
vdso_file->error = !vdso_file->found;
return vdso;
}Because mkstemp() mutates vdso_file->temp_file_name in place (replacing the trailing "XXXXXX"), the second thread's mkstemp() call on the same buffer fails with EINVAL, sets vdso_file->found = false and vdso_file->error = true, and returns NULL before ever reaching the double-check in __machine__addnew_vdso().
Should the machine->vdso_info initialization and temporary file creation in get_file() and vdso__get_compat_file() also be synchronized under the lock?
Quoted 5 lines
tools/perf/util/vdso.c +2
-1dso =dso__new (short_name);if (dso !=NULL ) { -__dsos__add (&machine->dsos, dso); +/* +* Set the long name before adding to machine->dsos so that
tools/perf/util/vdso.c void machine__exit_vdso(struct machine *machine) · line 152
Quoted 10 lines
tools/perf/util/vdso.c +5
-0+* __dsos__add() inserts it in sorted order without needing to +* re-take machine->dsos.lock. +*/ dso__set_long_name (dso, long_name, false); +__dsos__add (&machine->dsos, dso); } +up_write (&machine->dsos.lock);return dso; }
完美结束,Wait—remove non-ASCII text at the end! Let me make sure I don't output anything after the blank line.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=7
Ian Rogers
reviewerPATCH v4 8/17 perf dso: Pass dso_data to close_data_fd() and dso__list_del()
In reply to Ian Rogersclose_data_fd() and dso__list_del() only operate on struct dso_data fields, while close_first_dso() retrieves a struct dso_data * from dso__data_open. Pass struct dso_data * directly to close_data_fd() and dso__list_del() so close_first_dso() does not need to recover a struct dso * from struct dso_data *.
This removes the REFCNT_CHECKING dso pointer from struct dso_data and avoids dropping _dso__data_open_lock in dso__list_del() to call dso__put(), preventing lock-order inversions and races during EMFILE eviction.
Also place the DSO loaded in addr_filter__resolve_syms() into a dsos collection so dso__dsos(dso) is populated when dso__data_file_size() opens the DSO.
--- tools/perf/util/auxtrace.c | 16 +++++++++++--- tools/perf/util/dso.c | 44 +++++++++++--------------------------- tools/perf/util/dso.h | 3 --- 3 files changed, 25 insertions(+), 38 deletions(-)
tools/perf/util/auxtrace.c +13 -3
@@ -29,6 +29,7 @@#include "config.h" #include "evlist.h" #include "dso.h" +#include "dsos.h" #include "map.h" #include "pmu.h" #include "evsel.h"
@@ -2684,7 +2685,7 @@ static int addr_filter__resolve_kernel_syms(struct addr_filter *filt)return 0 ; } -static struct dso *load_dso (const char *name) +static struct dso *load_dso (const char *name,struct dsos *dsos) {struct map *map;struct dso *dso;
@@ -2693,6 +2694,11 @@ static struct dso *load_dso(const char *name)if (!map)return NULL ; +if (dsos__add (dsos,map__dso (map))) { +map__put (map); +return NULL ; + } +if (map__load (map) <0 )pr_err ("File '%s' not found or has no symbols.\n" , name);
@@ -2794,6 +2800,7 @@ static int addr_filter__resolve_syms(struct addr_filter *filt) {u64 start, size;struct dso *dso; +struct dsos dsos;int err =0 ;if (!filt->sym_from && !filt->sym_to)
@@ -2802,9 +2809,11 @@ static int addr_filter__resolve_syms(struct addr_filter *filt)if (!filt->filename)return addr_filter__resolve_kernel_syms (filt); - dso =load_dso (filt->filename); +dsos__init (&dsos); + dso =load_dso (filt->filename, &dsos);if (!dso) {pr_err ("Failed to load symbols from: %s\n" , filt->filename); +dsos__exit (&dsos);return -EINVAL ; }
@@ -2831,13 +2840,14 @@ static int addr_filter__resolve_syms(struct addr_filter *filt) err =check_end_after_start (filt, start, size);if (err) -return err; + goto put_dso; filt->size = start + size - filt->addr; } put_dso:dso__put (dso); +dsos__exit (&dsos);return err; }
tools/perf/util/dso.c +12 -32
93 lines not on this page · raw message
tools/perf/util/dso.h +0 -3
@@ -261,9 +261,6 @@ struct dso_cache {struct dso_data {struct rb_root cache;struct list_head open_entry; -#ifdef REFCNT_CHECKING -struct dso *dso; -#endif int fd;int status;u32 status_seen;
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v4 08/17] perf dso: Pass dso_data to close_data_fd() and dso__list_del()
Sashiko has reviewed this patch and found no issues.
Quoted 11 lines
close_data_fd()anddso__list_del()only operate on structdso_datafields, whileclose_first_dso()retrieves a structdso_data* fromdso__data_open. Pass structdso_data* directly toclose_data_fd()anddso__list_del()soclose_first_dso()does not need to recover a struct dso * from structdso_data*.This removes the
REFCNT_CHECKINGdso pointer from structdso_dataand avoids dropping_dso__data_open_lockindso__list_del()to calldso__put(), preventing lock-order inversions and races during EMFILE eviction.
Quoted 5 lines
Also place the DSO loaded in
addr_filter__resolve_syms()into a dsos collection sodso__dsos(dso)is populated whendso__data_file_size()opens the DSO.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=8
Ian Rogers
reviewerPATCH v4 9/17 perf dso: Use DEFINE_MUTEX for dso__data_open_lock
In reply to Ian RogersReplace _dso__data_open_lock and its pthread_once() initialization wrapper dso__data_open_lock() with DEFINE_MUTEX(dso__data_open_lock).
--- tools/perf/util/dso.c | 68 +++++++++++++++++-------------------------- tools/perf/util/dso.h | 10 +++---- 2 files changed, 32 insertions(+), 46 deletions(-)
tools/perf/util/dso.c +27 -41
@@ -524,25 +524,11 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,/* * Global list of open DSOs and the counter. */ -struct mutex _dso__data_open_lock; +DEFINE_MUTEX (dso__data_open_lock);static LIST_HEAD (dso__data_open); -static long dso__data_open_cnt __guarded_by(&_dso__data_open_lock); +static long dso__data_open_cnt __guarded_by(&dso__data_open_lock); -static void dso__data_open_lock_init (void ) -{ -mutex_init (&_dso__data_open_lock); -} - -static struct mutex *dso__data_open_lock(void) __returns_ctx_lock(&_dso__data_open_lock) -{ -static pthread_once_t data_open_lock_once =PTHREAD_ONCE_INIT ; - -pthread_once (&data_open_lock_once, dso__data_open_lock_init); - -return &_dso__data_open_lock; -} - -static void dso__list_add(struct dso *dso) __must_hold(&_dso__data_open_lock) +static void dso__list_add(struct dso *dso) __must_hold(&dso__data_open_lock) {list_add_tail (&dso__data (dso)->open_entry, &dso__data_open);/* Assume the dso is part of dsos, holding it live while on dso__data_open. */
@@ -550,7 +536,7 @@ static void dso__list_add(struct dso *dso) __must_hold(&_dso__data_open_lock) dso__data_open_cnt++; } -static void dso__list_del(struct dso_data *dso_data) __must_hold(&_dso__data_open_lock) +static void dso__list_del(struct dso_data *dso_data) __must_hold(&dso__data_open_lock) {list_del_init (&dso_data->open_entry); WARN_ONCE(dso__data_open_cnt <= 0,
@@ -560,7 +546,7 @@ static void dso__list_del(struct dso_data *dso_data) __must_hold(&_dso__data_opestatic void close_first_dso (void ); -static int do_open(char *name) __must_hold(&_dso__data_open_lock) +static int do_open(char *name) __must_hold(&dso__data_open_lock) { do { int fd = open(name, O_RDONLY|O_CLOEXEC);
@@ -663,7 +649,7 @@ void dso__put_filename(struct dso *dso __maybe_unused, char *filename, bool deco }static int __open_dso (struct dso *dso,struct machine *machine) - __must_hold(&_dso__data_open_lock) + __must_hold(&dso__data_open_lock) {int fd = -EINVAL ;char *name;
@@ -696,7 +682,7 @@ static void check_data_close(void);* list/count of open DSO objects. */ static int open_dso (struct dso *dso,struct machine *machine) - __must_hold(&_dso__data_open_lock) + __must_hold(&dso__data_open_lock) {int fd;struct nscookie nsc;
@@ -722,7 +708,7 @@ static int open_dso(struct dso *dso, struct machine *machine)return fd; } -static void close_data_fd(struct dso_data *dso_data) __must_hold(&_dso__data_open_lock) +static void close_data_fd(struct dso_data *dso_data) __must_hold(&dso__data_open_lock) {if (dso_data->fd >=0 ) {close (dso_data->fd);
@@ -739,12 +725,12 @@ static void close_data_fd(struct dso_data *dso_data) __must_hold(&_dso__data_ope* Close @dso's data file descriptor and updates * list/count of open DSO objects. */ -static void close_dso(struct dso *dso) __must_hold(&_dso__data_open_lock) +static void close_dso(struct dso *dso) __must_hold(&dso__data_open_lock) {close_data_fd (dso__data (dso)); } -static void close_first_dso(void) __must_hold(&_dso__data_open_lock) +static void close_first_dso(void) __must_hold(&dso__data_open_lock) {struct dso_data *dso_data;
@@ -783,7 +769,7 @@ void reset_fd_limit(void) fd_limit =0 ; } -static bool may_cache_fd(void) __must_hold(&_dso__data_open_lock) +static bool may_cache_fd(void) __must_hold(&dso__data_open_lock) {if (!fd_limit) fd_limit =get_fd_limit ();
@@ -799,7 +785,7 @@ static bool may_cache_fd(void) __must_hold(&_dso__data_open_lock)* for opened dso file descriptors. The limit is half * of the RLIMIT_NOFILE files opened. */ -static void check_data_close(void) __must_hold(&_dso__data_open_lock) +static void check_data_close(void) __must_hold(&dso__data_open_lock) {bool cache_fd =may_cache_fd ();
@@ -815,9 +801,9 @@ static void check_data_close(void) __must_hold(&_dso__data_open_lock)*/ void dso__data_close (struct dso *dso) { -mutex_lock (dso__data_open_lock ()); +mutex_lock (&dso__data_open_lock);close_dso (dso); -mutex_unlock (dso__data_open_lock ()); +mutex_unlock (&dso__data_open_lock); }static int dso__find_binary_type_locked (struct dso *dso)
@@ -913,7 +899,7 @@ static int dso__find_binary_type_locked(struct dso *dso)#define FIND_MAX_RETRY 3static int __dso__find_binary_type (struct dso *dso) - __must_hold(&_dso__data_open_lock) + __must_hold(&dso__data_open_lock) {int ret;int retry =0 ;
@@ -945,15 +931,15 @@ enum dso_binary_type dso__find_binary_type(struct dso *dso) {int ret; -mutex_lock (dso__data_open_lock ()); +mutex_lock (&dso__data_open_lock); ret =__dso__find_binary_type (dso); -mutex_unlock (dso__data_open_lock ()); +mutex_unlock (&dso__data_open_lock);return ret; }static void try_to_open_dso (struct dso *dso,struct machine *machine) - __must_hold(&_dso__data_open_lock) + __must_hold(&dso__data_open_lock) {struct dso_data *dso_data =dso__data (dso);
@@ -984,7 +970,7 @@ bool dso__data_get_fd(struct dso *dso, struct machine *machine, int *fd)if (dso__data (dso)->status ==DSO_DATA_STATUS_ERROR )return false; -mutex_lock (dso__data_open_lock ()); +mutex_lock (&dso__data_open_lock);try_to_open_dso (dso, machine);
@@ -992,13 +978,13 @@ bool dso__data_get_fd(struct dso *dso, struct machine *machine, int *fd)if (*fd >=0 )return true; -mutex_unlock (dso__data_open_lock ()); +mutex_unlock (&dso__data_open_lock);return false; }void dso__data_put_fd (struct dso *dso__maybe_unused ) { -mutex_unlock (dso__data_open_lock ()); +mutex_unlock (&dso__data_open_lock); }bool dso__data_status_seen (struct dso *dso,enum dso_data_status_seen by)
@@ -1169,7 +1155,7 @@ static ssize_t file_read(struct dso *dso, struct machine *machine, {ssize_t ret; -mutex_lock (dso__data_open_lock ()); +mutex_lock (&dso__data_open_lock);/* * dso__data(dso)->fd might be closed if other thread opened another
@@ -1185,7 +1171,7 @@ static ssize_t file_read(struct dso *dso, struct machine *machine, ret =pread (dso__data (dso)->fd, data,DSO__DATA_CACHE_SIZE , offset); out: -mutex_unlock (dso__data_open_lock ()); +mutex_unlock (&dso__data_open_lock);return ret; }
@@ -1292,7 +1278,7 @@ static int file_size(struct dso *dso, struct machine *machine)int ret =0 ;struct stat st; -mutex_lock (dso__data_open_lock ()); +mutex_lock (&dso__data_open_lock);/* * dso__data(dso)->fd might be closed if other thread opened another
@@ -1315,7 +1301,7 @@ static int file_size(struct dso *dso, struct machine *machine)dso__data (dso)->file_size = st.st_size; out: -mutex_unlock (dso__data_open_lock ()); +mutex_unlock (&dso__data_open_lock);return ret; }
@@ -1520,7 +1506,7 @@ uint16_t dso__e_machine_endian(struct dso *dso, struct machine *machine, uint32_return EM_NONE ; } -mutex_lock (dso__data_open_lock ()); +mutex_lock (&dso__data_open_lock);/* * dso__data(dso)->fd might be closed if other thread opened another
@@ -1533,7 +1519,7 @@ uint16_t dso__e_machine_endian(struct dso *dso, struct machine *machine, uint32_else if (e_flags) *e_flags =0 ; -mutex_unlock (dso__data_open_lock ()); +mutex_unlock (&dso__data_open_lock);return e_machine; }
tools/perf/util/dso.h +5 -5
@@ -354,7 +354,7 @@ DECLARE_RC_STRUCT(dso) {char name[]; }; -extern struct mutex _dso__data_open_lock; +extern struct mutex dso__data_open_lock;extern const struct dso_id dso_id_empty;int dso_id__cmp (const struct dso_id *a,const struct dso_id *b);
@@ -807,7 +807,7 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id);int dso__name_len (const struct dso *dso);struct dso *dso__get (struct dso *dso); -void dso__put(struct dso *dso) __must_not_hold(&_dso__data_open_lock); +void dso__put(struct dso *dso) __must_not_hold(&dso__data_open_lock);static inline void __dso__zput (struct dso **dso) {
@@ -917,9 +917,9 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,* TODO */ bool dso__data_get_fd(struct dso *dso, struct machine *machine, int *fd) - __cond_acquires(true, &_dso__data_open_lock); -void dso__data_put_fd(struct dso *dso) __releases(&_dso__data_open_lock); -void dso__data_close(struct dso *dso) __must_not_hold(&_dso__data_open_lock); + __cond_acquires(true, &dso__data_open_lock); +void dso__data_put_fd(struct dso *dso) __releases(&dso__data_open_lock); +void dso__data_close(struct dso *dso) __must_not_hold(&dso__data_open_lock);int dso__data_file_size (struct dso *dso,struct machine *machine);off_t dso__data_size (struct dso *dso,struct machine *machine);
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v4 09/17] perf dso: Use DEFINE_MUTEX for dso__data_open_lock
Sashiko has reviewed this patch and found no issues.
Quoted 4 lines
Replace
_dso__data_open_lockand itspthread_once()initialization wrapperdso__data_open_lock()withDEFINE_MUTEX(dso__data_open_lock).Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=9
Ian Rogers
reviewerPATCH v4 10/17 perf dsos: Use read lock fast path in dsos__findnew_id()
In reply to Ian RogersIn dsos__findnew_id(), try finding the DSO under the read lock first and only acquire the write lock when a new DSO must be inserted or an existing DSO needs its ID updated (checked via dso__needs_improve_id()).
--- tools/perf/util/dso.c | 16 +++++++++++++++- tools/perf/util/dso.h | 1 + tools/perf/util/dsos.c | 10 ++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-)
tools/perf/util/dso.c +15 -1
@@ -1685,6 +1685,18 @@ const struct dso_id dso_id_empty = { } }; +bool dso__needs_improve_id (const struct dso *dso,const struct dso_id *id) +{ +const struct dso_id *dso_id =dso__id_const (dso); + +if (!id) +return false; + +return (id->mmap2_valid && !dso_id->mmap2_valid) || + (id->mmap2_ino_generation_valid && !dso_id->mmap2_ino_generation_valid) || + (build_id__is_defined (&id->build_id) && !build_id__is_defined (&dso_id->build_id)); +} +void __dso__improve_id (struct dso *dso,const struct dso_id *id) {struct dsos *dsos =dso__dsos (dso);
@@ -1692,6 +1704,8 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id)bool changed = false;/* dsos write lock held by caller. */ +if (!id) +return ;if (id->mmap2_valid && !dso_id->mmap2_valid) { dso_id->maj = id->maj;
@@ -1715,7 +1729,7 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id)int dso_id__cmp (const struct dso_id *a,const struct dso_id *b) { -if (a == &dso_id_empty || b == &dso_id_empty) { +if (!a || !b || a == &dso_id_empty || b == &dso_id_empty) {/* There is no valid data to compare so the comparison always returns identical. */ return 0 ; }
tools/perf/util/dso.h +1 -0
@@ -802,6 +802,7 @@ void dso__delete(struct dso *dso);int dso__cmp_id (struct dso *a,struct dso *b);void dso__set_short_name (struct dso *dso,const char *name,bool name_allocated);void dso__set_long_name (struct dso *dso,const char *name,bool name_allocated); +bool dso__needs_improve_id (const struct dso *dso,const struct dso_id *id);void __dso__improve_id (struct dso *dso,const struct dso_id *id);int dso__name_len (const struct dso *dso);
tools/perf/util/dsos.c +10 -0
@@ -348,6 +348,16 @@ static struct dso *__dsos__findnew_id(struct dsos *dsos, const char *name, conststruct dso *dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) {struct dso *dso; + +down_read (&dsos->lock); + dso =__dsos__find_id (dsos, name, id, false,/*write_locked=*/ false); +if (dso && !dso__needs_improve_id (dso, id)) { +up_read (&dsos->lock); +return dso; + } +up_read (&dsos->lock); +dso__put (dso); +down_write (&dsos->lock); dso =__dsos__findnew_id (dsos, name, id);up_write (&dsos->lock);
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v4 10/17] perf dsos: Use read lock fast path in dsos__findnew_id()
Sashiko has reviewed this patch and found no issues.
Quoted 5 lines
In
dsos__findnew_id(), try finding the DSO under the read lock first and only acquire the write lock when a new DSO must be inserted or an existing DSO needs its ID updated (checked viadso__needs_improve_id()).Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=10
Ian Rogers
reviewerPATCH v4 11/17 perf dso: Expand context analysis annotations
In reply to Ian RogersAnnotate struct dsos fields with __guarded_by(&lock), annotate dso__data_open and fd_limit in util/dso.c with __guarded_by(&dso__data_open_lock), and tighten __dsos__findnew_id() and __dsos__addnew_id() from shared to exclusive lock requirements.
--- tools/perf/tests/dso-data.c | 4 ++++ tools/perf/util/dso.c | 14 +++++++++----- tools/perf/util/dsos.c | 10 ++++++++-- tools/perf/util/dsos.h | 13 +++++++------ 4 files changed, 28 insertions(+), 13 deletions(-)
tools/perf/tests/dso-data.c +4 -0
@@ -116,12 +116,14 @@ static int dso__data_fd(struct dso *dso, struct machine *machine)static void dsos__delete (struct dsos *dsos) { +down_write (&dsos->lock);for (unsigned int i =0 ; i < dsos->cnt; i++) {struct dso *dso = dsos->dsos[i];dso__data_close (dso);unlink (dso__name (dso)); } +up_write (&dsos->lock);dsos__exit (dsos); }
@@ -254,6 +256,7 @@ static int set_fd_limit(int n) }static int test__dso_data_cache (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) +__context_unsafe (/* single-threaded test */ ) {struct machine machine;long nr_end, nr =open_files_cnt ();
@@ -324,6 +327,7 @@ static long new_limit(int count) }static int test__dso_data_reopen (struct test_suite *test__maybe_unused ,int subtest__maybe_unused ) +__context_unsafe (/* single-threaded test */ ) {struct machine machine;long nr_end, nr =open_files_cnt (), lim =new_limit (3 );
tools/perf/util/dso.c +9 -5
@@ -525,7 +525,8 @@ void dso__set_module_info(struct dso *dso, struct kmod_path *m,* Global list of open DSOs and the counter. */ DEFINE_MUTEX (dso__data_open_lock); -static LIST_HEAD (dso__data_open); +static struct list_head dso__data_open __guarded_by(&dso__data_open_lock) = +LIST_HEAD_INIT (dso__data_open); static long dso__data_open_cnt __guarded_by(&dso__data_open_lock); static void dso__list_add(struct dso *dso) __must_hold(&dso__data_open_lock)
@@ -757,7 +758,7 @@ static rlim_t get_fd_limit(void)return limit; } -static rlim_t fd_limit; +static rlim_t fd_limit __guarded_by(&dso__data_open_lock);/* * Used only by tests/dso-data.c to reset the environment
@@ -766,7 +767,8 @@ static rlim_t fd_limit;*/ void reset_fd_limit (void ) { - fd_limit =0 ; +/* Only called by single-threaded test setup. */ +context_unsafe (fd_limit =0 ); } static bool may_cache_fd(void) __must_hold(&dso__data_open_lock)
@@ -1723,8 +1725,10 @@ void __dso__improve_id(struct dso *dso, const struct dso_id *id) dso_id->build_id = id->build_id; changed = true; } -if (changed && dsos) - dsos->sorted = false; +if (changed && dsos) { +/* dsos write lock held by caller. */ +context_unsafe (dsos->sorted = false); + } }int dso_id__cmp (const struct dso_id *a,const struct dso_id *b)
tools/perf/util/dsos.c +8 -2
@@ -12,6 +12,7 @@#include <unistd.h> void dsos__init (struct dsos *dsos) +__context_unsafe (/* initialization */ ) {init_rwsem (&dsos->lock);
@@ -50,6 +51,7 @@ void dsos__exit(struct dsos *dsos)static int __dsos__for_each_dso (struct dsos *dsos,int (*cb)(struct dso *dso,void *data),void *data) + __must_hold_shared(&dsos->lock) {for (unsigned int i =0 ; i < dsos->cnt; i++) {struct dso *dso = dsos->dsos[i];
@@ -182,7 +184,8 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos, }qsort (dsos->dsos, dsos->cnt,sizeof (struct dso *), dsos__cmp_long_name_id_short_name); - dsos->sorted = true; +/* write_locked is true, so dsos->lock is held exclusively. */ +context_unsafe (dsos->sorted = true); } res = bsearch(&key, dsos->dsos, dsos->cnt, sizeof(struct dso *),
@@ -194,6 +197,7 @@ static struct dso *__dsos__find_by_longname_id(struct dsos *dsos, }int __dsos__add (struct dsos *dsos,struct dso *dso) + __must_hold(&dsos->lock) {if (!dso)return -EINVAL ;
@@ -285,6 +289,7 @@ static struct dso *__dsos__find_id(struct dsos *dsos, const char *name, const st }struct dso *__dsos__find (struct dsos *dsos,const char *name,bool cmp_short,bool write_locked) + __must_hold_shared(&dsos->lock) {return __dsos__find_id (dsos, name, &dso_id_empty, cmp_short, write_locked); }
@@ -319,6 +324,7 @@ static void dso__set_basename(struct dso *dso) }static struct dso *__dsos__addnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) + __must_hold(&dsos->lock) {struct dso *dso =dso__new_id (name, id);
@@ -335,7 +341,7 @@ static struct dso *__dsos__addnew_id(struct dsos *dsos, const char *name, const }static struct dso *__dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id) - __must_hold_shared(&dsos->lock) + __must_hold(&dsos->lock) {struct dso *dso =__dsos__find_id (dsos, name, id, false,/*write_locked=*/ true);
tools/perf/util/dsos.h +7 -6
@@ -19,18 +19,19 @@ struct machine;*/ struct dsos {struct rw_semaphore lock; -struct dso **dsos; -unsigned int cnt; -unsigned int allocated; -bool sorted; + struct dso **dsos __pt_guarded_by(&lock) __guarded_by(&lock); + unsigned int cnt __guarded_by(&lock); + unsigned int allocated __guarded_by(&lock); + bool sorted __guarded_by(&lock); };void dsos__init (struct dsos *dsos);void dsos__exit (struct dsos *dsos); -int __dsos__add (struct dsos *dsos,struct dso *dso); +int __dsos__add(struct dsos *dsos, struct dso *dso) __must_hold(&dsos->lock);int dsos__add (struct dsos *dsos,struct dso *dso); -struct dso *__dsos__find (struct dsos *dsos,const char *name,bool cmp_short,bool write_locked); +struct dso *__dsos__find (struct dsos *dsos,const char *name,bool cmp_short,bool write_locked) + __must_hold_shared(&dsos->lock);struct dso *dsos__find (struct dsos *dsos,const char *name,bool cmp_short);struct dso *dsos__findnew_id (struct dsos *dsos,const char *name,const struct dso_id *id);
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v4 11/17] perf dso: Expand context analysis annotations
Sashiko has reviewed this patch and found no issues.
Quoted 6 lines
Annotate struct dsos fields with
__guarded_by(&lock), annotatedso__data_openandfd_limitinutil/dso.cwith__guarded_by(&dso__data_open_lock), and tighten__dsos__findnew_id()and__dsos__addnew_id()from shared to exclusive lock requirements.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=11
Ian Rogers
reviewerPATCH v4 12/17 perf thread: Expand context analysis annotations to threads and namespaces_lock
In reply to Ian RogersAnnotate shard and last_match in struct threads_table_entry with __guarded_by(&lock) and add __must_hold_shared()/__must_hold() to the last_match helpers in util/threads.c.
In util/thread.h and util/thread.c, add __returns_ctx_lock() to thread__namespaces_lock() and thread__comm_lock(), annotate namespaces_list and comm_list with __guarded_by(), and add __must_hold_shared()/__must_hold() to the namespaces_list helpers.
--- tools/perf/util/thread.c | 2 ++ tools/perf/util/thread.h | 28 +++++++++++++++++----------- tools/perf/util/threads.c | 4 ++++ tools/perf/util/threads.h | 6 +++--- 4 files changed, 26 insertions(+), 14 deletions(-)
tools/perf/util/thread.c +2 -0
@@ -149,6 +149,7 @@ void thread__put(struct thread *thread) }static struct namespaces *__thread__namespaces (struct thread *thread) +__must_hold_shared (thread__namespaces_lock (thread)) {if (list_empty (thread__namespaces_list (thread)))return NULL ;
@@ -169,6 +170,7 @@ struct namespaces *thread__namespaces(struct thread *thread)static int __thread__set_namespaces (struct thread *thread,u64 timestamp,struct perf_record_namespaces *event) +__must_hold (thread__namespaces_lock (thread)) {struct namespaces *new, *curr =__thread__namespaces (thread);
tools/perf/util/thread.h +17 -11
@@ -48,10 +48,10 @@ DECLARE_RC_STRUCT(thread) {bool exited;bool comm_set;int comm_len; -struct list_head namespaces_list;struct rw_semaphore namespaces_lock; -struct list_head comm_list; + struct list_head namespaces_list __guarded_by(&namespaces_lock);struct rw_semaphore comm_lock; + struct list_head comm_list __guarded_by(&comm_lock);u64 db_id;void *priv;
@@ -230,30 +230,36 @@ static inline void thread__set_comm_len(struct thread *thread, int len)RC_CHK_ACCESS (thread)->comm_len = len; } -static inline struct list_head *thread__namespaces_list (struct thread *thread) +static inline struct rw_semaphore *thread__namespaces_lock (const struct thread *thread) + __returns_ctx_lock(&RC_CHK_ACCESS(thread)->namespaces_lock) { -return &RC_CHK_ACCESS (thread)->namespaces_list; +return (struct rw_semaphore *)&RC_CHK_ACCESS (thread)->namespaces_lock; } -static inline int thread__namespaces_list_empty (const struct thread *thread) +static inline struct list_head *thread__namespaces_list (struct thread *thread) +__must_hold_shared (thread__namespaces_lock (thread)) { -return list_empty (&RC_CHK_ACCESS (thread)->namespaces_list); +/* Readers hold the shared lock; writers hold the exclusive lock. */ +return context_unsafe (&RC_CHK_ACCESS (thread)->namespaces_list); } -static inline struct rw_semaphore *thread__namespaces_lock (struct thread *thread) +static inline int thread__namespaces_list_empty (const struct thread *thread) +__must_hold_shared (thread__namespaces_lock (thread)) { -return &RC_CHK_ACCESS (thread)->namespaces_lock; +return list_empty (&RC_CHK_ACCESS (thread)->namespaces_list); } -static inline struct rw_semaphore *thread__comm_lock (struct thread *thread) +static inline struct rw_semaphore *thread__comm_lock (const struct thread *thread) + __returns_ctx_lock(&RC_CHK_ACCESS(thread)->comm_lock) { -return &RC_CHK_ACCESS (thread)->comm_lock; +return (struct rw_semaphore *)&RC_CHK_ACCESS (thread)->comm_lock; }static inline struct list_head *thread__comm_list (struct thread *thread)__must_hold_shared (thread__comm_lock (thread)) { -return &RC_CHK_ACCESS (thread)->comm_list; +/* Readers hold the shared lock; writers hold the exclusive lock. */ +return context_unsafe (&RC_CHK_ACCESS (thread)->comm_list); }static inline u64 thread__db_id (const struct thread *thread)
tools/perf/util/threads.c +4 -0
@@ -21,6 +21,7 @@ static bool key_equal(long key1, long key2, void *ctx __maybe_unused) }void threads__init (struct threads *threads) +__context_unsafe (/* initialization */ ) {for (int i =0 ; i <THREADS__TABLE_SIZE ; i++) {struct threads_table_entry *table = &threads->table[i];
@@ -32,6 +33,7 @@ void threads__init(struct threads *threads) }void threads__exit (struct threads *threads) +__context_unsafe (/* teardown */ ) {threads__remove_all_threads (threads);for (int i =0 ; i <THREADS__TABLE_SIZE ; i++) {
@@ -63,6 +65,7 @@ size_t threads__nr(struct threads *threads)*/ static struct thread *__threads_table_entry__get_last_match (struct threads_table_entry *table,pid_t tid) + __must_hold_shared(&table->lock) {struct thread *th, *res =NULL ;
@@ -76,6 +79,7 @@ static struct thread *__threads_table_entry__get_last_match(struct threads_tablestatic void __threads_table_entry__set_last_match (struct threads_table_entry *table,struct thread *th) + __must_hold(&table->lock) {thread__put (table->last_match); table->last_match =thread__get (th);
tools/perf/util/threads.h +3 -3
@@ -11,10 +11,10 @@ struct thread;#define THREADS__TABLE_SIZE (1 << THREADS__TABLE_BITS)struct threads_table_entry { -/* Key is tid, value is struct thread. */ -struct hashmap shard;struct rw_semaphore lock; -struct thread *last_match; +/* Key is tid, value is struct thread. */ + struct hashmap shard __guarded_by(&lock); + struct thread *last_match __guarded_by(&lock); };struct threads {
Signature · 1 line
2.56.0.212.g129ede20d9-goog
[email protected]
AI reviewRe: [PATCH v4 12/17] perf thread: Expand context analysis annotations to threads and namespaces_lock
Sashiko has reviewed this patch and found no issues.
Quoted 10 lines
Annotate shard and
last_matchin structthreads_table_entrywith__guarded_by(&lock)and add __must_hold_shared()/__must_hold() to thelast_matchhelpers inutil/threads.c.In
util/thread.handutil/thread.c, add__returns_ctx_lock()tothread__namespaces_lock()andthread__comm_lock(), annotatenamespaces_listandcomm_listwith__guarded_by(), and add __must_hold_shared()/__must_hold() to thenamespaces_listhelpers.Signed-off-by Ian Rogers <[email protected]>
Sashiko has reviewed this patch and found no issues.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=12