From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Marco Elver <elver@google.com>
Cc: Bart Van Assche <bvanassche@acm.org>,
Jiri Olsa <jolsa@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
James Clark <james.clark@linaro.org>,
Weilin Wang <weilin.wang@intel.com>,
linux-perf-users@vger.kernel.org, llvm@lists.linux.dev,
bpf@vger.kernel.org, linux-kernel@vger.kernel.org,
Ian Rogers <irogers@google.com>
Subject: [PATCH v14 08/23] perf dsos: Skip BPF and OOL DSOs in dsos__find_kernel_dso()
Date: Tue, 17 Nov 2026 10:48:29 -0800 [thread overview]
Message-ID: <20261117184844.99889-9-irogers@google.com> (raw)
In-Reply-To: <20261117184844.99889-1-irogers@google.com>
Factor out dso__is_bpf_prog() from __map__is_bpf_prog() and update
dsos__find_kernel_dso_cb() to skip dso__is_bpf_prog(dso),
DSO_BINARY_TYPE__BPF_IMAGE, and DSO_BINARY_TYPE__OOL so that
dsos__find_kernel_dso() does not match ksymbol DSOs in machine->dsos.
In machine__process_ksymbol_register(), also check
event->ksymbol.ksym_type == PERF_RECORD_KSYMBOL_TYPE_BPF before setting
DSO_BINARY_TYPE__BPF_IMAGE for is_bpf_image() symbols prior to inserting
the DSO.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/dso.h | 16 ++++++++++++++++
tools/perf/util/dsos.c | 3 +++
tools/perf/util/machine.c | 9 ++++-----
tools/perf/util/map.c | 14 ++------------
4 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index f6c60bafcde1..009bd3001ace 100644
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -1022,6 +1022,22 @@ static inline bool dso__is_kallsyms(const struct dso *dso)
return is_guest_kallsyms_pid_name(name);
}
+static inline bool dso__is_bpf_prog(const struct dso *dso)
+{
+ const char *name;
+
+ if (dso__binary_type(dso) == DSO_BINARY_TYPE__BPF_PROG_INFO)
+ return true;
+
+ /*
+ * If PERF_RECORD_BPF_EVENT is not included, the dso will not have
+ * type of DSO_BINARY_TYPE__BPF_PROG_INFO. In such cases, we can
+ * guess the type based on name.
+ */
+ name = dso__short_name(dso);
+ return name && !strncmp(name, "bpf_prog_", sizeof("bpf_prog_") - 1);
+}
+
static inline enum dso_binary_type dso__dbginfo_type(const struct dso *dso)
{
return RC_CHK_ACCESS(dso)->dbginfo_type;
diff --git a/tools/perf/util/dsos.c b/tools/perf/util/dsos.c
index 1574c8885d78..a7f6a98acbaf 100644
--- a/tools/perf/util/dsos.c
+++ b/tools/perf/util/dsos.c
@@ -475,6 +475,9 @@ static int dsos__find_kernel_dso_cb(struct dso *dso, void *data)
* is_kernel_module() treats it as a kernel cpumode.
*/
if (!dso__kernel(dso) ||
+ dso__is_bpf_prog(dso) ||
+ dso__binary_type(dso) == DSO_BINARY_TYPE__BPF_IMAGE ||
+ dso__binary_type(dso) == DSO_BINARY_TYPE__OOL ||
is_kernel_module(dso__long_name(dso), PERF_RECORD_MISC_CPUMODE_UNKNOWN))
return 0;
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 5b4550e97172..4a3461d79593 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -791,6 +791,10 @@ static int machine__process_ksymbol_register(struct machine *machine,
dso__set_binary_type(dso, DSO_BINARY_TYPE__OOL);
dso__data(dso)->file_size = event->ksymbol.len;
dso__set_loaded(dso);
+ } else if (event->ksymbol.ksym_type == PERF_RECORD_KSYMBOL_TYPE_BPF &&
+ is_bpf_image(event->ksymbol.name)) {
+ dso__set_binary_type(dso, DSO_BINARY_TYPE__BPF_IMAGE);
+ dso__set_long_name(dso, "", false);
}
map__set_start(map, event->ksymbol.addr);
@@ -802,11 +806,6 @@ static int machine__process_ksymbol_register(struct machine *machine,
}
dso__set_loaded(dso);
-
- if (is_bpf_image(event->ksymbol.name)) {
- dso__set_binary_type(dso, DSO_BINARY_TYPE__BPF_IMAGE);
- dso__set_long_name(dso, "", false);
- }
} else {
dso = dso__get(map__dso(map));
}
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index d5319ffa88a7..5155c95df85d 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -248,19 +248,9 @@ bool __map__is_extra_kernel_map(const struct map *map)
bool __map__is_bpf_prog(const struct map *map)
{
- const char *name;
- struct dso *dso = map__dso(map);
-
- if (dso__binary_type(dso) == DSO_BINARY_TYPE__BPF_PROG_INFO)
- return true;
+ const struct dso *dso = map__dso(map);
- /*
- * If PERF_RECORD_BPF_EVENT is not included, the dso will not have
- * type of DSO_BINARY_TYPE__BPF_PROG_INFO. In such cases, we can
- * guess the type based on name.
- */
- name = dso__short_name(dso);
- return name && (strstr(name, "bpf_prog_") == name);
+ return dso && dso__is_bpf_prog(dso);
}
bool __map__is_bpf_image(const struct map *map)
--
2.56.1.703.gf848ed807c-goog
next prev parent reply other threads:[~2026-11-17 18:49 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 18:48 [PATCH v14 00/23] tools/perf: Adopt kernel compiler-context-analysis.h annotations Ian Rogers
2026-11-17 18:48 ` [PATCH v14 01/23] compiler-context-analysis: Avoid unused parameter warning in _context_unsafe_alias() Ian Rogers
2026-11-17 18:48 ` [PATCH v14 02/23] tools headers compiler: Synchronize compiler_types.h with the kernel sources Ian Rogers
2026-11-17 18:48 ` [PATCH v14 03/23] tools headers: Synchronize linux/compiler-context-analysis.h " Ian Rogers
2026-11-17 18:48 ` [PATCH v14 04/23] perf mutex: Use kernel style compiler-context-analysis.h annotations Ian Rogers
2026-11-17 18:48 ` [PATCH v14 05/23] perf build: Enable additional Clang thread-safety flags Ian Rogers
2026-11-17 18:48 ` [PATCH v14 06/23] perf comm: Add __guarded_by annotations to struct comm_strs Ian Rogers
2026-11-17 18:48 ` [PATCH v14 07/23] perf vdso: Fix unlocked __dsos__add() and race in __machine__addnew_vdso() Ian Rogers
2026-11-17 18:48 ` Ian Rogers [this message]
2026-11-17 18:48 ` [PATCH v14 09/23] perf dsos: Ensure DSOs in auxtrace, machine, and symbol are in dsos Ian Rogers
2026-11-17 18:48 ` [PATCH v14 10/23] perf dso: Pass dso_data to close_data_fd() and dso__list_del() Ian Rogers
2026-11-17 18:48 ` [PATCH v14 11/23] perf dso: Use DEFINE_MUTEX for dso__data_open_lock Ian Rogers
2026-11-17 18:48 ` [PATCH v14 12/23] perf dsos: Use read lock fast path in dsos__findnew_id() Ian Rogers
2026-11-17 18:48 ` [PATCH v14 13/23] perf dso: Expand context analysis annotations Ian Rogers
2026-11-17 18:48 ` [PATCH v14 14/23] perf thread: Expand context analysis annotations to threads and namespaces_lock Ian Rogers
2026-11-17 18:48 ` [PATCH v14 15/23] perf intel-tpebs: Fix race in tpebs_stop() and tpebs_cmd.out fd handling Ian Rogers
2026-11-17 18:48 ` [PATCH v14 16/23] perf intel-tpebs: Use DEFINE_MUTEX for tpebs_mtx and add lock annotations Ian Rogers
2026-11-17 18:48 ` [PATCH v14 17/23] perf config: Add __guarded_by and __must_hold annotations Ian Rogers
2026-11-17 18:48 ` [PATCH v14 18/23] perf env: " Ian Rogers
2026-11-17 18:48 ` [PATCH v14 19/23] perf maps: Fix lock inversion in maps__load_first() Ian Rogers
2026-11-17 18:48 ` [PATCH v14 20/23] perf maps: Fix map index lookup fallback and removal Ian Rogers
2026-11-17 18:48 ` [PATCH v14 21/23] perf maps: Add context analysis annotations Ian Rogers
2026-11-17 18:48 ` [PATCH v14 22/23] perf machine: Hold machines->lock for remaining guests rbtree accesses Ian Rogers
2026-11-17 18:48 ` [PATCH v14 23/23] perf machine: Add __guarded_by annotation to machines->guests Ian Rogers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261117184844.99889-9-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=bpf@vger.kernel.org \
--cc=bvanassche@acm.org \
--cc=elver@google.com \
--cc=james.clark@linaro.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=weilin.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox