From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.214.199 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795244374; b=4Iu4M/ieBY6j/v/vKWH6xH0Ly6YHhEYcWIxOQ1++hSle5SPqRJe2TxSOzzo3gB7Qfuzx 1Ba8hHWgSEtzAH/ZzxKRQSruoa9HrEW5UTR01dPn+Q+dkuLPdC+2/dmwaLmQgin2FulOd WTKWXpL0rkA0OHQKGajPgN4mKI7rPRKZ0aoeWK5Pqhqy+N7sqRQRL5m1ELJEseyK999pQ 6dg17yoQepScYV0eft4yAR5VLJcZZwd3nV6LGE6Wf7U0hJ26+uq+9zPDIRioqo3BKODOA 7IHlv6uqWEWDEfY//Z/Orj2KxUgu6NRM0MAZwQW7wtaW+hUn3tcOrGWq3W6iGsFzeOg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795244374; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Received:Date:In-Reply-To: Mime-Version:References:X-Mailer:Message-ID:Subject:From:To:Cc: Content-Type; bh=pze2mI1oPViyxi8zWkxc4AfiCW0ffatK6SkO5RyHMS4=; b=Q8fPbAYLVrLM5y9FzT71qUORnKyGuv2K+xq2xsDFNlk+XyRHxSK84i1DrkDEEgiQZ5SB AuHVYWhV6uX0v+b8ypG7qROMewWC00P8ghwcCxEsCUg9HSq4uhpiuiwwOIiayKX291zB/ iWv7fTAB0DbZpxDXij9UrCaKY+EEbrbik9ej83YfRqvhcnsZERSml2sCL6pTBIpZNb05N Zum235BBPle64JCanOYF0bOrAGQQirp0q+d47PfAU3CdSGdQunZhstrdMApO8nQCp3wU2 jXRtUXcmXmklSfHbCniLjxI0FpyzdGJDV/7hTnm9dqVx8qKuOcu5ds72QmofVQB8fhw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20260707 header.b=D31XYtYa; arc=none smtp.remote-ip=209.85.214.199 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 356F8606A330 for ; Sat, 21 Nov 2026 06:59:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 356F8606A330 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.a=rsa-sha256 header.s=20260707 header.b=D31XYtYa Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2f045e399acso13288995ad.2 for ; Fri, 20 Nov 2026 22:59:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20260707; t=1795244373; x=1795849173; darn=lists.linux.dev; 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=pze2mI1oPViyxi8zWkxc4AfiCW0ffatK6SkO5RyHMS4=; b=D31XYtYagwv1AyCGs/MXDdLBjKrL+MbokQ8KfDXbd3iq1dF0hGQUaSvn3wqA1FaJ2h hibi5XVfWgClXQ/0u3hVFW4KzopNzVYE+jr7YIc1ME6cMeEyvbBjKZZw4jo0WHAdqtnW RDk9g2x0A5oMlHkHQSyXMqmXwLVH2PSp5PthYXl9G5VpZii2+e1az5xAbwqYiP8PddRf A/wF8utxSgHfqdrkh8HzZw2Uppy9m+AADef4OkmDJMl4pT37gHPr/tyoUZrBnoS5mxBi IIpd7CduaC0iCCB0nXTpQDmgh7IdHlcQLCOVdfcCsqlpWzbat/1Y353pyBG0PSdOjtmv Wnuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795244373; x=1795849173; 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=pze2mI1oPViyxi8zWkxc4AfiCW0ffatK6SkO5RyHMS4=; b=TuedbGVQBHVwAQdGm63OCmRHZoZ0kIklY9XRrpzPY7oSnxc3mYoOX+xkVSvfAb0rhp 0hNKCwWN72TODWS9trHKrLAUENUPgY8eu5N6ipf63kPl5sHj4rBYgNVDZleYd9P+5pLo 8XTo85QutRj6b+Y54Pq1FSkjIUKa3icCSjYdxjyRH6NMakUQVog8HS+Fvfiv9zV2tZbR HOddkSIfWDyt8I3MizEwHrs38wfv2n9Fcs6fQSYoAS7/p8u0fzELVTd6wj/JmyBSr74I 4FQEd47o1Ud/SSKvZN2boJTq1uVD4H/IFlpLGBIskxrUgRN27Lpg8exMEIRkXAuImqPA BO7w== X-Forwarded-Encrypted: i=1; AL+hErErCgmPzpIQFAvxYA94Vzk/9DafN5ticDMO5gKU5UpDH1tW52W0Iphvj7nVjUv4N5HAnyng@lists.linux.dev X-Gm-Message-State: APuU4Z+7r9J+SRr/GN+eInMuYK0mPd9/5JkywaczU5VOss2yAZdH7Xhh WHKEMu0J3c3b/6s82jx1xhJUZMk5h2yZ0V34+vEmRZTcbhBrCS2b76kJ3C0DX8VcZF/yVbtD7TH Mw6v7hm5pOw== X-Received: from plbmq7.prod.google.com ([2002:a17:902:fd47:b0:2ef:ceca:4005]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:1a0e:b0:2ee:1c51:7eaf with SMTP id d9443c01a7336-2f03f20b203mr57198655ad.31.1795244373110; Fri, 20 Nov 2026 22:59:33 -0800 (PST) Date: Fri, 20 Nov 2026 22:58:07 -0800 In-Reply-To: <20261121065813.4143649-1-irogers@google.com> X-Mailing-List: llvm@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list Mime-Version: 1.0 References: <20261121065813.4143649-1-irogers@google.com> X-Mailer: git-send-email 2.56.1.750.gf70dc682cf-goog Message-ID: <20261121065813.4143649-19-irogers@google.com> Subject: [PATCH v15 18/23] perf env: Add __guarded_by and __must_hold annotations From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Marco Elver Cc: Bart Van Assche , Jiri Olsa , Adrian Hunter , James Clark , Weilin Wang , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , linux-perf-users@vger.kernel.org, llvm@lists.linux.dev, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Ian Rogers Content-Type: text/plain; charset="UTF-8" Add __guarded_by(), __must_hold(), and __must_hold_shared() annotations to the bpf_progs and cgroups trees and helpers in struct perf_env. Signed-off-by: Ian Rogers --- tools/perf/util/bpf-event.h | 5 +++-- tools/perf/util/env.c | 1 + tools/perf/util/env.h | 19 +++++++++++-------- 3 files changed, 15 insertions(+), 10 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/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); -- 2.56.1.750.gf70dc682cf-goog