From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>, <ast@plumgrid.com>,
<brendan.d.gregg@gmail.com>, <daniel@iogearbox.net>,
<namhyung@kernel.org>, <masami.hiramatsu.pt@hitachi.com>,
<paulus@samba.org>, <a.p.zijlstra@chello.nl>, <mingo@redhat.com>,
<jolsa@kernel.org>, <dsahern@gmail.com>
Cc: <linux-kernel@vger.kernel.org>, <lizefan@huawei.com>,
<hekuang@huawei.com>, <xiakaixu@huawei.com>, <pi3orama@163.com>
Subject: [RFC PATCH v9 44/50] perf tools: Introduce arch_get_reg_info() for x86
Date: Fri, 26 Jun 2015 14:15:49 +0000 [thread overview]
Message-ID: <1435328155-87115-45-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1435328155-87115-1-git-send-email-wangnan0@huawei.com>
From: He Kuang <hekuang@huawei.com>
arch_get_reg_info() is a helper function which converts register name
like "%rax" to offset of a register in 'struct pt_regs', which is
required by BPF prologue generator.
This patch replaces original string table by a 'struct reg_info' table,
which records offset of registers according to its name.
For x86, since there are two sub-archs (x86_32 and x86_64) but we can
only get pt_regs for the arch we are currently on, this patch fills
offset with '-1' for another sub-arch. This introduces a limitation to
perf prologue that, we are unable to generate prologue on a x86_32
compiled perf for BPF programs targeted on x86_64 kernel. This
limitation is acceptable, because this is a very rare usecase.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Signed-off-by: He Kuang <hekuang@huawei.com>
---
tools/perf/arch/x86/Makefile | 1 +
tools/perf/arch/x86/util/Build | 2 +
tools/perf/arch/x86/util/dwarf-regs.c | 104 ++++++++++++++++++++++++----------
3 files changed, 78 insertions(+), 29 deletions(-)
diff --git a/tools/perf/arch/x86/Makefile b/tools/perf/arch/x86/Makefile
index 21322e0..a84a6f6f 100644
--- a/tools/perf/arch/x86/Makefile
+++ b/tools/perf/arch/x86/Makefile
@@ -2,3 +2,4 @@ ifndef NO_DWARF
PERF_HAVE_DWARF_REGS := 1
endif
HAVE_KVM_STAT_SUPPORT := 1
+PERF_HAVE_ARCH_GET_REG_INFO := 1
diff --git a/tools/perf/arch/x86/util/Build b/tools/perf/arch/x86/util/Build
index cfbccc4..d6eeee8 100644
--- a/tools/perf/arch/x86/util/Build
+++ b/tools/perf/arch/x86/util/Build
@@ -2,6 +2,8 @@ libperf-y += header.o
libperf-y += tsc.o
libperf-y += kvm-stat.o
+# BPF_PROLOGUE also need dwarf-regs.o. However, if CONFIG_BPF_PROLOGUE
+# is true, CONFIG_DWARF must true.
libperf-$(CONFIG_DWARF) += dwarf-regs.o
libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o
diff --git a/tools/perf/arch/x86/util/dwarf-regs.c b/tools/perf/arch/x86/util/dwarf-regs.c
index be22dd4..9928caf 100644
--- a/tools/perf/arch/x86/util/dwarf-regs.c
+++ b/tools/perf/arch/x86/util/dwarf-regs.c
@@ -22,44 +22,67 @@
#include <stddef.h>
#include <dwarf-regs.h>
+#include <string.h>
+#include <linux/ptrace.h>
+#include <linux/kernel.h> /* for offsetof */
+#include <util/bpf-loader.h>
+
+struct reg_info {
+ const char *name; /* Reg string in debuginfo */
+ int offset; /* Reg offset in struct pt_regs */
+};
/*
* Generic dwarf analysis helpers
*/
-
+/*
+ * x86_64 compiling can't access pt_regs for x86_32, so fill offset
+ * with -1.
+ */
+#ifdef __x86_64__
+# define REG_INFO(n, f) { .name = n, .offset = -1, }
+#else
+# define REG_INFO(n, f) { .name = n, .offset = offsetof(struct pt_regs, f), }
+#endif
#define X86_32_MAX_REGS 8
-const char *x86_32_regs_table[X86_32_MAX_REGS] = {
- "%ax",
- "%cx",
- "%dx",
- "%bx",
- "$stack", /* Stack address instead of %sp */
- "%bp",
- "%si",
- "%di",
+
+struct reg_info x86_32_regs_table[X86_32_MAX_REGS] = {
+ REG_INFO("%ax", eax),
+ REG_INFO("%cx", ecx),
+ REG_INFO("%dx", edx),
+ REG_INFO("%bx", ebx),
+ REG_INFO("$stack", esp), /* Stack address instead of %sp */
+ REG_INFO("%bp", ebp),
+ REG_INFO("%si", esi),
+ REG_INFO("%di", edi),
};
+#undef REG_INFO
+#ifdef __x86_64__
+# define REG_INFO(n, f) { .name = n, .offset = offsetof(struct pt_regs, f), }
+#else
+# define REG_INFO(n, f) { .name = n, .offset = -1, }
+#endif
#define X86_64_MAX_REGS 16
-const char *x86_64_regs_table[X86_64_MAX_REGS] = {
- "%ax",
- "%dx",
- "%cx",
- "%bx",
- "%si",
- "%di",
- "%bp",
- "%sp",
- "%r8",
- "%r9",
- "%r10",
- "%r11",
- "%r12",
- "%r13",
- "%r14",
- "%r15",
+struct reg_info x86_64_regs_table[X86_64_MAX_REGS] = {
+ REG_INFO("%ax", rax),
+ REG_INFO("%dx", rdx),
+ REG_INFO("%cx", rcx),
+ REG_INFO("%bx", rbx),
+ REG_INFO("%si", rsi),
+ REG_INFO("%di", rdi),
+ REG_INFO("%bp", rbp),
+ REG_INFO("%sp", rsp),
+ REG_INFO("%r8", r8),
+ REG_INFO("%r9", r9),
+ REG_INFO("%r10", r10),
+ REG_INFO("%r11", r11),
+ REG_INFO("%r12", r12),
+ REG_INFO("%r13", r13),
+ REG_INFO("%r14", r14),
+ REG_INFO("%r15", r15),
};
-/* TODO: switching by dwarf address size */
#ifdef __x86_64__
#define ARCH_MAX_REGS X86_64_MAX_REGS
#define arch_regs_table x86_64_regs_table
@@ -71,5 +94,28 @@ const char *x86_64_regs_table[X86_64_MAX_REGS] = {
/* Return architecture dependent register string (for kprobe-tracer) */
const char *get_arch_regstr(unsigned int n)
{
- return (n <= ARCH_MAX_REGS) ? arch_regs_table[n] : NULL;
+ return (n <= ARCH_MAX_REGS) ? arch_regs_table[n].name : NULL;
}
+
+#ifdef HAVE_BPF_PROLOGUE
+int arch_get_reg_info(const char *name, int *offset)
+{
+ int i;
+ struct reg_info *info;
+
+ if (!name || !offset)
+ return -1;
+
+ for (i = 0; i < ARCH_MAX_REGS; i++) {
+ info = &arch_regs_table[i];
+ if (strcmp(info->name, name) == 0) {
+ if (info->offset < 0)
+ return -1;
+ *offset = info->offset;
+ return 0;
+ }
+ }
+
+ return -1;
+}
+#endif
--
1.8.3.4
next prev parent reply other threads:[~2015-06-26 14:20 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-26 14:15 [RFC PATCH v9 00/50] perf tools: filtering events using eBPF programs Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 01/50] tracing, perf: Implement BPF programs attached to uprobes Wang Nan
2015-06-27 12:10 ` [PATCH] bpf: Use correct #ifdef controller for trace_call_bpf() Wang Nan
2015-06-27 12:36 ` [PATCH v2] " Wang Nan
2015-06-27 12:11 ` [RFC PATCH v9 01/50 -fix] tracing, perf: Implement BPF programs attached to uprobes Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 02/50] tools build: Add feature check for eBPF API Wang Nan
2015-06-29 19:21 ` Arnaldo Carvalho de Melo
2015-06-29 19:41 ` Arnaldo Carvalho de Melo
2015-06-30 2:29 ` Wangnan (F)
2015-06-30 14:34 ` Arnaldo Carvalho de Melo
2015-07-01 1:23 ` Wangnan (F)
2015-06-26 14:15 ` [RFC PATCH v9 03/50] bpf tools: Introduce 'bpf' library to tools Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 04/50] bpf tools: Allow caller to set printing function Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 05/50] bpf tools: Open eBPF object file and do basic validation Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 06/50] bpf tools: Read eBPF object from buffer Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 07/50] bpf tools: Check endianness and make libbpf fail early Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 08/50] bpf tools: Iterate over ELF sections to collect information Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 09/50] bpf tools: Collect version and license from ELF sections Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 10/50] bpf tools: Collect map definitions from 'maps' section Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 11/50] bpf tools: Collect symbol table from SHT_SYMTAB section Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 12/50] bpf tools: Collect eBPF programs from their own sections Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 13/50] bpf tools: Collect relocation sections from SHT_REL sections Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 14/50] bpf tools: Record map accessing instructions for each program Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 15/50] bpf tools: Add bpf.c/h for common bpf operations Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 16/50] bpf tools: Create eBPF maps defined in an object file Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 17/50] bpf tools: Relocate eBPF programs Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 18/50] bpf tools: Introduce bpf_load_program() to bpf.c Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 19/50] bpf tools: Load eBPF programs in object files into kernel Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 20/50] bpf tools: Introduce accessors for struct bpf_program Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 21/50] bpf tools: Introduce accessors for struct bpf_object Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 22/50] bpf tools: Link all bpf objects onto a list Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 23/50] perf tools: Make perf depend on libbpf Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 24/50] perf tools: Introduce llvm config options Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 25/50] perf tools: Call clang to compile C source to object code Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 26/50] perf tests: Add LLVM test for eBPF on-the-fly compiling Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 27/50] perf tools: Auto detecting kernel build directory Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 28/50] perf tools: Auto detecting kernel include options Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 29/50] perf record: Enable passing bpf object file to --event Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 30/50] perf record: Compile scriptlets if pass '.c' " Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 31/50] perf tools: Parse probe points of eBPF programs during preparation Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 32/50] perf probe: Attach trace_probe_event with perf_probe_event Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 33/50] perf record: Probe at kprobe points Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 34/50] perf record: Load all eBPF object into kernel Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 35/50] perf tools: Add bpf_fd field to evsel and config it Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 36/50] perf tools: Attach eBPF program to perf event Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 37/50] perf tools: Suppress probing messages when probing by BPF loading Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 38/50] perf record: Add clang options for compiling BPF scripts Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 39/50] bpf tools: Load a program with different instance using preprocessor Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 40/50] perf tools: Fix probe-event.h include Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 41/50] perf probe: Reset tev->args and tev->nargs when failure Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 42/50] perf tools: Move linux/filter.h to tools/include Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 43/50] perf tools: Add BPF_PROLOGUE config options for further patches Wang Nan
2015-06-26 14:15 ` Wang Nan [this message]
2015-06-26 14:15 ` [RFC PATCH v9 45/50] perf tools: Add prologue for BPF programs for fetching arguments Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 46/50] perf tools: Generate prologue for BPF programs Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 47/50] perf tools: Use same BPF program if arguments are identical Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 48/50] perf record: Support custom vmlinux path Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 49/50] perf probe: Init symbol as kprobe if any event is kprobe Wang Nan
2015-06-27 12:25 ` [RFC PATCH v9 49/50 -fix] " Wang Nan
2015-06-29 14:33 ` Arnaldo Carvalho de Melo
2015-06-30 1:38 ` Wangnan (F)
2015-06-30 14:37 ` Arnaldo Carvalho de Melo
2015-07-01 1:31 ` Wangnan (F)
2015-06-26 14:15 ` [RFC PATCH v9 50/50] perf tools: Support attach BPF program on uprobe events Wang Nan
2015-06-26 22:44 ` [RFC PATCH v9 00/50] perf tools: filtering events using eBPF programs Alexei Starovoitov
2015-06-27 0:14 ` Wangnan (F)
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=1435328155-87115-45-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=ast@plumgrid.com \
--cc=brendan.d.gregg@gmail.com \
--cc=daniel@iogearbox.net \
--cc=dsahern@gmail.com \
--cc=hekuang@huawei.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=pi3orama@163.com \
--cc=xiakaixu@huawei.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome