From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f197.google.com (mail-dy1-f197.google.com [74.125.82.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 340C8595755 for ; Fri, 16 Oct 2026 17:31:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.197 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792171921; cv=none; b=ahL3DJ8zKzaiBxR8qq39iREHxRUHHokjfBhvUYi4VS32CQngwtU0PAdV5TCcmaeBbOSGmvd/NwCzTW8c4+Bt7ynpPSd4227eZV6/boAoMRgcxK1oewkLG5o7QibVSL7DLQPlhXRRibeOdVlNaIn6xh/QwwcSYqTcKZnxzsX/oJM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792171921; c=relaxed/simple; bh=f6XIJ3e2LnHvCTs6q5Rkyf2i2qYr/WVOKh9xWNqc4Hg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=V4nR2heVMrQLbs37u7RGVWrgvd5JTsLQi2HxzxBhz0a/Ig2Rm0i44kwbTvrd/8Mxg8q8kmK9Kr3ZXJp6JVX7daptYrbpaDjYseILxNHfRD5z1RbRYmyKZ1zjP7rdOwu5JKWxleh1XVhkSncI+pByL4jtFVeRqt2W1HrQd9dydJs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Epn/LfYQ; arc=none smtp.client-ip=74.125.82.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Epn/LfYQ" Received: by mail-dy1-f197.google.com with SMTP id 5a478bee46e88-341eff9e381so266390eec.1 for ; Fri, 16 Oct 2026 10:31:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1792171918; x=1792776718; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=B4tQlc8bXDFbmBf7jRGO8ubbJkyz+XsUdtStynrS9lw=; b=Epn/LfYQbkFaDy03cb+y95Ns0s0sEvLF8bHgz2tNr4Kie04LcHuvPCeudQedXcTtK0 wnpU7PFMBhiCxcDgEoeOc7dqr6STfT9zyZNkC2sgWuxx/b/yZ9a4crUgUT1ueKenQLfw FEtC+tiojzgcz27QdhFiaiMYJIZB7966XW8kOzcNRozz1mr2GIDnxgnLFA/jL9a0Hn7P 1pvAHSfOy4Uk6xfGEijoN1tsdDGLoFPNC5lReqEnHviSWSY4Uv30RzHv/lfgCuXJoOAd uhPo477VHP9CulQTlwBnUnQ0r25Vemx9h6MYRCBqmY8Yg5NkjH4yBlDgmmY82aGcS91O hRQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792171918; x=1792776718; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=B4tQlc8bXDFbmBf7jRGO8ubbJkyz+XsUdtStynrS9lw=; b=RjThyZxcrhAvhIh1X3CLXhsE9vdcntE6ut7Xb05vMQtFOFETA93P8feRN6fSMuXL+5 0AG4K27g69FlRrVZMZDPjbJFTlSwsG9+P4I9RbI0DTHyWTPIM0+zGH+zAc8I4pu1/Niu Sa1KtBzRJf9YG/ZPRkZmR5pgZGDby+x0PH0rVQTQVGsy4cXbABk9gLY1GwTlyzs9OqdI IaJ5yGDGQB72YJGUipJUrOESmsEL5AgRbwRGUefCkvpRI6XGOlefExjvD+ipYipZ/HGd CnQCuL3TvKkp1rdHI0D31G4rVkwvakN/OC6z3Xfm1N9cC8Rmq1UeDRs+fykRjRqnMP0R ZaOw== X-Forwarded-Encrypted: i=1; AKwUvBzYvXLatQc9c2IfnuQ9Nq1ZCnBogHtbylGjrPUmOEkDiH+71/8MjM6GjvuS822bR83P/kAdzj41wS3ln0v1OTv6@vger.kernel.org X-Gm-Message-State: AFq9FYIPbWCx8VRYUFHTdDA5I7a4KfggRs1926XeBqo7LkuPGsCFlUa4 OWWNKjpYTN5B2J1nm4DGQD/dZmcucDU7wFxndYwbJrUSqbBhT7gQkd3LcHyz44h1ljVx5xkFwmn 8dYuoK6Jdvg== X-Received: from dlbvp1.prod.google.com ([2002:a05:7022:ff41:b0:161:fc1c:61e2]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:701a:c907:b0:169:3706:d61b with SMTP id a92af1059eb24-18511eb6a06mr655823c88.16.1792171918085; Fri, 16 Oct 2026 10:31:58 -0700 (PDT) Date: Fri, 16 Oct 2026 10:31:04 -0700 In-Reply-To: <20261016173106.679725-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20261013222622.1822619-1-irogers@google.com> <20261016173106.679725-1-irogers@google.com> X-Mailer: git-send-email 2.56.0.212.g129ede20d9-goog Message-ID: <20261016173106.679725-16-irogers@google.com> Subject: [PATCH v3 15/17] perf config, intel-tpebs, env: Add __guarded_by and __must_hold annotations From: Ian Rogers To: irogers@google.com, acme@kernel.org, elver@google.com, namhyung@kernel.org Cc: adrian.hunter@intel.com, james.clark@linaro.org, jolsa@kernel.org, justinstitt@google.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, ljs@kernel.org, llvm@lists.linux.dev, mingo@redhat.com, morbo@google.com, nathan@kernel.org, ndesaulniers@google.com, peterz@infradead.org Content-Type: text/plain; charset="UTF-8" Add __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. Signed-off-by: Ian Rogers --- 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(-) diff --git a/tools/perf/util/bpf-event.h b/tools/perf/util/bpf-event.h index da4eeb4a1a73..3f3323f98f49 100644 --- a/tools/perf/util/bpf-event.h +++ b/tools/perf/util/bpf-event.h @@ -6,11 +6,11 @@ #include #include #include +#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, diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index 287401f159e6..a55f7062a09b 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c @@ -64,15 +64,29 @@ 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); + +/* + * Protects the global config_set. Separate from config_mutex because + * initializing config_set parses the config files, which acquires + * config_mutex. + */ +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 +113,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 +185,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 +217,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 +254,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 +275,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 +568,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 +750,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 +867,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 +986,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; diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c index 50993b0dedc5..9e8e5d1d822a 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -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 diff --git a/tools/perf/util/env.h b/tools/perf/util/env.h index 23d35425efe3..6b2083e3640c 100644 --- a/tools/perf/util/env.h +++ b/tools/perf/util/env.h @@ -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); diff --git a/tools/perf/util/intel-tpebs.c b/tools/perf/util/intel-tpebs.c index 57e08476a13d..13f88fc3ceed 100644 --- a/tools/perf/util/intel-tpebs.c +++ b/tools/perf/util/intel-tpebs.c @@ -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; -- 2.56.0.212.g129ede20d9-goog