From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.71 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792514209; b=aRiGaQ9ANld1OoiNd+EO8VkjMzPJvcTaQGoXmOOrpVy3+IzNYUamBJqCuH7EuPngDXyu 6Ngcg9um8o8Q06UEPj7Ft8bNq58mE4XhA8sWPTT2kBbtjDCbhXXAm4tEd25na+p+rsh2t jmjWbUtZ3C/dH59TlzZN2DTMVEETR37xBGm0yBMgFRSoyTLYUS6V+Vyg7goSiomsg2leE Ht5kfgKKIfz3WeIoap2DfgPB31ZeO4WyaC/SWPFn1BS4eZEXhnupmO1rZGbfMcmew6TkF i2wznP0Fm0CKSXCZyQBKgpZqSiLaPp2ZmCePBu3bnTeosgYPUCgHiZH/Dip4WwHu/7A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792514209; 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=Os5V1VGJIS4aXlnwbIJQQclYeaqOeSoW9P5F76ri3m4=; b=1lE9yxkTiNiMnnK83CZqHXi3py178XQVYR3/+wL6PkgBKY8CxTPia+PB0LNYx817ndg2 +wUuXxW6wVVZZxTT4Azdxjihlvw1xJ0NNN+wiRiTj/Qgp16vxotJN3OUpc+YjOSwJAeti VYMbZBBXSsJqk5+NAIdzVzW8f4khNvi9Ipt8JqcaIv+SUdaPMBEECjY9ItgjZBiJOaoHr +06DFbXWnxl2xzTJw9ERNdBaz+XjGHJagUDGEwQmeEaBLbPHDvqF+1VoEZqce2Yoy0g/M VxYG3VNfpIncX3P+5j7tgVA2j0LaO4IzYmIhun6MaJ4kd8sabMWCL+/JWmYz+UaBKvA== 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=20251104 header.b="wQ4j/6IO"; arc=none smtp.remote-ip=74.125.82.71 Received: from mail-dl1-f71.google.com (mail-dl1-f71.google.com [74.125.82.71]) (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 446FC606A31A for ; Tue, 20 Oct 2026 16:36:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 446FC606A31A 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, unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20251104 header.b=wQ4j/6IO Received: by mail-dl1-f71.google.com with SMTP id a92af1059eb24-139b62317d0so12566241c88.0 for ; Tue, 20 Oct 2026 09:36:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1792514208; x=1793119008; 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=Os5V1VGJIS4aXlnwbIJQQclYeaqOeSoW9P5F76ri3m4=; b=wQ4j/6IOnN7gOJWz9g6RLlfg1xjPBFeMCUNcxG37MsVFt76ln57+fsLm5siz7fJTgD e1atABFGg6y6mzNxLf48jQukRt/MGO5Y64dMETeba2UU1B9Ch+AF+sFgO9zhVK1B+Ji5 kiqA6I7mECRZYkzQ2JywCDM3RMFlJixmwdKqK6B6DUCxgzLQy+GUlfdqlnGYOeGuJH7d Nu6FUA/mRQiIj6h38jgK/GyTbi1rv1Cm+GreuHs4oYW715GLuneYZfWi552UiNiq8gec shLX4N7btJjJODl/N3Odt9272O5x4gl7B3+ySVqyWpcS0VRsTqzqEiAoAw/tOxNb1X3O awbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792514208; x=1793119008; 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=Os5V1VGJIS4aXlnwbIJQQclYeaqOeSoW9P5F76ri3m4=; b=lIdllEQigSaIYk3XL/OILRo2fXkApISIICQMLGPJt9jnbsMoZM50elpmPs5C6aYiuT woAkSNVNivIL9ek55G8aWc95hdjABWn6oRTYNjtTdlj84wfsIEoFnVNbsf27XgAx6NUE NVzRfeyGpE81v9B0f+I/tPjd6wHrAslRSxd/pU+WRjiWcy9bznL7w/+POfUuXwvcBxSa KOXLGPVxKknQbtDmBBNIZAcQOldR1gBGuAtsz3csMyV6ExO7KO9R4+OcQ+OZVDc1UB+E ONWPXtZ4vgfaigzTKDHswoQdzYvOVpPUUEGGce38XOFNmUsHUli9OREkAYcoj6YgX9KY HO0Q== X-Forwarded-Encrypted: i=1; AKwUvBzO1NbDm/cYFXIC1A/ch9vFZ7Gp+VHgm0cfty0sYMtZaun2yiyKq4O6j126nSyP741k4SqH@lists.linux.dev X-Gm-Message-State: AFq9FYIZKhnrVjVu3IJCOKfUH4yErrnNJWlDdpr1eN5OiuMbrT5Kz5Gl ZeWpVcyX8v1kNpL3kbf9hAkM0pSVOWikHXmZHktL26rdEuCY6+GiNQRtuRvNhDFMeWo/vZShG6f rHKz4+C663g== X-Received: from dlak16.prod.google.com ([2002:a05:701b:2910:b0:18f:4e29:3ddd]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:701b:464a:b0:143:868a:20c1 with SMTP id a92af1059eb24-185151be30emr13684798c88.46.1792514207925; Tue, 20 Oct 2026 09:36:47 -0700 (PDT) Date: Tue, 20 Oct 2026 09:36:23 -0700 In-Reply-To: <20261016221700.1282659-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: <20261016221700.1282659-1-irogers@google.com> X-Mailer: git-send-email 2.56.0.212.g129ede20d9-goog Message-ID: <20261020163640.746159-1-irogers@google.com> Subject: [PATCH v5 00/17] tools/perf: Adopt kernel compiler-context-analysis.h 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" 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. 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. v5: - Hold machine->dsos.lock in write mode across machine->vdso_info initialization and temporary file creation in machine__findnew_vdso() and __machine__findnew_compat(), and annotate __machine__addnew_vdso() with __must_hold(&machine->dsos.lock) (patches 7, 11). - Reset tpebs_cmd.pid = 0 and return early without setting t->started = true if start_command() fails in evsel__tpebs_start_perf_record() (patch 13). 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 and in util/intel-tpebs.c (patch 13). - Include 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 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 , , , and 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 | 133 +++-- 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 | 53 +- 34 files changed, 1204 insertions(+), 481 deletions(-) -- 2.56.0.212.g129ede20d9-goog