Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf mutex: Add thread safety annotations

Add thread safety annotations to struct mutex so that when compiled with
clang's -Wthread-safety warnings are generated for erroneous lock
patterns. NO_THREAD_SAFETY_ANALYSIS is needed for
mutex_lock/mutex_unlock as the analysis doesn't under pthread calls.

Signed-off-by: Ian Rogers <irogers@google.com>
Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Truong <alexandre.truong@arm.com>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andres Freund <andres@anarazel.de>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: André Almeida <andrealmeid@igalia.com>
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Colin Ian King <colin.king@intel.com>
Cc: Dario Petrillo <dario.pk1@gmail.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Dave Marchevsky <davemarchevsky@fb.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Fangrui Song <maskray@google.com>
Cc: Hewenliang <hewenliang4@huawei.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jason Wang <wangborong@cdjrlc.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kim Phillips <kim.phillips@amd.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Martin Liška <mliska@suse.cz>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Pavithra Gurushankar <gpavithrasha@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Quentin Monnet <quentin@isovalent.com>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Remi Bernon <rbernon@codeweavers.com>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Song Liu <songliubraving@fb.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Tom Rix <trix@redhat.com>
Cc: Weiguo Li <liwg06@foxmail.com>
Cc: Wenyu Liu <liuwenyu7@huawei.com>
Cc: William Cohen <wcohen@redhat.com>
Cc: Zechuan Chen <chenzechuan1@huawei.com>
Cc: bpf@vger.kernel.org
Cc: llvm@lists.linux.dev
Cc: yaowenbin <yaowenbin1@huawei.com>
Link: https://lore.kernel.org/r/20220826164242.43412-16-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Ian Rogers and committed by
Arnaldo Carvalho de Melo
bfa339ce e54dea69

+67 -5
+2
tools/perf/util/mutex.c
··· 50 50 } 51 51 52 52 void mutex_lock(struct mutex *mtx) 53 + NO_THREAD_SAFETY_ANALYSIS 53 54 { 54 55 CHECK_ERR(pthread_mutex_lock(&mtx->lock)); 55 56 } 56 57 57 58 void mutex_unlock(struct mutex *mtx) 59 + NO_THREAD_SAFETY_ANALYSIS 58 60 { 59 61 CHECK_ERR(pthread_mutex_unlock(&mtx->lock)); 60 62 }
+65 -5
tools/perf/util/mutex.h
··· 6 6 #include <stdbool.h> 7 7 8 8 /* 9 + * A function-like feature checking macro that is a wrapper around 10 + * `__has_attribute`, which is defined by GCC 5+ and Clang and evaluates to a 11 + * nonzero constant integer if the attribute is supported or 0 if not. 12 + */ 13 + #ifdef __has_attribute 14 + #define HAVE_ATTRIBUTE(x) __has_attribute(x) 15 + #else 16 + #define HAVE_ATTRIBUTE(x) 0 17 + #endif 18 + 19 + #if HAVE_ATTRIBUTE(guarded_by) && HAVE_ATTRIBUTE(pt_guarded_by) && \ 20 + HAVE_ATTRIBUTE(lockable) && HAVE_ATTRIBUTE(exclusive_lock_function) && \ 21 + HAVE_ATTRIBUTE(exclusive_trylock_function) && HAVE_ATTRIBUTE(exclusive_locks_required) && \ 22 + HAVE_ATTRIBUTE(no_thread_safety_analysis) 23 + 24 + /* Documents if a shared field or global variable needs to be protected by a mutex. */ 25 + #define GUARDED_BY(x) __attribute__((guarded_by(x))) 26 + 27 + /* 28 + * Documents if the memory location pointed to by a pointer should be guarded by 29 + * a mutex when dereferencing the pointer. 30 + */ 31 + #define PT_GUARDED_BY(x) __attribute__((pt_guarded_by(x))) 32 + 33 + /* Documents if a type is a lockable type. */ 34 + #define LOCKABLE __attribute__((lockable)) 35 + 36 + /* Documents functions that acquire a lock in the body of a function, and do not release it. */ 37 + #define EXCLUSIVE_LOCK_FUNCTION(...) __attribute__((exclusive_lock_function(__VA_ARGS__))) 38 + 39 + /* 40 + * Documents functions that expect a lock to be held on entry to the function, 41 + * and release it in the body of the function. 42 + */ 43 + #define UNLOCK_FUNCTION(...) __attribute__((unlock_function(__VA_ARGS__))) 44 + 45 + /* Documents functions that try to acquire a lock, and return success or failure. */ 46 + #define EXCLUSIVE_TRYLOCK_FUNCTION(...) \ 47 + __attribute__((exclusive_trylock_function(__VA_ARGS__))) 48 + 49 + /* Documents a function that expects a mutex to be held prior to entry. */ 50 + #define EXCLUSIVE_LOCKS_REQUIRED(...) __attribute__((exclusive_locks_required(__VA_ARGS__))) 51 + 52 + /* Turns off thread safety checking within the body of a particular function. */ 53 + #define NO_THREAD_SAFETY_ANALYSIS __attribute__((no_thread_safety_analysis)) 54 + 55 + #else 56 + 57 + #define GUARDED_BY(x) 58 + #define PT_GUARDED_BY(x) 59 + #define LOCKABLE 60 + #define EXCLUSIVE_LOCK_FUNCTION(...) 61 + #define UNLOCK_FUNCTION(...) 62 + #define EXCLUSIVE_TRYLOCK_FUNCTION(...) 63 + #define EXCLUSIVE_LOCKS_REQUIRED(...) 64 + #define NO_THREAD_SAFETY_ANALYSIS 65 + 66 + #endif 67 + 68 + /* 9 69 * A wrapper around the mutex implementation that allows perf to error check 10 70 * usage, etc. 11 71 */ 12 - struct mutex { 72 + struct LOCKABLE mutex { 13 73 pthread_mutex_t lock; 14 74 }; 15 75 ··· 87 27 void mutex_init_pshared(struct mutex *mtx); 88 28 void mutex_destroy(struct mutex *mtx); 89 29 90 - void mutex_lock(struct mutex *mtx); 91 - void mutex_unlock(struct mutex *mtx); 30 + void mutex_lock(struct mutex *mtx) EXCLUSIVE_LOCK_FUNCTION(*mtx); 31 + void mutex_unlock(struct mutex *mtx) UNLOCK_FUNCTION(*mtx); 92 32 /* Tries to acquire the lock and returns true on success. */ 93 - bool mutex_trylock(struct mutex *mtx); 33 + bool mutex_trylock(struct mutex *mtx) EXCLUSIVE_TRYLOCK_FUNCTION(true, *mtx); 94 34 95 35 /* Default initialize the cond struct. */ 96 36 void cond_init(struct cond *cnd); ··· 101 41 void cond_init_pshared(struct cond *cnd); 102 42 void cond_destroy(struct cond *cnd); 103 43 104 - void cond_wait(struct cond *cnd, struct mutex *mtx); 44 + void cond_wait(struct cond *cnd, struct mutex *mtx) EXCLUSIVE_LOCKS_REQUIRED(mtx); 105 45 void cond_signal(struct cond *cnd); 106 46 void cond_broadcast(struct cond *cnd); 107 47