Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf: script: add raw|disasm arguments to --insn-trace option

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

authored by

Changbin Du and committed by
Namhyung Kim
6750ba4b 99417234

+22 -7
+4 -3
tools/perf/Documentation/perf-script.txt
··· 442 442 will be printed. Each entry has function name and file/line. Enabled by 443 443 default, disable with --no-inline. 444 444 445 - --insn-trace:: 446 - Show instruction stream for intel_pt traces. Combine with --xed to 447 - show disassembly. 445 + --insn-trace[=<raw|disasm>]:: 446 + Show instruction stream in bytes (raw) or disassembled (disasm) 447 + for intel_pt traces. The default is 'raw'. To use xed, combine 448 + 'raw' with --xed to show disassembly done by xed. 448 449 449 450 --xed:: 450 451 Run xed disassembler on output. Requires installing the xed disassembler.
+18 -4
tools/perf/builtin-script.c
··· 3788 3788 #endif 3789 3789 3790 3790 static int parse_insn_trace(const struct option *opt __maybe_unused, 3791 - const char *str __maybe_unused, 3792 - int unset __maybe_unused) 3791 + const char *str, int unset __maybe_unused) 3793 3792 { 3794 - parse_output_fields(NULL, "+insn,-event,-period", 0); 3793 + const char *fields = "+insn,-event,-period"; 3794 + int ret; 3795 + 3796 + if (str) { 3797 + if (strcmp(str, "disasm") == 0) 3798 + fields = "+disasm,-event,-period"; 3799 + else if (strlen(str) != 0 && strcmp(str, "raw") != 0) { 3800 + fprintf(stderr, "Only accept raw|disasm\n"); 3801 + return -EINVAL; 3802 + } 3803 + } 3804 + 3805 + ret = parse_output_fields(NULL, fields, 0); 3806 + if (ret < 0) 3807 + return ret; 3808 + 3795 3809 itrace_parse_synth_opts(opt, "i0ns", 0); 3796 3810 symbol_conf.nanosecs = true; 3797 3811 return 0; ··· 3951 3937 "only consider these symbols"), 3952 3938 OPT_INTEGER(0, "addr-range", &symbol_conf.addr_range, 3953 3939 "Use with -S to list traced records within address range"), 3954 - OPT_CALLBACK_OPTARG(0, "insn-trace", &itrace_synth_opts, NULL, NULL, 3940 + OPT_CALLBACK_OPTARG(0, "insn-trace", &itrace_synth_opts, NULL, "raw|disasm", 3955 3941 "Decode instructions from itrace", parse_insn_trace), 3956 3942 OPT_CALLBACK_OPTARG(0, "xed", NULL, NULL, NULL, 3957 3943 "Run xed disassembler on output", parse_xed),