From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC6D0225AF for ; Fri, 22 Mar 2024 10:21:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711102911; cv=none; b=ulAFGhH1ukJBFKPat4BUvzPIaNNVNeAffZ57TlMoxornMBRfT+DPJFA8F2C5FCnG/n051aoO3CnXj4rXXPdHnubWTJSk1PJrErYcncissPcY5bdY8oUuS+hUuIgZ3U2Hrm46gOSjhzjhZcGLlflLu6cdmtH4ht5NHd0+mS0SRYM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711102911; c=relaxed/simple; bh=vN34AKhFslawvnnLyZQcVj4vggqMuYAyZh2VOGaBbtg=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=adUhD/V/z5/qY02Yjb9VM1ytYDSBYGcBPMcu0N2rif9ieTk5X5yxm0iLtEAm03XJrXaZvNtchD//2Rz3pWHeCwNwBShIco2gcEE1afSsL/+KoUcopdRVezlPQ9pcGmCnsIesCumGaEYN5kZm6RYqOKM1yuf2NPNIrwQhiWWTIBM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=hwa0ToDI; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="hwa0ToDI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711102910; x=1742638910; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=vN34AKhFslawvnnLyZQcVj4vggqMuYAyZh2VOGaBbtg=; b=hwa0ToDIyl6KgYvemJH7WueWckRq7CPYBuiUIiPMv2qXDRHtp0slVi0M dqTQBMVXAlll/gis67s6TXIP6+3QAvohPr+oUjJIgOJbHZUT9TJr+qXiS 4vGouvKw0PdUZogqzrgfm1BIIsLnzaJHwRHd8FmEWKVufu5B7hZuOM8P3 6EkEDmEoBfCELzWMSMWSPSVrE7uREfglKB18HKBh31uHKGtOW4arcIqJQ AyFBUp0/qTN7cOEeGAMopwJ9+Ss3oL4092KxWAkJpgwEzQShpqC1MVKBC S8jHDHIyFf4dV3e6Jdl3Cz8+UikeWw/HtEFqdcSOmwZC4kejt0b7XK+kW Q==; X-IronPort-AV: E=McAfee;i="6600,9927,11020"; a="16690292" X-IronPort-AV: E=Sophos;i="6.07,145,1708416000"; d="scan'208";a="16690292" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Mar 2024 03:21:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,145,1708416000"; d="scan'208";a="14773530" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO [10.0.2.15]) ([10.252.37.137]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Mar 2024 03:21:46 -0700 Message-ID: <2a9fd2b3-770b-407c-9810-af35eb39c19a@intel.com> Date: Fri, 22 Mar 2024 12:21:42 +0200 Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 2/2] perf, script, capstone: Add support for -F +brstackdisasm To: Andi Kleen Cc: changbin.du@huawei.com, Jiri Olsa , Arnaldo Carvalho de Melo , Ian Rogers , Namhyung Kim , linux-perf-users@vger.kernel.org References: <20240308170611.719794-1-ak@linux.intel.com> <20240308170611.719794-2-ak@linux.intel.com> Content-Language: en-US From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki In-Reply-To: <20240308170611.719794-2-ak@linux.intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 8/03/24 19:06, Andi Kleen wrote: > Support capstone output for the -F +brstackinsn branch dump. > The new output is enabled with the new field brstackdisasm > This was possible before with --xed, but now also allow > it for users that don't have xed using the builtin capstone support. > > Before: > > perf record -b emacs -Q --batch '()' > perf script -F +brstackinsn > ... > emacs 55778 1814366.755945: 151564 cycles:P: 7f0ab2d17192 intel_check_word.constprop.0+0x162 (/usr/lib64/ld-linux-x86-64.s> intel_check_word.constprop.0+237: > 00007f0ab2d1711d insn: 75 e6 # PRED 3 cycles [3] > 00007f0ab2d17105 insn: 73 51 > 00007f0ab2d17107 insn: 48 89 c1 > 00007f0ab2d1710a insn: 48 39 ca > 00007f0ab2d1710d insn: 73 96 > 00007f0ab2d1710f insn: 48 8d 04 11 > 00007f0ab2d17113 insn: 48 d1 e8 > 00007f0ab2d17116 insn: 49 8d 34 c1 > 00007f0ab2d1711a insn: 44 3a 06 > 00007f0ab2d1711d insn: 75 e6 # PRED 3 cycles [6] 3.00 IPC > 00007f0ab2d17105 insn: 73 51 # PRED 1 cycles [7] 1.00 IPC > 00007f0ab2d17158 insn: 48 8d 50 01 > 00007f0ab2d1715c insn: eb 92 # PRED 1 cycles [8] 2.00 IPC > 00007f0ab2d170f0 insn: 48 39 ca > 00007f0ab2d170f3 insn: 73 b0 # PRED 1 cycles [9] 2.00 IPC > > After (perf must be compiled with capstone): > > perf script -F +brstackdisasm > > ... > emacs 55778 1814366.755945: 151564 cycles:P: 7f0ab2d17192 intel_check_word.constprop.0+0x162 (/usr/lib64/ld-linux-x86-64.s> intel_check_word.constprop.0+237: > 00007f0ab2d1711d jne intel_check_word.constprop.0+0xd5 # PRED 3 cycles [3] > 00007f0ab2d17105 jae intel_check_word.constprop.0+0x128 > 00007f0ab2d17107 movq %rax, %rcx > 00007f0ab2d1710a cmpq %rcx, %rdx > 00007f0ab2d1710d jae intel_check_word.constprop.0+0x75 > 00007f0ab2d1710f leaq (%rcx, %rdx), %rax > 00007f0ab2d17113 shrq $1, %rax > 00007f0ab2d17116 leaq (%r9, %rax, 8), %rsi > 00007f0ab2d1711a cmpb (%rsi), %r8b > 00007f0ab2d1711d jne intel_check_word.constprop.0+0xd5 # PRED 3 cycles [6] 3.00 IPC > 00007f0ab2d17105 jae intel_check_word.constprop.0+0x128 # PRED 1 cycles [7] 1.00 IPC > 00007f0ab2d17158 leaq 1(%rax), %rdx > 00007f0ab2d1715c jmp intel_check_word.constprop.0+0xc0 # PRED 1 cycles [8] 2.00 IPC > 00007f0ab2d170f0 cmpq %rcx, %rdx > 00007f0ab2d170f3 jae intel_check_word.constprop.0+0x75 # PRED 1 cycles [9] 2.00 IPC > > Signed-off-by: Andi Kleen Comma in subject is slightly odd, and needs fixes to build with NO_CAPSTONE=1 diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index db18d2c54c59..59933bd52e0f 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -1165,7 +1165,7 @@ static int print_srccode(struct thread *thread, u8 cpumode, uint64_t addr) return ret; } -static const char *any_dump_insn(struct perf_event_attr *attr, +static const char *any_dump_insn(struct perf_event_attr *attr __maybe_unused, struct perf_insn *x, uint64_t ip, u8 *inbuf, int inlen, int *lenp) { diff --git a/tools/perf/util/print_insn.c b/tools/perf/util/print_insn.c index bca4449f0fa8..8825330d435f 100644 --- a/tools/perf/util/print_insn.c +++ b/tools/perf/util/print_insn.c @@ -196,7 +196,8 @@ size_t sample__fprintf_insn_asm(struct perf_sample *sample, struct thread *threa size_t sample__fprintf_insn_asm(struct perf_sample *sample __maybe_unused, struct thread *thread __maybe_unused, struct machine *machine __maybe_unused, - FILE *fp __maybe_unused) + FILE *fp __maybe_unused, + struct addr_location *al __maybe_unused) { return 0; } Otherwise: Reviewed-by: Adrian Hunter > > --- > > v2: Use brstackdisasm instead of keying of disasm > --- > tools/perf/Documentation/perf-script.txt | 7 +++- > tools/perf/builtin-script.c | 32 +++++++++++---- > tools/perf/util/dump-insn.h | 1 + > tools/perf/util/print_insn.c | 52 ++++++++++++++++++++++++ > tools/perf/util/print_insn.h | 3 ++ > 5 files changed, 86 insertions(+), 9 deletions(-) > > diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt > index 005e51df855e..ff086ef05a0c 100644 > --- a/tools/perf/Documentation/perf-script.txt > +++ b/tools/perf/Documentation/perf-script.txt > @@ -132,9 +132,9 @@ OPTIONS > Comma separated list of fields to print. Options are: > comm, tid, pid, time, cpu, event, trace, ip, sym, dso, dsoff, addr, symoff, > srcline, period, iregs, uregs, brstack, brstacksym, flags, bpf-output, > - brstackinsn, brstackinsnlen, brstackoff, callindent, insn, disasm, > + brstackinsn, brstackinsnlen, brstackdisasm, brstackoff, callindent, insn, disasm, > insnlen, synth, phys_addr, metric, misc, srccode, ipc, data_page_size, > - code_page_size, ins_lat, machine_pid, vcpu, cgroup, retire_lat. > + code_page_size, ins_lat, machine_pid, vcpu, cgroup, retire_lat, > > Field list can be prepended with the type, trace, sw or hw, > to indicate to which event type the field list applies. > @@ -257,6 +257,9 @@ OPTIONS > can’t know the next sequential instruction after an unconditional branch unless > you calculate that based on its length. > > + brstackdisasm acts like brstackinsn, but will print disassembled instructions if > + perf is built with the capstone library. > + > The brstackoff field will print an offset into a specific dso/binary. > > With the metric option perf script can compute metrics for > diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c > index 0299b1ed8744..db18d2c54c59 100644 > --- a/tools/perf/builtin-script.c > +++ b/tools/perf/builtin-script.c > @@ -136,6 +136,7 @@ enum perf_output_field { > PERF_OUTPUT_RETIRE_LAT = 1ULL << 40, > PERF_OUTPUT_DSOFF = 1ULL << 41, > PERF_OUTPUT_DISASM = 1ULL << 42, > + PERF_OUTPUT_BRSTACKDISASM = 1ULL << 43, > }; > > struct perf_script { > @@ -210,6 +211,7 @@ struct output_option { > {.str = "vcpu", .field = PERF_OUTPUT_VCPU}, > {.str = "cgroup", .field = PERF_OUTPUT_CGROUP}, > {.str = "retire_lat", .field = PERF_OUTPUT_RETIRE_LAT}, > + {.str = "brstackdisasm", .field = PERF_OUTPUT_BRSTACKDISASM}, > }; > > enum { > @@ -510,7 +512,8 @@ static int evsel__check_attr(struct evsel *evsel, struct perf_session *session) > "selected. Hence, no address to lookup the source line number.\n"); > return -EINVAL; > } > - if ((PRINT_FIELD(BRSTACKINSN) || PRINT_FIELD(BRSTACKINSNLEN)) && !allow_user_set && > + if ((PRINT_FIELD(BRSTACKINSN) || PRINT_FIELD(BRSTACKINSNLEN) || PRINT_FIELD(BRSTACKDISASM)) > + && !allow_user_set && > !(evlist__combined_branch_type(session->evlist) & PERF_SAMPLE_BRANCH_ANY)) { > pr_err("Display of branch stack assembler requested, but non all-branch filter set\n" > "Hint: run 'perf record -b ...'\n"); > @@ -1162,6 +1165,20 @@ static int print_srccode(struct thread *thread, u8 cpumode, uint64_t addr) > return ret; > } > > +static const char *any_dump_insn(struct perf_event_attr *attr, > + struct perf_insn *x, uint64_t ip, > + u8 *inbuf, int inlen, int *lenp) > +{ > +#ifdef HAVE_LIBCAPSTONE_SUPPORT > + if (PRINT_FIELD(BRSTACKDISASM)) { > + const char *p = cs_dump_insn(x, ip, inbuf, inlen, lenp); > + if (p) > + return p; > + } > +#endif > + return dump_insn(x, ip, inbuf, inlen, lenp); > +} > + > static int ip__fprintf_jump(uint64_t ip, struct branch_entry *en, > struct perf_insn *x, u8 *inbuf, int len, > int insn, FILE *fp, int *total_cycles, > @@ -1170,7 +1187,7 @@ static int ip__fprintf_jump(uint64_t ip, struct branch_entry *en, > { > int ilen = 0; > int printed = fprintf(fp, "\t%016" PRIx64 "\t%-30s\t", ip, > - dump_insn(x, ip, inbuf, len, &ilen)); > + any_dump_insn(attr, x, ip, inbuf, len, &ilen)); > > if (PRINT_FIELD(BRSTACKINSNLEN)) > printed += fprintf(fp, "ilen: %d\t", ilen); > @@ -1262,6 +1279,7 @@ static int perf_sample__fprintf_brstackinsn(struct perf_sample *sample, > nr = max_blocks + 1; > > x.thread = thread; > + x.machine = machine; > x.cpu = sample->cpu; > > printed += fprintf(fp, "%c", '\n'); > @@ -1313,7 +1331,7 @@ static int perf_sample__fprintf_brstackinsn(struct perf_sample *sample, > } else { > ilen = 0; > printed += fprintf(fp, "\t%016" PRIx64 "\t%s", ip, > - dump_insn(&x, ip, buffer + off, len - off, &ilen)); > + any_dump_insn(attr, &x, ip, buffer + off, len - off, &ilen)); > if (PRINT_FIELD(BRSTACKINSNLEN)) > printed += fprintf(fp, "\tilen: %d", ilen); > printed += fprintf(fp, "\n"); > @@ -1361,7 +1379,7 @@ static int perf_sample__fprintf_brstackinsn(struct perf_sample *sample, > goto out; > ilen = 0; > printed += fprintf(fp, "\t%016" PRIx64 "\t%s", sample->ip, > - dump_insn(&x, sample->ip, buffer, len, &ilen)); > + any_dump_insn(attr, &x, sample->ip, buffer, len, &ilen)); > if (PRINT_FIELD(BRSTACKINSNLEN)) > printed += fprintf(fp, "\tilen: %d", ilen); > printed += fprintf(fp, "\n"); > @@ -1372,7 +1390,7 @@ static int perf_sample__fprintf_brstackinsn(struct perf_sample *sample, > for (off = 0; off <= end - start; off += ilen) { > ilen = 0; > printed += fprintf(fp, "\t%016" PRIx64 "\t%s", start + off, > - dump_insn(&x, start + off, buffer + off, len - off, &ilen)); > + any_dump_insn(attr, &x, start + off, buffer + off, len - off, &ilen)); > if (PRINT_FIELD(BRSTACKINSNLEN)) > printed += fprintf(fp, "\tilen: %d", ilen); > printed += fprintf(fp, "\n"); > @@ -1534,7 +1552,7 @@ static int perf_sample__fprintf_insn(struct perf_sample *sample, > printed += fprintf(fp, "\t\t"); > printed += sample__fprintf_insn_asm(sample, thread, machine, fp, al); > } > - if (PRINT_FIELD(BRSTACKINSN) || PRINT_FIELD(BRSTACKINSNLEN)) > + if (PRINT_FIELD(BRSTACKINSN) || PRINT_FIELD(BRSTACKINSNLEN) || PRINT_FIELD(BRSTACKDISASM)) > printed += perf_sample__fprintf_brstackinsn(sample, thread, attr, machine, fp); > > return printed; > @@ -3940,7 +3958,7 @@ int cmd_script(int argc, const char **argv) > "Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso,dsoff," > "addr,symoff,srcline,period,iregs,uregs,brstack," > "brstacksym,flags,data_src,weight,bpf-output,brstackinsn," > - "brstackinsnlen,brstackoff,callindent,insn,disasm,insnlen,synth," > + "brstackinsnlen,brstackdisasm,brstackoff,callindent,insn,disasm,insnlen,synth," > "phys_addr,metric,misc,srccode,ipc,tod,data_page_size," > "code_page_size,ins_lat,machine_pid,vcpu,cgroup,retire_lat", > parse_output_fields), > diff --git a/tools/perf/util/dump-insn.h b/tools/perf/util/dump-insn.h > index 650125061530..4a7797dd6d09 100644 > --- a/tools/perf/util/dump-insn.h > +++ b/tools/perf/util/dump-insn.h > @@ -11,6 +11,7 @@ struct thread; > struct perf_insn { > /* Initialized by callers: */ > struct thread *thread; > + struct machine *machine; > u8 cpumode; > bool is64bit; > int cpu; > diff --git a/tools/perf/util/print_insn.c b/tools/perf/util/print_insn.c > index 8e4e3cffd677..bca4449f0fa8 100644 > --- a/tools/perf/util/print_insn.c > +++ b/tools/perf/util/print_insn.c > @@ -12,6 +12,7 @@ > #include "machine.h" > #include "thread.h" > #include "print_insn.h" > +#include "dump-insn.h" > #include "map.h" > #include "dso.h" > > @@ -71,6 +72,57 @@ static int capstone_init(struct machine *machine, csh *cs_handle, bool is64) > return 0; > } > > +static void dump_insn_x86(struct thread *thread, cs_insn *insn, struct perf_insn *x) > +{ > + struct addr_location al; > + bool printed = false; > + > + if (insn->detail && insn->detail->x86.op_count == 1) { > + cs_x86_op *op = &insn->detail->x86.operands[0]; > + > + addr_location__init(&al); > + if (op->type == X86_OP_IMM && > + thread__find_symbol(thread, x->cpumode, op->imm, &al) && > + al.sym && > + al.addr < al.sym->end) { > + snprintf(x->out, sizeof(x->out), "%s %s+%#" PRIx64 " [%#" PRIx64 "]", insn[0].mnemonic, > + al.sym->name, al.addr - al.sym->start, op->imm); > + printed = true; > + } > + addr_location__exit(&al); > + } > + > + if (!printed) > + snprintf(x->out, sizeof(x->out), "%s %s", insn[0].mnemonic, insn[0].op_str); > +} > + > +const char *cs_dump_insn(struct perf_insn *x, uint64_t ip, > + u8 *inbuf, int inlen, int *lenp) > +{ > + int ret; > + int count; > + cs_insn *insn; > + csh cs_handle; > + > + ret = capstone_init(x->machine, &cs_handle, x->is64bit); > + if (ret < 0) > + return NULL; > + > + count = cs_disasm(cs_handle, (uint8_t *)inbuf, inlen, ip, 1, &insn); > + if (count > 0) { > + if (machine__normalized_is(x->machine, "x86")) > + dump_insn_x86(x->thread, &insn[0], x); > + else > + snprintf(x->out, sizeof(x->out), "%s %s", > + insn[0].mnemonic, insn[0].op_str); > + *lenp = insn->size; > + cs_free(insn, count); > + } else { > + return NULL; > + } > + return x->out; > +} > + > static size_t print_insn_x86(struct perf_sample *sample, struct thread *thread, > cs_insn *insn, FILE *fp) > { > diff --git a/tools/perf/util/print_insn.h b/tools/perf/util/print_insn.h > index 6447dd41b543..c2a6391a45ce 100644 > --- a/tools/perf/util/print_insn.h > +++ b/tools/perf/util/print_insn.h > @@ -8,9 +8,12 @@ > struct perf_sample; > struct thread; > struct machine; > +struct perf_insn; > > size_t sample__fprintf_insn_asm(struct perf_sample *sample, struct thread *thread, > struct machine *machine, FILE *fp, struct addr_location *al); > size_t sample__fprintf_insn_raw(struct perf_sample *sample, FILE *fp); > +const char *cs_dump_insn(struct perf_insn *x, uint64_t ip, > + u8 *inbuf, int inlen, int *lenp); > > #endif /* PERF_PRINT_INSN_H */