forked from Minki/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>
This commit is contained in:
parent
e54dea69cd
commit
bfa339ceda
@ -50,11 +50,13 @@ void mutex_destroy(struct mutex *mtx)
|
||||
}
|
||||
|
||||
void mutex_lock(struct mutex *mtx)
|
||||
NO_THREAD_SAFETY_ANALYSIS
|
||||
{
|
||||
CHECK_ERR(pthread_mutex_lock(&mtx->lock));
|
||||
}
|
||||
|
||||
void mutex_unlock(struct mutex *mtx)
|
||||
NO_THREAD_SAFETY_ANALYSIS
|
||||
{
|
||||
CHECK_ERR(pthread_mutex_unlock(&mtx->lock));
|
||||
}
|
||||
|
@ -5,11 +5,71 @@
|
||||
#include <pthread.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
/*
|
||||
* A function-like feature checking macro that is a wrapper around
|
||||
* `__has_attribute`, which is defined by GCC 5+ and Clang and evaluates to a
|
||||
* nonzero constant integer if the attribute is supported or 0 if not.
|
||||
*/
|
||||
#ifdef __has_attribute
|
||||
#define HAVE_ATTRIBUTE(x) __has_attribute(x)
|
||||
#else
|
||||
#define HAVE_ATTRIBUTE(x) 0
|
||||
#endif
|
||||
|
||||
#if HAVE_ATTRIBUTE(guarded_by) && HAVE_ATTRIBUTE(pt_guarded_by) && \
|
||||
HAVE_ATTRIBUTE(lockable) && HAVE_ATTRIBUTE(exclusive_lock_function) && \
|
||||
HAVE_ATTRIBUTE(exclusive_trylock_function) && HAVE_ATTRIBUTE(exclusive_locks_required) && \
|
||||
HAVE_ATTRIBUTE(no_thread_safety_analysis)
|
||||
|
||||
/* Documents if a shared field or global variable needs to be protected by a mutex. */
|
||||
#define GUARDED_BY(x) __attribute__((guarded_by(x)))
|
||||
|
||||
/*
|
||||
* Documents if the memory location pointed to by a pointer should be guarded by
|
||||
* a mutex when dereferencing the pointer.
|
||||
*/
|
||||
#define PT_GUARDED_BY(x) __attribute__((pt_guarded_by(x)))
|
||||
|
||||
/* Documents if a type is a lockable type. */
|
||||
#define LOCKABLE __attribute__((lockable))
|
||||
|
||||
/* Documents functions that acquire a lock in the body of a function, and do not release it. */
|
||||
#define EXCLUSIVE_LOCK_FUNCTION(...) __attribute__((exclusive_lock_function(__VA_ARGS__)))
|
||||
|
||||
/*
|
||||
* Documents functions that expect a lock to be held on entry to the function,
|
||||
* and release it in the body of the function.
|
||||
*/
|
||||
#define UNLOCK_FUNCTION(...) __attribute__((unlock_function(__VA_ARGS__)))
|
||||
|
||||
/* Documents functions that try to acquire a lock, and return success or failure. */
|
||||
#define EXCLUSIVE_TRYLOCK_FUNCTION(...) \
|
||||
__attribute__((exclusive_trylock_function(__VA_ARGS__)))
|
||||
|
||||
/* Documents a function that expects a mutex to be held prior to entry. */
|
||||
#define EXCLUSIVE_LOCKS_REQUIRED(...) __attribute__((exclusive_locks_required(__VA_ARGS__)))
|
||||
|
||||
/* Turns off thread safety checking within the body of a particular function. */
|
||||
#define NO_THREAD_SAFETY_ANALYSIS __attribute__((no_thread_safety_analysis))
|
||||
|
||||
#else
|
||||
|
||||
#define GUARDED_BY(x)
|
||||
#define PT_GUARDED_BY(x)
|
||||
#define LOCKABLE
|
||||
#define EXCLUSIVE_LOCK_FUNCTION(...)
|
||||
#define UNLOCK_FUNCTION(...)
|
||||
#define EXCLUSIVE_TRYLOCK_FUNCTION(...)
|
||||
#define EXCLUSIVE_LOCKS_REQUIRED(...)
|
||||
#define NO_THREAD_SAFETY_ANALYSIS
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
* A wrapper around the mutex implementation that allows perf to error check
|
||||
* usage, etc.
|
||||
*/
|
||||
struct mutex {
|
||||
struct LOCKABLE mutex {
|
||||
pthread_mutex_t lock;
|
||||
};
|
||||
|
||||
@ -27,10 +87,10 @@ void mutex_init(struct mutex *mtx);
|
||||
void mutex_init_pshared(struct mutex *mtx);
|
||||
void mutex_destroy(struct mutex *mtx);
|
||||
|
||||
void mutex_lock(struct mutex *mtx);
|
||||
void mutex_unlock(struct mutex *mtx);
|
||||
void mutex_lock(struct mutex *mtx) EXCLUSIVE_LOCK_FUNCTION(*mtx);
|
||||
void mutex_unlock(struct mutex *mtx) UNLOCK_FUNCTION(*mtx);
|
||||
/* Tries to acquire the lock and returns true on success. */
|
||||
bool mutex_trylock(struct mutex *mtx);
|
||||
bool mutex_trylock(struct mutex *mtx) EXCLUSIVE_TRYLOCK_FUNCTION(true, *mtx);
|
||||
|
||||
/* Default initialize the cond struct. */
|
||||
void cond_init(struct cond *cnd);
|
||||
@ -41,7 +101,7 @@ void cond_init(struct cond *cnd);
|
||||
void cond_init_pshared(struct cond *cnd);
|
||||
void cond_destroy(struct cond *cnd);
|
||||
|
||||
void cond_wait(struct cond *cnd, struct mutex *mtx);
|
||||
void cond_wait(struct cond *cnd, struct mutex *mtx) EXCLUSIVE_LOCKS_REQUIRED(mtx);
|
||||
void cond_signal(struct cond *cnd);
|
||||
void cond_broadcast(struct cond *cnd);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user