mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
perf: script: add raw|disasm arguments to --insn-trace option
[ Upstream commit6750ba4b64
] Now '--insn-trace' accept a argument to specify the output format: - raw: display raw instructions. - disasm: display mnemonic instructions (if capstone is installed). $ sudo perf script --insn-trace=raw ls 1443864 [006] 2275506.209908875: 7f216b426100 _start+0x0 (/usr/lib/x86_64-linux-gnu/ld-2.31.so) insn: 48 89 e7 ls 1443864 [006] 2275506.209908875: 7f216b426103 _start+0x3 (/usr/lib/x86_64-linux-gnu/ld-2.31.so) insn: e8 e8 0c 00 00 ls 1443864 [006] 2275506.209908875: 7f216b426df0 _dl_start+0x0 (/usr/lib/x86_64-linux-gnu/ld-2.31.so) insn: f3 0f 1e fa $ sudo perf script --insn-trace=disasm ls 1443864 [006] 2275506.209908875: 7f216b426100 _start+0x0 (/usr/lib/x86_64-linux-gnu/ld-2.31.so) movq %rsp, %rdi ls 1443864 [006] 2275506.209908875: 7f216b426103 _start+0x3 (/usr/lib/x86_64-linux-gnu/ld-2.31.so) callq _dl_start+0x0 ls 1443864 [006] 2275506.209908875: 7f216b426df0 _dl_start+0x0 (/usr/lib/x86_64-linux-gnu/ld-2.31.so) illegal instruction ls 1443864 [006] 2275506.209908875: 7f216b426df4 _dl_start+0x4 (/usr/lib/x86_64-linux-gnu/ld-2.31.so) pushq %rbp ls 1443864 [006] 2275506.209908875: 7f216b426df5 _dl_start+0x5 (/usr/lib/x86_64-linux-gnu/ld-2.31.so) movq %rsp, %rbp ls 1443864 [006] 2275506.209908875: 7f216b426df8 _dl_start+0x8 (/usr/lib/x86_64-linux-gnu/ld-2.31.so) pushq %r15 Signed-off-by: Changbin Du <changbin.du@huawei.com> Reviewed-by: Adrian Hunter <adrian.hunter@intel.com> Cc: changbin.du@gmail.com Cc: Thomas Richter <tmricht@linux.ibm.com> Cc: Andi Kleen <ak@linux.intel.com> Signed-off-by: Namhyung Kim <namhyung@kernel.org> Link: https://lore.kernel.org/r/20240217074046.4100789-5-changbin.du@huawei.com Stable-dep-of:d4a98b45fb
("perf script: Show also errors for --insn-trace option") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
23b1940096
commit
0ea11a1124
2 changed files with 22 additions and 7 deletions
|
@ -441,9 +441,10 @@ include::itrace.txt[]
|
||||||
will be printed. Each entry has function name and file/line. Enabled by
|
will be printed. Each entry has function name and file/line. Enabled by
|
||||||
default, disable with --no-inline.
|
default, disable with --no-inline.
|
||||||
|
|
||||||
--insn-trace::
|
--insn-trace[=<raw|disasm>]::
|
||||||
Show instruction stream for intel_pt traces. Combine with --xed to
|
Show instruction stream in bytes (raw) or disassembled (disasm)
|
||||||
show disassembly.
|
for intel_pt traces. The default is 'raw'. To use xed, combine
|
||||||
|
'raw' with --xed to show disassembly done by xed.
|
||||||
|
|
||||||
--xed::
|
--xed::
|
||||||
Run xed disassembler on output. Requires installing the xed disassembler.
|
Run xed disassembler on output. Requires installing the xed disassembler.
|
||||||
|
|
|
@ -3765,10 +3765,24 @@ static int perf_script__process_auxtrace_info(struct perf_session *session,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static int parse_insn_trace(const struct option *opt __maybe_unused,
|
static int parse_insn_trace(const struct option *opt __maybe_unused,
|
||||||
const char *str __maybe_unused,
|
const char *str, int unset __maybe_unused)
|
||||||
int unset __maybe_unused)
|
|
||||||
{
|
{
|
||||||
parse_output_fields(NULL, "+insn,-event,-period", 0);
|
const char *fields = "+insn,-event,-period";
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
if (str) {
|
||||||
|
if (strcmp(str, "disasm") == 0)
|
||||||
|
fields = "+disasm,-event,-period";
|
||||||
|
else if (strlen(str) != 0 && strcmp(str, "raw") != 0) {
|
||||||
|
fprintf(stderr, "Only accept raw|disasm\n");
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = parse_output_fields(NULL, fields, 0);
|
||||||
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
itrace_parse_synth_opts(opt, "i0ns", 0);
|
itrace_parse_synth_opts(opt, "i0ns", 0);
|
||||||
symbol_conf.nanosecs = true;
|
symbol_conf.nanosecs = true;
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -3914,7 +3928,7 @@ int cmd_script(int argc, const char **argv)
|
||||||
"only consider these symbols"),
|
"only consider these symbols"),
|
||||||
OPT_INTEGER(0, "addr-range", &symbol_conf.addr_range,
|
OPT_INTEGER(0, "addr-range", &symbol_conf.addr_range,
|
||||||
"Use with -S to list traced records within address range"),
|
"Use with -S to list traced records within address range"),
|
||||||
OPT_CALLBACK_OPTARG(0, "insn-trace", &itrace_synth_opts, NULL, NULL,
|
OPT_CALLBACK_OPTARG(0, "insn-trace", &itrace_synth_opts, NULL, "raw|disasm",
|
||||||
"Decode instructions from itrace", parse_insn_trace),
|
"Decode instructions from itrace", parse_insn_trace),
|
||||||
OPT_CALLBACK_OPTARG(0, "xed", NULL, NULL, NULL,
|
OPT_CALLBACK_OPTARG(0, "xed", NULL, NULL, NULL,
|
||||||
"Run xed disassembler on output", parse_xed),
|
"Run xed disassembler on output", parse_xed),
|
||||||
|
|
Loading…
Reference in a new issue