[PATCH v13 08/21] perf dsos: Skip BPF and OOL DSOs in dsos__find_kernel_dso()
From: Ian Rogers
Date: Fri Nov 13 2026 - 14:26:46 EST
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@xxxxxxxxxx>
---
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 5eb5efa4eb90..afb95b64bec4 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -769,6 +769,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);
@@ -780,11 +784,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