* [PATCH v5 0/2] perf script python: Add script for CoreSight disassembly
@ 2022-05-15 7:18 Leo Yan
2022-05-15 7:18 ` [PATCH v5 1/2] perf scripting python: Expose dso and map information Leo Yan
2022-05-15 7:18 ` [PATCH v5 2/2] perf scripts python: Support Arm CoreSight trace data disassembly Leo Yan
0 siblings, 2 replies; 6+ messages in thread
From: Leo Yan @ 2022-05-15 7:18 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo, James Clark, German Gomez,
Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Namhyung Kim, Adrian Hunter, Ian Rogers,
Eelco Chaudron, Stephen Brennan, Tanmay Jagdale, zengshun . wu,
Al Grant, coresight, linux-kernel, linux-perf-users
Cc: Leo Yan
This patch set is to restart the upstreaming for CoreSight disassembly
script [1], the python script can be used to dump assembly, source line
and symbols so it can be easier for humans inspecting.
The first patch changes python script engine to expose more information
for DSO and maps, so it's helpful for disassembly with objdump program.
The second patch is to introduce the python script for CoreSight trace
data disassembly for branch samples. It also can dump source line and
symbol info for instruction samples.
This patch set has been tested on Arm64 Juno board:
# perf script -s scripts/python/arm-cs-trace-disasm.py
...
main 6728/6728 [004] 0.000000000 main+0x40 /root/coresight_test/main.c for (i = 0; i < 10000; i++) {
main 6728/6728 [004] 0.000000000 main+0x20 /root/coresight_test/main.c val = lib_loop_test(100);
main 6728/6728 [004] 0.000000000 lib_loop_test@plt+0xc /root/coresight_test/main
main 6728/6728 [004] 0.000000000 lib_loop_test+0xc /root/coresight_test/libcstest.c for (i = 0; i < 5; i++)
main 6728/6728 [004] 0.000000000 lib_loop_test+0x30
main 6728/6728 [004] 0.000000000 lib_loop_test+0x30
main 6728/6728 [004] 0.000000000 lib_loop_test+0x30
main 6728/6728 [004] 0.000000000 lib_loop_test+0x30
main 6728/6728 [004] 0.000000000 lib_loop_test+0x30
main 6728/6728 [004] 0.000000000 lib_loop_test+0x3c /root/coresight_test/libcstest.c }
# perf script -s scripts/python/arm-cs-trace-disasm.py -- -d llvm-objdump-11 -k ./vmlinux
ARM CoreSight Trace Data Assembler Dump
ffff800008eb3198 <etm4_enable_hw>:
ffff800008eb3310: c0 38 00 35 cbnz w0, 0xffff800008eb3a28 <etm4_enable_hw+0x890>
ffff800008eb3314: 9f 3f 03 d5 dsb sy
ffff800008eb3318: df 3f 03 d5 isb
ffff800008eb331c: f5 5b 42 a9 ldp x21, x22, [sp, #32]
ffff800008eb3320: fb 73 45 a9 ldp x27, x28, [sp, #80]
ffff800008eb3324: e0 82 40 39 ldrb w0, [x23, #32]
ffff800008eb3328: 60 00 00 34 cbz w0, 0xffff800008eb3334 <etm4_enable_hw+0x19c>
ffff800008eb332c: e0 03 19 aa mov x0, x25
ffff800008eb3330: 8c fe ff 97 bl 0xffff800008eb2d60 <etm4_cs_lock.isra.0.part.0>
main 6055/6055 [004] 0.000000000 etm4_enable_hw+0x198 [kernel.kallsyms]
ffff800008eb2d60 <etm4_cs_lock.isra.0.part.0>:
ffff800008eb2d60: 1f 20 03 d5 nop
ffff800008eb2d64: 1f 20 03 d5 nop
ffff800008eb2d68: 3f 23 03 d5 hint #25
ffff800008eb2d6c: 00 00 40 f9 ldr x0, [x0]
ffff800008eb2d70: 9f 3f 03 d5 dsb sy
ffff800008eb2d74: 00 c0 3e 91 add x0, x0, #4016
ffff800008eb2d78: 1f 00 00 b9 str wzr, [x0]
ffff800008eb2d7c: bf 23 03 d5 hint #29
ffff800008eb2d80: c0 03 5f d6 ret
main 6055/6055 [004] 0.000000000 etm4_cs_lock.isra.0.part.0+0x20
# perf script -s scripts/python/arm-cs-trace-disasm.py -- -d objdump -k ./vmlinux
ARM CoreSight Trace Data Assembler Dump
ffff800008eb3310 <etm4_enable_hw+0x178>:
ffff800008eb3310: 350038c0 cbnz w0, ffff800008eb3a28 <etm4_enable_hw+0x890>
ffff800008eb3314: d5033f9f dsb sy
ffff800008eb3318: d5033fdf isb
ffff800008eb331c: a9425bf5 ldp x21, x22, [sp, #32]
ffff800008eb3320: a94573fb ldp x27, x28, [sp, #80]
ffff800008eb3324: 394082e0 ldrb w0, [x23, #32]
ffff800008eb3328: 34000060 cbz w0, ffff800008eb3334 <etm4_enable_hw+0x19c>
ffff800008eb332c: aa1903e0 mov x0, x25
ffff800008eb3330: 97fffe8c bl ffff800008eb2d60 <etm4_cs_lock.isra.0.part.0>
main 6055/6055 [004] 0.000000000 etm4_enable_hw+0x198 [kernel.kallsyms]
ffff800008eb2d60 <etm4_cs_lock.isra.0.part.0>:
ffff800008eb2d60: d503201f nop
ffff800008eb2d64: d503201f nop
ffff800008eb2d68: d503233f paciasp
ffff800008eb2d6c: f9400000 ldr x0, [x0]
ffff800008eb2d70: d5033f9f dsb sy
ffff800008eb2d74: 913ec000 add x0, x0, #0xfb0
ffff800008eb2d78: b900001f str wzr, [x0]
ffff800008eb2d7c: d50323bf autiasp
ffff800008eb2d80: d65f03c0 ret
main 6055/6055 [004] 0.000000000 etm4_cs_lock.isra.0.part.0+0x20
[1] https://lists.linaro.org/archives/list/coresight@lists.linaro.org/thread/GIJCSSARXTSEC5GVZUZ5M7FB5NOWIODE/#Z72EE4GS7S5E27QBSCWP3NNE2R6B6K6C
Changes from v4:
* Enhanced python script engine for DSO and map infos;
* Rewrote the python script, added support for symbol and source line
dumping.
Leo Yan (2):
perf scripting python: Expose dso and map information
perf scripts python: Support Arm CoreSight trace data disassembly
.../scripts/python/arm-cs-trace-disasm.py | 275 ++++++++++++++++++
.../scripting-engines/trace-event-python.c | 21 +-
2 files changed, 292 insertions(+), 4 deletions(-)
create mode 100755 tools/perf/scripts/python/arm-cs-trace-disasm.py
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v5 1/2] perf scripting python: Expose dso and map information
2022-05-15 7:18 [PATCH v5 0/2] perf script python: Add script for CoreSight disassembly Leo Yan
@ 2022-05-15 7:18 ` Leo Yan
2022-05-16 6:51 ` Adrian Hunter
2022-05-15 7:18 ` [PATCH v5 2/2] perf scripts python: Support Arm CoreSight trace data disassembly Leo Yan
1 sibling, 1 reply; 6+ messages in thread
From: Leo Yan @ 2022-05-15 7:18 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo, James Clark, German Gomez,
Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Namhyung Kim, Adrian Hunter, Ian Rogers,
Eelco Chaudron, Stephen Brennan, Tanmay Jagdale, zengshun . wu,
Al Grant, coresight, linux-kernel, linux-perf-users
Cc: Leo Yan
This change adds dso build_id and corresponding map's start and end
address. The info of dso build_id can be used to find dso file path,
and we can validate if a branch address falls into the range of map's
start and end addresses.
In addition, the map's start address can be used as an offset for
disassembly.
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
.../scripting-engines/trace-event-python.c | 21 +++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index 659eb4e4b34b..adba01b7d9dd 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -755,12 +755,22 @@ static void set_regs_in_dict(PyObject *dict,
}
static void set_sym_in_dict(PyObject *dict, struct addr_location *al,
- const char *dso_field, const char *sym_field,
- const char *symoff_field)
+ const char *dso_field, const char *dso_bid_field,
+ const char *dso_map_start, const char *dso_map_end,
+ const char *sym_field, const char *symoff_field)
{
+ char sbuild_id[SBUILD_ID_SIZE];
+
if (al->map) {
pydict_set_item_string_decref(dict, dso_field,
_PyUnicode_FromString(al->map->dso->name));
+ build_id__sprintf(&al->map->dso->bid, sbuild_id);
+ pydict_set_item_string_decref(dict, dso_bid_field,
+ _PyUnicode_FromString(sbuild_id));
+ pydict_set_item_string_decref(dict, dso_map_start,
+ PyLong_FromUnsignedLong(al->map->start));
+ pydict_set_item_string_decref(dict, dso_map_end,
+ PyLong_FromUnsignedLong(al->map->end));
}
if (al->sym) {
pydict_set_item_string_decref(dict, sym_field,
@@ -840,7 +850,8 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample,
(const char *)sample->raw_data, sample->raw_size));
pydict_set_item_string_decref(dict, "comm",
_PyUnicode_FromString(thread__comm_str(al->thread)));
- set_sym_in_dict(dict, al, "dso", "symbol", "symoff");
+ set_sym_in_dict(dict, al, "dso", "dso_bid", "dso_map_start", "dso_map_end",
+ "symbol", "symoff");
pydict_set_item_string_decref(dict, "callchain", callchain);
@@ -856,7 +867,9 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample,
if (addr_al) {
pydict_set_item_string_decref(dict_sample, "addr_correlates_sym",
PyBool_FromLong(1));
- set_sym_in_dict(dict_sample, addr_al, "addr_dso", "addr_symbol", "addr_symoff");
+ set_sym_in_dict(dict_sample, addr_al, "addr_dso", "addr_dso_bid",
+ "addr_dso_map_start", "addr_dso_map_end",
+ "addr_symbol", "addr_symoff");
}
if (sample->flags)
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v5 2/2] perf scripts python: Support Arm CoreSight trace data disassembly
2022-05-15 7:18 [PATCH v5 0/2] perf script python: Add script for CoreSight disassembly Leo Yan
2022-05-15 7:18 ` [PATCH v5 1/2] perf scripting python: Expose dso and map information Leo Yan
@ 2022-05-15 7:18 ` Leo Yan
2022-05-15 21:18 ` Ian Rogers
1 sibling, 1 reply; 6+ messages in thread
From: Leo Yan @ 2022-05-15 7:18 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo, James Clark, German Gomez,
Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Namhyung Kim, Adrian Hunter, Ian Rogers,
Eelco Chaudron, Stephen Brennan, Tanmay Jagdale, zengshun . wu,
Al Grant, coresight, linux-kernel, linux-perf-users
Cc: Leo Yan, Tor Jeremiassen, Mathieu Poirier
This commit adds python script to parse CoreSight tracing event and
print out source line and disassembly, it generates readable program
execution flow for easier humans inspecting.
The script receives CoreSight tracing packet with below format:
+------------+------------+------------+
packet(n): | addr | ip | cpu |
+------------+------------+------------+
packet(n+1): | addr | ip | cpu |
+------------+------------+------------+
packet::addr presents the start address of the coming branch sample, and
packet::ip is the last address of the branch smple. Therefore, a code
section between branches starts from packet(n)::addr and it stops at
packet(n+1)::ip. As results we combines the two continuous packets to
generate the address range for instructions:
[ sample(n)::addr .. sample(n+1)::ip ]
The script supports both objdump or llvm-objdump for disassembly with
specifying option '-d'. If doesn't specify option '-d', the script
simply outputs source lines and symbols.
Below shows usages with llvm-objdump or objdump to output disassembly.
# perf script -s scripts/python/arm-cs-trace-disasm.py -- -d llvm-objdump-11 -k ./vmlinux
ARM CoreSight Trace Data Assembler Dump
ffff800008eb3198 <etm4_enable_hw>:
ffff800008eb3310: c0 38 00 35 cbnz w0, 0xffff800008eb3a28 <etm4_enable_hw+0x890>
ffff800008eb3314: 9f 3f 03 d5 dsb sy
ffff800008eb3318: df 3f 03 d5 isb
ffff800008eb331c: f5 5b 42 a9 ldp x21, x22, [sp, #32]
ffff800008eb3320: fb 73 45 a9 ldp x27, x28, [sp, #80]
ffff800008eb3324: e0 82 40 39 ldrb w0, [x23, #32]
ffff800008eb3328: 60 00 00 34 cbz w0, 0xffff800008eb3334 <etm4_enable_hw+0x19c>
ffff800008eb332c: e0 03 19 aa mov x0, x25
ffff800008eb3330: 8c fe ff 97 bl 0xffff800008eb2d60 <etm4_cs_lock.isra.0.part.0>
main 6055/6055 [004] 0.000000000 etm4_enable_hw+0x198 [kernel.kallsyms]
ffff800008eb2d60 <etm4_cs_lock.isra.0.part.0>:
ffff800008eb2d60: 1f 20 03 d5 nop
ffff800008eb2d64: 1f 20 03 d5 nop
ffff800008eb2d68: 3f 23 03 d5 hint #25
ffff800008eb2d6c: 00 00 40 f9 ldr x0, [x0]
ffff800008eb2d70: 9f 3f 03 d5 dsb sy
ffff800008eb2d74: 00 c0 3e 91 add x0, x0, #4016
ffff800008eb2d78: 1f 00 00 b9 str wzr, [x0]
ffff800008eb2d7c: bf 23 03 d5 hint #29
ffff800008eb2d80: c0 03 5f d6 ret
main 6055/6055 [004] 0.000000000 etm4_cs_lock.isra.0.part.0+0x20
# perf script -s scripts/python/arm-cs-trace-disasm.py -- -d objdump -k ./vmlinux
ARM CoreSight Trace Data Assembler Dump
ffff800008eb3310 <etm4_enable_hw+0x178>:
ffff800008eb3310: 350038c0 cbnz w0, ffff800008eb3a28 <etm4_enable_hw+0x890>
ffff800008eb3314: d5033f9f dsb sy
ffff800008eb3318: d5033fdf isb
ffff800008eb331c: a9425bf5 ldp x21, x22, [sp, #32]
ffff800008eb3320: a94573fb ldp x27, x28, [sp, #80]
ffff800008eb3324: 394082e0 ldrb w0, [x23, #32]
ffff800008eb3328: 34000060 cbz w0, ffff800008eb3334 <etm4_enable_hw+0x19c>
ffff800008eb332c: aa1903e0 mov x0, x25
ffff800008eb3330: 97fffe8c bl ffff800008eb2d60 <etm4_cs_lock.isra.0.part.0>
main 6055/6055 [004] 0.000000000 etm4_enable_hw+0x198 [kernel.kallsyms]
ffff800008eb2d60 <etm4_cs_lock.isra.0.part.0>:
ffff800008eb2d60: d503201f nop
ffff800008eb2d64: d503201f nop
ffff800008eb2d68: d503233f paciasp
ffff800008eb2d6c: f9400000 ldr x0, [x0]
ffff800008eb2d70: d5033f9f dsb sy
ffff800008eb2d74: 913ec000 add x0, x0, #0xfb0
ffff800008eb2d78: b900001f str wzr, [x0]
ffff800008eb2d7c: d50323bf autiasp
ffff800008eb2d80: d65f03c0 ret
main 6055/6055 [004] 0.000000000 etm4_cs_lock.isra.0.part.0+0x20
Co-authored-by: Tor Jeremiassen <tor@ti.com>
Co-authored-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Co-authored-by: Al Grant <al.grant@arm.com>
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
.../scripts/python/arm-cs-trace-disasm.py | 275 ++++++++++++++++++
1 file changed, 275 insertions(+)
create mode 100755 tools/perf/scripts/python/arm-cs-trace-disasm.py
diff --git a/tools/perf/scripts/python/arm-cs-trace-disasm.py b/tools/perf/scripts/python/arm-cs-trace-disasm.py
new file mode 100755
index 000000000000..164c1f5e6930
--- /dev/null
+++ b/tools/perf/scripts/python/arm-cs-trace-disasm.py
@@ -0,0 +1,275 @@
+# SPDX-License-Identifier: GPL-2.0
+# arm-cs-trace-disasm.py: ARM CoreSight Trace Dump With Disassember
+#
+# Author: Tor Jeremiassen <tor@ti.com>
+# Mathieu Poirier <mathieu.poirier@linaro.org>
+# Leo Yan <leo.yan@linaro.org>
+# Al Grant <Al.Grant@arm.com>
+
+from __future__ import print_function
+import os
+from os import path
+import sys
+import re
+from subprocess import *
+from optparse import OptionParser, make_option
+
+from perf_trace_context import perf_set_itrace_options, \
+ perf_sample_insn, perf_sample_srccode
+
+# Below are some example commands for using this script.
+#
+# Output disassembly with objdump:
+# perf script -s scripts/python/arm-cs-trace-disasm.py \
+# -- -d objdump -k path/to/vmlinux
+# Output disassembly with llvm-objdump:
+# perf script -s scripts/python/arm-cs-trace-disasm.py \
+# -- -d llvm-objdump-11 -k path/to/vmlinux
+# Output only source line and symbols:
+# perf script -s scripts/python/arm-cs-trace-disasm.py
+
+# Command line parsing.
+option_list = [
+ # formatting options for the bottom entry of the stack
+ make_option("-k", "--vmlinux", dest="vmlinux_name",
+ help="Set path to vmlinux file"),
+ make_option("-d", "--objdump", dest="objdump_name",
+ help="Set path to objdump executable file"),
+ make_option("-v", "--verbose", dest="verbose",
+ action="store_true", default=False,
+ help="Enable debugging log")
+]
+
+parser = OptionParser(option_list=option_list)
+(options, args) = parser.parse_args()
+
+# Initialize global dicts and regular expression
+disasm_cache = dict()
+cpu_data = dict()
+disasm_re = re.compile("^\s*([0-9a-fA-F]+):")
+disasm_func_re = re.compile("^\s*([0-9a-fA-F]+)\s.*:")
+cache_size = 64*1024
+
+glb_source_file_name = None
+glb_line_number = None
+glb_dso = None
+
+def get_optional(perf_dict, field):
+ if field in perf_dict:
+ return perf_dict[field]
+ return "[unknown]"
+
+def get_offset(perf_dict, field):
+ if field in perf_dict:
+ return "+%#x" % perf_dict[field]
+ return ""
+
+def get_dso_file_path(dso_name, dso_build_id):
+ if (dso_name == "[kernel.kallsyms]" or dso_name == "vmlinux"):
+ if (options.vmlinux_name):
+ return options.vmlinux_name;
+ else:
+ return dso_name
+
+ if (dso_name == "[vdso]") :
+ append = "/vdso"
+ else:
+ append = "/elf"
+
+ dso_path = os.environ['PERF_BUILDID_DIR'] + "/" + dso_name + "/" + dso_build_id + append;
+ # Replace duplicate slash chars to single slash char
+ dso_path = dso_path.replace('//', '/', 1)
+ return dso_path
+
+def read_disam(dso_fname, dso_start, start_addr, stop_addr):
+ addr_range = str(start_addr) + ":" + str(stop_addr) + ":" + dso_fname
+
+ # Don't let the cache get too big, clear it when it hits max size
+ if (len(disasm_cache) > cache_size):
+ disasm_cache.clear();
+
+ try:
+ disasm_output = disasm_cache[addr_range];
+ except:
+ start_addr = start_addr - dso_start;
+ stop_addr = stop_addr - dso_start;
+ disasm = [ options.objdump_name, "-d", "-z",
+ "--start-address="+format(start_addr,"#x"),
+ "--stop-address="+format(stop_addr,"#x") ]
+ disasm += [ dso_fname ]
+ disasm_output = check_output(disasm).split('\n')
+ disasm_cache[addr_range] = disasm_output
+
+ return disasm_output
+
+def print_disam(dso_fname, dso_start, start_addr, stop_addr):
+ for line in read_disam(dso_fname, dso_start, start_addr, stop_addr):
+ m = disasm_func_re.search(line)
+ if m is None:
+ m = disasm_re.search(line)
+ if m is None:
+ continue
+ print("\t" + line)
+
+def print_sample(sample):
+ print("Sample = { cpu: 0x%d addr: 0x%x phys_addr: 0x%x ip: 0x%x " \
+ "pid: %d tid: %d period: %d time: %d }" % \
+ (sample['cpu'], sample['addr'], sample['phys_addr'], \
+ sample['ip'], sample['pid'], sample['tid'], \
+ sample['period'], sample['time']))
+
+def trace_begin():
+ print('ARM CoreSight Trace Data Assembler Dump')
+
+def trace_end():
+ print('End')
+
+def trace_unhandled(event_name, context, event_fields_dict):
+ print(' '.join(['%s=%s'%(k,str(v))for k,v in sorted(event_fields_dict.items())]))
+
+def common_start_str(comm, sample):
+ ts = sample["time"]
+ cpu = sample["cpu"]
+ pid = sample["pid"]
+ tid = sample["tid"]
+ return "%16s %5u/%-5u [%03u] %9u.%09u " % (comm, pid, tid, cpu, ts / 1000000000, ts %1000000000)
+
+# This code is copied from intel-pt-events.py for printing source code
+# line and symbols.
+def print_srccode(comm, param_dict, sample, symbol, dso):
+ ip = sample["ip"]
+ if symbol == "[unknown]":
+ start_str = common_start_str(comm, sample) + ("%x" % ip).rjust(16).ljust(40)
+ else:
+ offs = get_offset(param_dict, "symoff")
+ start_str = common_start_str(comm, sample) + (symbol + offs).ljust(40)
+
+ global glb_source_file_name
+ global glb_line_number
+ global glb_dso
+
+ source_file_name, line_number, source_line = perf_sample_srccode(perf_script_context)
+ if source_file_name:
+ if glb_line_number == line_number and glb_source_file_name == source_file_name:
+ src_str = ""
+ else:
+ if len(source_file_name) > 40:
+ src_file = ("..." + source_file_name[-37:]) + " "
+ else:
+ src_file = source_file_name.ljust(41)
+
+ src_str = src_file + str(line_number).rjust(4)
+
+ if source_line is None:
+ src_str = src_file + " <source not found>"
+ else:
+ src_str = src_file + " " + source_line
+ glb_dso = None
+ elif dso == glb_dso:
+ src_str = ""
+ else:
+ src_str = dso
+ glb_dso = dso
+
+ glb_line_number = line_number
+ glb_source_file_name = source_file_name
+
+ print(start_str, src_str)
+
+def process_event(param_dict):
+ global cache_size
+ global options
+
+ sample = param_dict["sample"]
+ comm = param_dict["comm"]
+
+ name = param_dict["ev_name"]
+ dso = get_optional(param_dict, "dso")
+ dso_bid = get_optional(param_dict, "dso_bid")
+ dso_start = get_optional(param_dict, "dso_map_start")
+ dso_end = get_optional(param_dict, "dso_map_end")
+ symbol = get_optional(param_dict, "symbol")
+
+ if (options.verbose == True):
+ print("Event type: %s" % name)
+ print_sample(sample)
+
+ # If cannot find dso so cannot dump assembler, bail out
+ if (dso == '[unknown]'):
+ return
+
+ # Validate dso start and end addresses
+ if ((dso_start == '[unknown]') or (dso_end == '[unknown]')):
+ print("Failed to find valid dso map for dso %s" % (dso))
+ return
+
+ if (name[0:12] == "instructions"):
+ print_srccode(comm, param_dict, sample, symbol, dso)
+ return
+
+ # Don't proceed if this event is not a branch sample, .
+ if (name[0:8] != "branches"):
+ return
+
+ cpu = sample["cpu"]
+ ip = sample["ip"]
+ addr = sample["addr"]
+
+ # Initialize CPU data if it's empty, and directly return back
+ # if this is the first tracing event for this CPU.
+ if (cpu_data.get(str(cpu) + 'addr') == None):
+ cpu_data[str(cpu) + 'addr'] = addr
+ return
+
+ # The format for packet is:
+ #
+ # +------------+------------+------------+
+ # sample_prev: | addr | ip | cpu |
+ # +------------+------------+------------+
+ # sample_next: | addr | ip | cpu |
+ # +------------+------------+------------+
+ #
+ # We need to combine the two continuous packets to get the instruction
+ # range for sample_prev::cpu:
+ #
+ # [ sample_prev::addr .. sample_next::ip ]
+ #
+ # For this purose, sample_prev::addr is stored into cpu_data structure
+ # and read back for 'start_addr' when the new packet comes, and we need
+ # to use sample_next::ip to calculate 'stop_addr', plusing extra 4 for
+ # 'stop_addr' is for the sake of objdump so the final assembler dump can
+ # include last instruction for sample_next::ip.
+ start_addr = cpu_data[str(cpu) + 'addr']
+ stop_addr = ip + 4
+
+ # Record for previous sample packet
+ cpu_data[str(cpu) + 'addr'] = addr
+
+ # Handle CS_ETM_TRACE_ON packet if start_addr=0 and stop_addr=4
+ if (start_addr == 0 and stop_addr == 4):
+ print("CPU%s: CS_ETM_TRACE_ON packet is inserted" % cpu)
+ return
+
+ if (start_addr < int(dso_start) or start_addr > int(dso_end)):
+ print("Start address 0x%x is out of range for dso %s [ 0x%x .. 0x%x ]" % (start_addr, dso, int(dso_start), int(dso_end)))
+ return
+
+ if (stop_addr < int(dso_start) or stop_addr > int(dso_end)):
+ print("Stop address 0x%x is out of range for dso %s [ 0x%x .. 0x%x ]" % (stop_addr, dso, int(dso_start), int(dso_end)))
+ return
+
+ if (options.objdump_name != None):
+ # It doesn't need to reduce virtual memory offset for disassembly
+ # if it's a kernel dso, so in this case set vm_start to zero.
+ if (dso == "[kernel.kallsyms]"):
+ dso_vm_start = 0
+ else:
+ dso_vm_start = int(dso_start)
+
+ dso_fname = get_dso_file_path(dso, dso_bid)
+ if path.exists(dso_fname):
+ print_disam(dso_fname, dso_vm_start, start_addr, stop_addr)
+ else:
+ print("Failed to find dso file %s s for address range [ 0x%x .. 0x%x ]" % (dso, start_addr, stop_addr))
+
+ print_srccode(comm, param_dict, sample, symbol, dso)
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v5 2/2] perf scripts python: Support Arm CoreSight trace data disassembly
2022-05-15 7:18 ` [PATCH v5 2/2] perf scripts python: Support Arm CoreSight trace data disassembly Leo Yan
@ 2022-05-15 21:18 ` Ian Rogers
2022-05-16 1:21 ` Leo Yan
0 siblings, 1 reply; 6+ messages in thread
From: Ian Rogers @ 2022-05-15 21:18 UTC (permalink / raw)
To: Leo Yan
Cc: Arnaldo Carvalho de Melo, James Clark, German Gomez,
Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Namhyung Kim, Adrian Hunter, Eelco Chaudron,
Stephen Brennan, Tanmay Jagdale, zengshun . wu, Al Grant,
coresight, linux-kernel, linux-perf-users, Tor Jeremiassen,
Mathieu Poirier
On Sun, May 15, 2022 at 12:19 AM Leo Yan <leo.yan@linaro.org> wrote:
>
> This commit adds python script to parse CoreSight tracing event and
> print out source line and disassembly, it generates readable program
> execution flow for easier humans inspecting.
>
> The script receives CoreSight tracing packet with below format:
>
> +------------+------------+------------+
> packet(n): | addr | ip | cpu |
> +------------+------------+------------+
> packet(n+1): | addr | ip | cpu |
> +------------+------------+------------+
>
> packet::addr presents the start address of the coming branch sample, and
> packet::ip is the last address of the branch smple. Therefore, a code
> section between branches starts from packet(n)::addr and it stops at
> packet(n+1)::ip. As results we combines the two continuous packets to
> generate the address range for instructions:
>
> [ sample(n)::addr .. sample(n+1)::ip ]
>
> The script supports both objdump or llvm-objdump for disassembly with
> specifying option '-d'. If doesn't specify option '-d', the script
> simply outputs source lines and symbols.
>
> Below shows usages with llvm-objdump or objdump to output disassembly.
>
> # perf script -s scripts/python/arm-cs-trace-disasm.py -- -d llvm-objdump-11 -k ./vmlinux
> ARM CoreSight Trace Data Assembler Dump
> ffff800008eb3198 <etm4_enable_hw>:
> ffff800008eb3310: c0 38 00 35 cbnz w0, 0xffff800008eb3a28 <etm4_enable_hw+0x890>
> ffff800008eb3314: 9f 3f 03 d5 dsb sy
> ffff800008eb3318: df 3f 03 d5 isb
> ffff800008eb331c: f5 5b 42 a9 ldp x21, x22, [sp, #32]
> ffff800008eb3320: fb 73 45 a9 ldp x27, x28, [sp, #80]
> ffff800008eb3324: e0 82 40 39 ldrb w0, [x23, #32]
> ffff800008eb3328: 60 00 00 34 cbz w0, 0xffff800008eb3334 <etm4_enable_hw+0x19c>
> ffff800008eb332c: e0 03 19 aa mov x0, x25
> ffff800008eb3330: 8c fe ff 97 bl 0xffff800008eb2d60 <etm4_cs_lock.isra.0.part.0>
> main 6055/6055 [004] 0.000000000 etm4_enable_hw+0x198 [kernel.kallsyms]
> ffff800008eb2d60 <etm4_cs_lock.isra.0.part.0>:
> ffff800008eb2d60: 1f 20 03 d5 nop
> ffff800008eb2d64: 1f 20 03 d5 nop
> ffff800008eb2d68: 3f 23 03 d5 hint #25
> ffff800008eb2d6c: 00 00 40 f9 ldr x0, [x0]
> ffff800008eb2d70: 9f 3f 03 d5 dsb sy
> ffff800008eb2d74: 00 c0 3e 91 add x0, x0, #4016
> ffff800008eb2d78: 1f 00 00 b9 str wzr, [x0]
> ffff800008eb2d7c: bf 23 03 d5 hint #29
> ffff800008eb2d80: c0 03 5f d6 ret
> main 6055/6055 [004] 0.000000000 etm4_cs_lock.isra.0.part.0+0x20
>
> # perf script -s scripts/python/arm-cs-trace-disasm.py -- -d objdump -k ./vmlinux
> ARM CoreSight Trace Data Assembler Dump
> ffff800008eb3310 <etm4_enable_hw+0x178>:
> ffff800008eb3310: 350038c0 cbnz w0, ffff800008eb3a28 <etm4_enable_hw+0x890>
> ffff800008eb3314: d5033f9f dsb sy
> ffff800008eb3318: d5033fdf isb
> ffff800008eb331c: a9425bf5 ldp x21, x22, [sp, #32]
> ffff800008eb3320: a94573fb ldp x27, x28, [sp, #80]
> ffff800008eb3324: 394082e0 ldrb w0, [x23, #32]
> ffff800008eb3328: 34000060 cbz w0, ffff800008eb3334 <etm4_enable_hw+0x19c>
> ffff800008eb332c: aa1903e0 mov x0, x25
> ffff800008eb3330: 97fffe8c bl ffff800008eb2d60 <etm4_cs_lock.isra.0.part.0>
> main 6055/6055 [004] 0.000000000 etm4_enable_hw+0x198 [kernel.kallsyms]
> ffff800008eb2d60 <etm4_cs_lock.isra.0.part.0>:
> ffff800008eb2d60: d503201f nop
> ffff800008eb2d64: d503201f nop
> ffff800008eb2d68: d503233f paciasp
> ffff800008eb2d6c: f9400000 ldr x0, [x0]
> ffff800008eb2d70: d5033f9f dsb sy
> ffff800008eb2d74: 913ec000 add x0, x0, #0xfb0
> ffff800008eb2d78: b900001f str wzr, [x0]
> ffff800008eb2d7c: d50323bf autiasp
> ffff800008eb2d80: d65f03c0 ret
> main 6055/6055 [004] 0.000000000 etm4_cs_lock.isra.0.part.0+0x20
>
> Co-authored-by: Tor Jeremiassen <tor@ti.com>
> Co-authored-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> Co-authored-by: Al Grant <al.grant@arm.com>
> Signed-off-by: Leo Yan <leo.yan@linaro.org>
This looks good to me and will run on python 2. The code would be more
idiomatic in python3 using f-strings. I'd rather the code was
idiomatic from the beginning, but others may disagree and prefer
python 2 compatibility (python 2 is now end of life). f-strings are
python 3.6+ and so have been supported for 5 years.
Thanks,
Ian
> ---
> .../scripts/python/arm-cs-trace-disasm.py | 275 ++++++++++++++++++
> 1 file changed, 275 insertions(+)
> create mode 100755 tools/perf/scripts/python/arm-cs-trace-disasm.py
>
> diff --git a/tools/perf/scripts/python/arm-cs-trace-disasm.py b/tools/perf/scripts/python/arm-cs-trace-disasm.py
> new file mode 100755
> index 000000000000..164c1f5e6930
> --- /dev/null
> +++ b/tools/perf/scripts/python/arm-cs-trace-disasm.py
> @@ -0,0 +1,275 @@
> +# SPDX-License-Identifier: GPL-2.0
> +# arm-cs-trace-disasm.py: ARM CoreSight Trace Dump With Disassember
> +#
> +# Author: Tor Jeremiassen <tor@ti.com>
> +# Mathieu Poirier <mathieu.poirier@linaro.org>
> +# Leo Yan <leo.yan@linaro.org>
> +# Al Grant <Al.Grant@arm.com>
> +
> +from __future__ import print_function
> +import os
> +from os import path
> +import sys
> +import re
> +from subprocess import *
> +from optparse import OptionParser, make_option
> +
> +from perf_trace_context import perf_set_itrace_options, \
> + perf_sample_insn, perf_sample_srccode
> +
> +# Below are some example commands for using this script.
> +#
> +# Output disassembly with objdump:
> +# perf script -s scripts/python/arm-cs-trace-disasm.py \
> +# -- -d objdump -k path/to/vmlinux
> +# Output disassembly with llvm-objdump:
> +# perf script -s scripts/python/arm-cs-trace-disasm.py \
> +# -- -d llvm-objdump-11 -k path/to/vmlinux
> +# Output only source line and symbols:
> +# perf script -s scripts/python/arm-cs-trace-disasm.py
> +
> +# Command line parsing.
> +option_list = [
> + # formatting options for the bottom entry of the stack
> + make_option("-k", "--vmlinux", dest="vmlinux_name",
> + help="Set path to vmlinux file"),
> + make_option("-d", "--objdump", dest="objdump_name",
> + help="Set path to objdump executable file"),
> + make_option("-v", "--verbose", dest="verbose",
> + action="store_true", default=False,
> + help="Enable debugging log")
> +]
> +
> +parser = OptionParser(option_list=option_list)
> +(options, args) = parser.parse_args()
> +
> +# Initialize global dicts and regular expression
> +disasm_cache = dict()
> +cpu_data = dict()
> +disasm_re = re.compile("^\s*([0-9a-fA-F]+):")
> +disasm_func_re = re.compile("^\s*([0-9a-fA-F]+)\s.*:")
> +cache_size = 64*1024
> +
> +glb_source_file_name = None
> +glb_line_number = None
> +glb_dso = None
> +
> +def get_optional(perf_dict, field):
> + if field in perf_dict:
> + return perf_dict[field]
> + return "[unknown]"
> +
> +def get_offset(perf_dict, field):
> + if field in perf_dict:
> + return "+%#x" % perf_dict[field]
> + return ""
> +
> +def get_dso_file_path(dso_name, dso_build_id):
> + if (dso_name == "[kernel.kallsyms]" or dso_name == "vmlinux"):
> + if (options.vmlinux_name):
> + return options.vmlinux_name;
> + else:
> + return dso_name
> +
> + if (dso_name == "[vdso]") :
> + append = "/vdso"
> + else:
> + append = "/elf"
> +
> + dso_path = os.environ['PERF_BUILDID_DIR'] + "/" + dso_name + "/" + dso_build_id + append;
> + # Replace duplicate slash chars to single slash char
> + dso_path = dso_path.replace('//', '/', 1)
> + return dso_path
> +
> +def read_disam(dso_fname, dso_start, start_addr, stop_addr):
> + addr_range = str(start_addr) + ":" + str(stop_addr) + ":" + dso_fname
> +
> + # Don't let the cache get too big, clear it when it hits max size
> + if (len(disasm_cache) > cache_size):
> + disasm_cache.clear();
> +
> + try:
> + disasm_output = disasm_cache[addr_range];
> + except:
> + start_addr = start_addr - dso_start;
> + stop_addr = stop_addr - dso_start;
> + disasm = [ options.objdump_name, "-d", "-z",
> + "--start-address="+format(start_addr,"#x"),
> + "--stop-address="+format(stop_addr,"#x") ]
> + disasm += [ dso_fname ]
> + disasm_output = check_output(disasm).split('\n')
> + disasm_cache[addr_range] = disasm_output
> +
> + return disasm_output
> +
> +def print_disam(dso_fname, dso_start, start_addr, stop_addr):
> + for line in read_disam(dso_fname, dso_start, start_addr, stop_addr):
> + m = disasm_func_re.search(line)
> + if m is None:
> + m = disasm_re.search(line)
> + if m is None:
> + continue
> + print("\t" + line)
> +
> +def print_sample(sample):
> + print("Sample = { cpu: 0x%d addr: 0x%x phys_addr: 0x%x ip: 0x%x " \
> + "pid: %d tid: %d period: %d time: %d }" % \
> + (sample['cpu'], sample['addr'], sample['phys_addr'], \
> + sample['ip'], sample['pid'], sample['tid'], \
> + sample['period'], sample['time']))
> +
> +def trace_begin():
> + print('ARM CoreSight Trace Data Assembler Dump')
> +
> +def trace_end():
> + print('End')
> +
> +def trace_unhandled(event_name, context, event_fields_dict):
> + print(' '.join(['%s=%s'%(k,str(v))for k,v in sorted(event_fields_dict.items())]))
> +
> +def common_start_str(comm, sample):
> + ts = sample["time"]
> + cpu = sample["cpu"]
> + pid = sample["pid"]
> + tid = sample["tid"]
> + return "%16s %5u/%-5u [%03u] %9u.%09u " % (comm, pid, tid, cpu, ts / 1000000000, ts %1000000000)
> +
> +# This code is copied from intel-pt-events.py for printing source code
> +# line and symbols.
> +def print_srccode(comm, param_dict, sample, symbol, dso):
> + ip = sample["ip"]
> + if symbol == "[unknown]":
> + start_str = common_start_str(comm, sample) + ("%x" % ip).rjust(16).ljust(40)
> + else:
> + offs = get_offset(param_dict, "symoff")
> + start_str = common_start_str(comm, sample) + (symbol + offs).ljust(40)
> +
> + global glb_source_file_name
> + global glb_line_number
> + global glb_dso
> +
> + source_file_name, line_number, source_line = perf_sample_srccode(perf_script_context)
> + if source_file_name:
> + if glb_line_number == line_number and glb_source_file_name == source_file_name:
> + src_str = ""
> + else:
> + if len(source_file_name) > 40:
> + src_file = ("..." + source_file_name[-37:]) + " "
> + else:
> + src_file = source_file_name.ljust(41)
> +
> + src_str = src_file + str(line_number).rjust(4)
> +
> + if source_line is None:
> + src_str = src_file + " <source not found>"
> + else:
> + src_str = src_file + " " + source_line
> + glb_dso = None
> + elif dso == glb_dso:
> + src_str = ""
> + else:
> + src_str = dso
> + glb_dso = dso
> +
> + glb_line_number = line_number
> + glb_source_file_name = source_file_name
> +
> + print(start_str, src_str)
> +
> +def process_event(param_dict):
> + global cache_size
> + global options
> +
> + sample = param_dict["sample"]
> + comm = param_dict["comm"]
> +
> + name = param_dict["ev_name"]
> + dso = get_optional(param_dict, "dso")
> + dso_bid = get_optional(param_dict, "dso_bid")
> + dso_start = get_optional(param_dict, "dso_map_start")
> + dso_end = get_optional(param_dict, "dso_map_end")
> + symbol = get_optional(param_dict, "symbol")
> +
> + if (options.verbose == True):
> + print("Event type: %s" % name)
> + print_sample(sample)
> +
> + # If cannot find dso so cannot dump assembler, bail out
> + if (dso == '[unknown]'):
> + return
> +
> + # Validate dso start and end addresses
> + if ((dso_start == '[unknown]') or (dso_end == '[unknown]')):
> + print("Failed to find valid dso map for dso %s" % (dso))
> + return
> +
> + if (name[0:12] == "instructions"):
> + print_srccode(comm, param_dict, sample, symbol, dso)
> + return
> +
> + # Don't proceed if this event is not a branch sample, .
> + if (name[0:8] != "branches"):
> + return
> +
> + cpu = sample["cpu"]
> + ip = sample["ip"]
> + addr = sample["addr"]
> +
> + # Initialize CPU data if it's empty, and directly return back
> + # if this is the first tracing event for this CPU.
> + if (cpu_data.get(str(cpu) + 'addr') == None):
> + cpu_data[str(cpu) + 'addr'] = addr
> + return
> +
> + # The format for packet is:
> + #
> + # +------------+------------+------------+
> + # sample_prev: | addr | ip | cpu |
> + # +------------+------------+------------+
> + # sample_next: | addr | ip | cpu |
> + # +------------+------------+------------+
> + #
> + # We need to combine the two continuous packets to get the instruction
> + # range for sample_prev::cpu:
> + #
> + # [ sample_prev::addr .. sample_next::ip ]
> + #
> + # For this purose, sample_prev::addr is stored into cpu_data structure
> + # and read back for 'start_addr' when the new packet comes, and we need
> + # to use sample_next::ip to calculate 'stop_addr', plusing extra 4 for
> + # 'stop_addr' is for the sake of objdump so the final assembler dump can
> + # include last instruction for sample_next::ip.
> + start_addr = cpu_data[str(cpu) + 'addr']
> + stop_addr = ip + 4
> +
> + # Record for previous sample packet
> + cpu_data[str(cpu) + 'addr'] = addr
> +
> + # Handle CS_ETM_TRACE_ON packet if start_addr=0 and stop_addr=4
> + if (start_addr == 0 and stop_addr == 4):
> + print("CPU%s: CS_ETM_TRACE_ON packet is inserted" % cpu)
> + return
> +
> + if (start_addr < int(dso_start) or start_addr > int(dso_end)):
> + print("Start address 0x%x is out of range for dso %s [ 0x%x .. 0x%x ]" % (start_addr, dso, int(dso_start), int(dso_end)))
> + return
> +
> + if (stop_addr < int(dso_start) or stop_addr > int(dso_end)):
> + print("Stop address 0x%x is out of range for dso %s [ 0x%x .. 0x%x ]" % (stop_addr, dso, int(dso_start), int(dso_end)))
> + return
> +
> + if (options.objdump_name != None):
> + # It doesn't need to reduce virtual memory offset for disassembly
> + # if it's a kernel dso, so in this case set vm_start to zero.
> + if (dso == "[kernel.kallsyms]"):
> + dso_vm_start = 0
> + else:
> + dso_vm_start = int(dso_start)
> +
> + dso_fname = get_dso_file_path(dso, dso_bid)
> + if path.exists(dso_fname):
> + print_disam(dso_fname, dso_vm_start, start_addr, stop_addr)
> + else:
> + print("Failed to find dso file %s s for address range [ 0x%x .. 0x%x ]" % (dso, start_addr, stop_addr))
> +
> + print_srccode(comm, param_dict, sample, symbol, dso)
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v5 2/2] perf scripts python: Support Arm CoreSight trace data disassembly
2022-05-15 21:18 ` Ian Rogers
@ 2022-05-16 1:21 ` Leo Yan
0 siblings, 0 replies; 6+ messages in thread
From: Leo Yan @ 2022-05-16 1:21 UTC (permalink / raw)
To: Ian Rogers
Cc: Arnaldo Carvalho de Melo, James Clark, German Gomez,
Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Namhyung Kim, Adrian Hunter, Eelco Chaudron,
Stephen Brennan, Tanmay Jagdale, zengshun . wu, Al Grant,
coresight, linux-kernel, linux-perf-users, Tor Jeremiassen,
Mathieu Poirier
On Sun, May 15, 2022 at 02:18:53PM -0700, Ian Rogers wrote:
[...]
> This looks good to me and will run on python 2. The code would be more
> idiomatic in python3 using f-strings. I'd rather the code was
> idiomatic from the beginning, but others may disagree and prefer
> python 2 compatibility (python 2 is now end of life). f-strings are
> python 3.6+ and so have been supported for 5 years.
Using f-string is the right thing for me, will update.
Thanks for reviewing and suggestion!
Leo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v5 1/2] perf scripting python: Expose dso and map information
2022-05-15 7:18 ` [PATCH v5 1/2] perf scripting python: Expose dso and map information Leo Yan
@ 2022-05-16 6:51 ` Adrian Hunter
0 siblings, 0 replies; 6+ messages in thread
From: Adrian Hunter @ 2022-05-16 6:51 UTC (permalink / raw)
To: Leo Yan, Arnaldo Carvalho de Melo, James Clark, German Gomez,
Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Namhyung Kim, Ian Rogers, Eelco Chaudron,
Stephen Brennan, Tanmay Jagdale, zengshun . wu, Al Grant,
coresight, linux-kernel, linux-perf-users
On 15/05/22 10:18, Leo Yan wrote:
> This change adds dso build_id and corresponding map's start and end
> address. The info of dso build_id can be used to find dso file path,
> and we can validate if a branch address falls into the range of map's
> start and end addresses.
>
> In addition, the map's start address can be used as an offset for
> disassembly.
>
> Signed-off-by: Leo Yan <leo.yan@linaro.org>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
> ---
> .../scripting-engines/trace-event-python.c | 21 +++++++++++++++----
> 1 file changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
> index 659eb4e4b34b..adba01b7d9dd 100644
> --- a/tools/perf/util/scripting-engines/trace-event-python.c
> +++ b/tools/perf/util/scripting-engines/trace-event-python.c
> @@ -755,12 +755,22 @@ static void set_regs_in_dict(PyObject *dict,
> }
>
> static void set_sym_in_dict(PyObject *dict, struct addr_location *al,
> - const char *dso_field, const char *sym_field,
> - const char *symoff_field)
> + const char *dso_field, const char *dso_bid_field,
> + const char *dso_map_start, const char *dso_map_end,
> + const char *sym_field, const char *symoff_field)
> {
> + char sbuild_id[SBUILD_ID_SIZE];
> +
> if (al->map) {
> pydict_set_item_string_decref(dict, dso_field,
> _PyUnicode_FromString(al->map->dso->name));
> + build_id__sprintf(&al->map->dso->bid, sbuild_id);
> + pydict_set_item_string_decref(dict, dso_bid_field,
> + _PyUnicode_FromString(sbuild_id));
> + pydict_set_item_string_decref(dict, dso_map_start,
> + PyLong_FromUnsignedLong(al->map->start));
> + pydict_set_item_string_decref(dict, dso_map_end,
> + PyLong_FromUnsignedLong(al->map->end));
> }
> if (al->sym) {
> pydict_set_item_string_decref(dict, sym_field,
> @@ -840,7 +850,8 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample,
> (const char *)sample->raw_data, sample->raw_size));
> pydict_set_item_string_decref(dict, "comm",
> _PyUnicode_FromString(thread__comm_str(al->thread)));
> - set_sym_in_dict(dict, al, "dso", "symbol", "symoff");
> + set_sym_in_dict(dict, al, "dso", "dso_bid", "dso_map_start", "dso_map_end",
> + "symbol", "symoff");
>
> pydict_set_item_string_decref(dict, "callchain", callchain);
>
> @@ -856,7 +867,9 @@ static PyObject *get_perf_sample_dict(struct perf_sample *sample,
> if (addr_al) {
> pydict_set_item_string_decref(dict_sample, "addr_correlates_sym",
> PyBool_FromLong(1));
> - set_sym_in_dict(dict_sample, addr_al, "addr_dso", "addr_symbol", "addr_symoff");
> + set_sym_in_dict(dict_sample, addr_al, "addr_dso", "addr_dso_bid",
> + "addr_dso_map_start", "addr_dso_map_end",
> + "addr_symbol", "addr_symoff");
> }
>
> if (sample->flags)
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-05-16 6:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-15 7:18 [PATCH v5 0/2] perf script python: Add script for CoreSight disassembly Leo Yan
2022-05-15 7:18 ` [PATCH v5 1/2] perf scripting python: Expose dso and map information Leo Yan
2022-05-16 6:51 ` Adrian Hunter
2022-05-15 7:18 ` [PATCH v5 2/2] perf scripts python: Support Arm CoreSight trace data disassembly Leo Yan
2022-05-15 21:18 ` Ian Rogers
2022-05-16 1:21 ` Leo Yan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.