Skip to contentSkip to conversation

perf inject: With --convert-callchain ignore the dummy event for dwarf stacks

PATCH Applied Ian Rogers 2 participants 2 messages Jan 22 – Jan 23 perf events

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH 1/1 perf inject: With --convert-callchain ignore the dummy event for dwarf stacks

On hybrid systems there is generally >1 event and a dummy event. The perf inject --convert-callchain option is failing to convert perf.data files on such systems reporting "--convert-callchain requires DWARF call graph." The failing event is the dummy event that doesn't need to be set up for samples. As such ignore this event when checking the evsels.

Fixes 92ea788d2af4 ("perf inject: Add --convert-callchain option")
---
 tools/perf/builtin-inject.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-inject.c +1 -1
index c89ac85ec112..ea3ac35256ce 100644
@@ -2727,7 +2727,7 @@ int cmd_inject(int argc, const char **argv)
 		}
 
 		evlist__for_each_entry(inject.session->evlist, evsel) {
-			if (!evsel__has_dwarf_callchain(evsel)) {
+			if (!evsel__has_dwarf_callchain(evsel) && !evsel__is_dummy_event(evsel)) {
 				pr_err("--convert-callchain requires DWARF call graph.\n");
 				goto out_delete;
 			}
Signature · 1 line
2.52.0.457.g6b5491de43-goog
maintainer Applied
#1 lore raw
Quoted 8 lines · Ian Rogers

On hybrid systems there is generally >1 event and a dummy event. The perf inject --convert-callchain option is failing to convert perf.data files on such systems reporting "--convert-callchain requires DWARF call graph." The failing event is the dummy event that doesn't need to be set up for samples. As such ignore this event when checking the evsels.

Fixes 92ea788d2af4 ("perf inject: Add --convert-callchain option")

Thanks, applied to perf-tools-next,

- Arnaldo

Quoted 20 lines
---
 tools/perf/builtin-inject.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-inject.c +1 -1
index c89ac85ec112..ea3ac35256ce 100644
@@ -2727,7 +2727,7 @@ int cmd_inject(int argc, const char **argv)
 		}
 
 		evlist__for_each_entry(inject.session->evlist, evsel) {
-			if (!evsel__has_dwarf_callchain(evsel)) {
+			if (!evsel__has_dwarf_callchain(evsel) && !evsel__is_dummy_event(evsel)) {
 				pr_err("--convert-callchain requires DWARF call graph.\n");
 				goto out_delete;
 			}
Signature · 1 line
2.52.0.457.g6b5491de43-goog