perf tools: Add bpf image check to __map__is_kmodule
Jiri Olsa
reviewerPATCH 1/1 perf tools: Add bpf image check to __map__is_kmodule
When validating kcore modules the do_validate_kcore_modules function checks on every kernel module dso against modules record. The __map__is_kmodule check is used to get only kernel module dso objects through.
Currently the bpf images are slipping through the check and making the validation to fail, so report falls back from kcore usage to kallsyms.
Adding __map__is_bpf_image check for bpf image and adding it to __map__is_kmodule check.
--- tools/perf/util/machine.c | 6 ------ tools/perf/util/map.c | 16 ++++++++++++++++ tools/perf/util/map.h | 9 ++++++++- 3 files changed, 24 insertions(+), 7 deletions(-)
tools/perf/util/machine.c +0 -6
@@ -736,12 +736,6 @@ int machine__process_switch_event(struct machine *machine __maybe_unused,return 0 ; } -static int is_bpf_image (const char *name) -{ -return strncmp (name,"bpf_trampoline_" ,sizeof ("bpf_trampoline_" ) -1 ) ==0 || -strncmp (name,"bpf_dispatcher_" ,sizeof ("bpf_dispatcher_" ) -1 ) ==0 ; -} -static int machine__process_ksymbol_register (struct machine *machine,union perf_event *event,struct perf_sample *sample__maybe_unused )
tools/perf/util/map.c +16 -0
@@ -267,6 +267,22 @@ bool __map__is_bpf_prog(const struct map *map)return name && (strstr (name,"bpf_prog_" ) == name); } +bool __map__is_bpf_image (const struct map *map) +{ +const char *name; + +if (map->dso->binary_type ==DSO_BINARY_TYPE__BPF_IMAGE ) +return true; + +/* +* If PERF_RECORD_KSYMBOL is not included, the dso will not have +* type of DSO_BINARY_TYPE__BPF_IMAGE. In such cases, we can +* guess the type based on name. +*/ + name = map->dso->short_name; +return name &&is_bpf_image (name); +} +bool __map__is_ool (const struct map *map) {return map->dso && map->dso->binary_type ==DSO_BINARY_TYPE__OOL ;
tools/perf/util/map.h +8 -1
@@ -147,12 +147,14 @@ int map__set_kallsyms_ref_reloc_sym(struct map *map, const char *symbol_name,bool __map__is_kernel (const struct map *map);bool __map__is_extra_kernel_map (const struct map *map);bool __map__is_bpf_prog (const struct map *map); +bool __map__is_bpf_image (const struct map *map);bool __map__is_ool (const struct map *map);static inline bool __map__is_kmodule (const struct map *map) {return !__map__is_kernel (map) && !__map__is_extra_kernel_map (map) && - !__map__is_bpf_prog (map) && !__map__is_ool (map); + !__map__is_bpf_prog (map) && !__map__is_ool (map) && + !__map__is_bpf_image (map); }bool map__has_symbols (const struct map *map);
@@ -164,4 +166,9 @@ static inline bool is_entry_trampoline(const char *name) return !strcmp(name, ENTRY_TRAMPOLINE_NAME); } +static inline bool is_bpf_image (const char *name) +{ +return strncmp (name,"bpf_trampoline_" ,sizeof ("bpf_trampoline_" ) -1 ) ==0 || +strncmp (name,"bpf_dispatcher_" ,sizeof ("bpf_dispatcher_" ) -1 ) ==0 ; +}#endif /* __PERF_MAP_H */
Signature · 1 line
2.25.4
Arnaldo Carvalho de Melo
maintainerEm Wed, Aug 26, 2020 at 11:30:17PM +0200, Jiri Olsa escreveu:
Quoted 11 lines
When validating kcore modules the
do_validate_kcore_modulesfunction checks on every kernel module dso against modules record. The__map__is_kmodulecheck is used to get only kernel module dso objects through.Currently the bpf images are slipping through the check and making the validation to fail, so report falls back from kcore usage to kallsyms.
Adding
__map__is_bpf_imagecheck for bpf image and adding it to__map__is_kmodulecheck.
looks ok, applied to perf/urgent.
Thanks,
- Arnaldo
Quoted 85 lines
Fixes 3c29d4483e85 ("perf annotate: Add basic support for bpf_image")Signed-off-by Jiri Olsa <[email protected]>--- tools/perf/util/machine.c | 6 ------ tools/perf/util/map.c | 16 ++++++++++++++++ tools/perf/util/map.h | 9 ++++++++- 3 files changed, 24 insertions(+), 7 deletions(-)tools/perf/util/machine.c +0
-6@@ -736,12 +736,6 @@ int machine__process_switch_event(struct machine *machine __maybe_unused,return 0 ; } -static int is_bpf_image (const char *name) -{ -return strncmp (name,"bpf_trampoline_" ,sizeof ("bpf_trampoline_" ) -1 ) ==0 || -strncmp (name,"bpf_dispatcher_" ,sizeof ("bpf_dispatcher_" ) -1 ) ==0 ; -} -static int machine__process_ksymbol_register (struct machine *machine,union perf_event *event,struct perf_sample *sample__maybe_unused )tools/perf/util/map.c +16
-0@@ -267,6 +267,22 @@ bool __map__is_bpf_prog(const struct map *map)return name && (strstr (name,"bpf_prog_" ) == name); } +bool __map__is_bpf_image (const struct map *map) +{ +const char *name; + +if (map->dso->binary_type ==DSO_BINARY_TYPE__BPF_IMAGE ) +return true; + +/* +* If PERF_RECORD_KSYMBOL is not included, the dso will not have +* type of DSO_BINARY_TYPE__BPF_IMAGE. In such cases, we can +* guess the type based on name. +*/ + name = map->dso->short_name; +return name &&is_bpf_image (name); +} +bool __map__is_ool (const struct map *map) {return map->dso && map->dso->binary_type ==DSO_BINARY_TYPE__OOL ;tools/perf/util/map.h +8
-1@@ -147,12 +147,14 @@ int map__set_kallsyms_ref_reloc_sym(struct map *map, const char *symbol_name,bool __map__is_kernel (const struct map *map);bool __map__is_extra_kernel_map (const struct map *map);bool __map__is_bpf_prog (const struct map *map); +bool __map__is_bpf_image (const struct map *map);bool __map__is_ool (const struct map *map);static inline bool __map__is_kmodule (const struct map *map) {return !__map__is_kernel (map) && !__map__is_extra_kernel_map (map) && - !__map__is_bpf_prog (map) && !__map__is_ool (map); + !__map__is_bpf_prog (map) && !__map__is_ool (map) && + !__map__is_bpf_image (map); }bool map__has_symbols (const struct map *map);@@ -164,4 +166,9 @@ static inline bool is_entry_trampoline(const char *name) return !strcmp(name, ENTRY_TRAMPOLINE_NAME); } +static inline bool is_bpf_image (const char *name) +{ +return strncmp (name,"bpf_trampoline_" ,sizeof ("bpf_trampoline_" ) -1 ) ==0 || +strncmp (name,"bpf_dispatcher_" ,sizeof ("bpf_dispatcher_" ) -1 ) ==0 ; +}#endif /* __PERF_MAP_H */ Signature · 1 line
2.25.4
Signature · 1 line
- Arnaldo