From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org, linux-perf-users@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, jolsa@kernel.org,
namhyung@kernel.org, eranian@google.com,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 02/11] perf tools script: Support insn output for normal samples
Date: Sun, 24 Feb 2019 07:37:13 -0800 [thread overview]
Message-ID: <20190224153722.27020-3-andi@firstfloor.org> (raw)
In-Reply-To: <20190224153722.27020-1-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
perf script -F +insn was only working for PT traces because
the PT instruction decoder was filling in the insn/insn_len
sample attributes. Support it for non PT samples too on x86
using the existing x86 instruction decoder.
% perf record -a sleep 1
% perf script -F ip,sym,insn --xed
ffffffff811704c9 remote_function movl %eax, 0x18(%rbx)
ffffffff8100bb50 intel_bts_enable_local retq
ffffffff81048612 native_apic_mem_write movl %esi, -0xa04000(%rdi)
ffffffff81048612 native_apic_mem_write movl %esi, -0xa04000(%rdi)
ffffffff81048612 native_apic_mem_write movl %esi, -0xa04000(%rdi)
ffffffff810f1f79 generic_exec_single xor %eax, %eax
ffffffff811704c9 remote_function movl %eax, 0x18(%rbx)
ffffffff8100bb34 intel_bts_enable_local movl 0x2000(%rax), %edx
ffffffff81048610 native_apic_mem_write mov %edi, %edi
...
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/arch/x86/util/Build | 1 +
tools/perf/arch/x86/util/archinsn.c | 41 +++++++++++++++++++++++++++++
tools/perf/builtin-script.c | 10 +++++++
tools/perf/util/archinsn.h | 12 +++++++++
4 files changed, 64 insertions(+)
create mode 100644 tools/perf/arch/x86/util/archinsn.c
create mode 100644 tools/perf/util/archinsn.h
diff --git a/tools/perf/arch/x86/util/Build b/tools/perf/arch/x86/util/Build
index 7aab0be5fc5f..7b8e69bbbdfe 100644
--- a/tools/perf/arch/x86/util/Build
+++ b/tools/perf/arch/x86/util/Build
@@ -6,6 +6,7 @@ perf-y += perf_regs.o
perf-y += group.o
perf-y += machine.o
perf-y += event.o
+perf-y += archinsn.o
perf-$(CONFIG_DWARF) += dwarf-regs.o
perf-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o
diff --git a/tools/perf/arch/x86/util/archinsn.c b/tools/perf/arch/x86/util/archinsn.c
new file mode 100644
index 000000000000..9e3b0828b018
--- /dev/null
+++ b/tools/perf/arch/x86/util/archinsn.c
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "perf.h"
+#include "archinsn.h"
+#include "util/intel-pt-decoder/insn.h"
+#include "machine.h"
+#include "thread.h"
+#include "symbol.h"
+#include "map.h"
+
+void arch_fetch_insn(struct perf_sample *sample,
+ struct thread *thread,
+ struct machine *machine)
+{
+ struct addr_location al;
+ u8 cpumode;
+ long offset;
+ struct insn insn;
+ int len;
+
+ if (!sample->ip)
+ return;
+
+ if (machine__kernel_ip(machine, sample->ip))
+ cpumode = PERF_RECORD_MISC_KERNEL;
+ else
+ cpumode = PERF_RECORD_MISC_USER;
+ if (!thread__find_map(thread, cpumode, sample->ip, &al) || !al.map->dso)
+ return;
+ if (al.map->dso->data.status == DSO_DATA_STATUS_ERROR)
+ return;
+ map__load(al.map);
+ offset = al.map->map_ip(al.map, sample->ip);
+ len = dso__data_read_offset(al.map->dso, machine, offset, (u8 *)sample->insn,
+ sizeof(sample->insn));
+ if (len <= 0)
+ return;
+ insn_init(&insn, sample->insn, len, al.map->dso->is_64_bit);
+ insn_get_length(&insn);
+ if (insn_complete(&insn) && insn.length <= len)
+ sample->insn_len = insn.length;
+}
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 29e95a25c6e6..261055302d08 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -29,6 +29,7 @@
#include "util/time-utils.h"
#include "util/path.h"
#include "print_binary.h"
+#include "archinsn.h"
#include <linux/bitmap.h>
#include <linux/kernel.h>
#include <linux/stringify.h>
@@ -1227,6 +1228,12 @@ static int perf_sample__fprintf_callindent(struct perf_sample *sample,
return len + dlen;
}
+__weak void arch_fetch_insn(struct perf_sample *sample __maybe_unused,
+ struct thread *thread __maybe_unused,
+ struct machine *machine __maybe_unused)
+{
+}
+
static int perf_sample__fprintf_insn(struct perf_sample *sample,
struct perf_event_attr *attr,
struct thread *thread,
@@ -1234,6 +1241,9 @@ static int perf_sample__fprintf_insn(struct perf_sample *sample,
{
int printed = 0;
+ if (sample->insn_len == 0)
+ arch_fetch_insn(sample, thread, machine);
+
if (PRINT_FIELD(INSNLEN))
printed += fprintf(fp, " ilen: %d", sample->insn_len);
if (PRINT_FIELD(INSN)) {
diff --git a/tools/perf/util/archinsn.h b/tools/perf/util/archinsn.h
new file mode 100644
index 000000000000..448cbb6b8d7e
--- /dev/null
+++ b/tools/perf/util/archinsn.h
@@ -0,0 +1,12 @@
+#ifndef INSN_H
+#define INSN_H 1
+
+struct perf_sample;
+struct machine;
+struct thread;
+
+void arch_fetch_insn(struct perf_sample *sample,
+ struct thread *thread,
+ struct machine *machine);
+
+#endif
--
2.17.2
next prev parent reply other threads:[~2019-02-24 15:38 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-24 15:37 Support sample context in perf report Andi Kleen
2019-02-24 15:37 ` [PATCH 01/11] perf tools script: Handle missing fields with -F + Andi Kleen
2019-02-25 12:56 ` Jiri Olsa
2019-02-25 13:49 ` Arnaldo Carvalho de Melo
2019-02-28 8:04 ` [tip:perf/core] perf " tip-bot for Andi Kleen
2019-02-24 15:37 ` Andi Kleen [this message]
2019-02-25 12:56 ` [PATCH 02/11] perf tools script: Support insn output for normal samples Jiri Olsa
2019-02-25 12:56 ` Jiri Olsa
2019-02-24 15:37 ` [PATCH 03/11] perf tools report: Support nano seconds Andi Kleen
2019-02-25 16:40 ` Sebastien Boisvert
2019-02-25 17:34 ` Andi Kleen
2019-02-24 15:37 ` [PATCH 04/11] perf tools report: Parse time quantum Andi Kleen
2019-02-25 12:55 ` Jiri Olsa
2019-02-24 15:37 ` [PATCH 05/11] perf tools report: Support time sort key Andi Kleen
2019-02-24 15:37 ` [PATCH 06/11] perf tools report: Use less for scripts output Andi Kleen
2019-02-25 12:55 ` Jiri Olsa
2019-02-24 15:37 ` [PATCH 07/11] perf tools report: Support running scripts for current time range Andi Kleen
2019-02-25 12:55 ` Jiri Olsa
2019-02-25 12:56 ` Jiri Olsa
2019-02-25 13:28 ` Andi Kleen
2019-02-25 13:35 ` Jiri Olsa
2019-02-24 15:37 ` [PATCH 08/11] perf tools: Add perf_exe() helper to find perf binary Andi Kleen
2019-02-25 12:56 ` Jiri Olsa
2019-02-25 13:58 ` Arnaldo Carvalho de Melo
2019-02-28 8:05 ` [tip:perf/core] " tip-bot for Andi Kleen
2019-02-24 15:37 ` [PATCH 09/11] perf tools report: Support builtin perf script in scripts menu Andi Kleen
2019-02-25 12:57 ` Jiri Olsa
2019-02-24 15:37 ` [PATCH 10/11] perf tools: Add utility function to print ns time stamps Andi Kleen
2019-02-24 15:37 ` [PATCH 11/11] perf tools report: Implement browsing of individual samples Andi Kleen
2019-02-25 12:56 ` Jiri Olsa
2019-02-25 12:56 ` Jiri Olsa
2019-02-25 13:33 ` Andi Kleen
2019-03-04 14:48 ` Jiri Olsa
2019-02-25 12:56 ` Jiri Olsa
2019-02-25 13:31 ` Andi Kleen
2019-02-25 13:35 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190224153722.27020-3-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=eranian@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.