| Message ID | 1391451509-31265-2-git-send-email-jean.pihet@linaro.org |
|---|---|
| State | Accepted |
| Commit | 2ee0d7fd36a3f87bc5b29b1ec54ad6728deedb41 |
| Headers | show |
Hi Ingo, On Thu, Mar 13, 2014 at 12:27:45AM -0700, tip-bot for Jean Pihet wrote: > Commit-ID: 1acfb01a43db9d8cde2d4c1d51746bae0b46b06b > Gitweb: http://git.kernel.org/tip/1acfb01a43db9d8cde2d4c1d51746bae0b46b06b > Author: Jean Pihet <jean.pihet@linaro.org> > AuthorDate: Mon, 3 Feb 2014 19:18:27 +0100 > Committer: Ingo Molnar <mingo@kernel.org> > CommitDate: Wed, 12 Mar 2014 13:45:28 +0100 > > ARM64, perf: Add support for perf registers API > > This patch implements the functions required for the perf > registers API, allowing the perf tool to interface kernel > register dumps with libunwind in order to provide userspace > backtracing. Compat mode is also supported. > > Only the general purpose user space registers are exported, > i.e.: PERF_REG_ARM_X0, > ... > PERF_REG_ARM_X28, > PERF_REG_ARM_FP, > PERF_REG_ARM_LR, > PERF_REG_ARM_SP, > PERF_REG_ARM_PC > and not the PERF_REG_ARM_V* registers. > > Signed-off-by: Jean Pihet <jean.pihet@linaro.org> > Acked-by: Will Deacon <will.deacon@arm.com> > Cc: Arnaldo <acme@ghostprotocols.net> > Cc: Jiri Olsa <jolsa@redhat.com> > Cc: patches@linaro.org > Cc: linaro-kernel@lists.linaro.org > Cc: linux-arm-kernel@lists.infradead.org > Link: http://lkml.kernel.org/r/1391451509-31265-2-git-send-email-jean.pihet@linaro.org > Signed-off-by: Ingo Molnar <mingo@kernel.org> > --- > arch/arm64/Kconfig | 2 ++ > arch/arm64/include/asm/ptrace.h | 1 + > arch/arm64/include/uapi/asm/Kbuild | 1 + > arch/arm64/include/uapi/asm/perf_regs.h | 40 ++++++++++++++++++++++++++++++ > arch/arm64/kernel/Makefile | 1 + > arch/arm64/kernel/perf_regs.c | 44 +++++++++++++++++++++++++++++++++ > 6 files changed, 89 insertions(+) As I replied to Jean yesterday, I merged the arch/arm64 patches already in the arm64 tree. Is it late to drop them from tip (and avoid potential conflicts)? But please take the perf tools patch (tools/perf/arch/arm64/...). Thanks.
* Catalin Marinas <catalin.marinas@arm.com> wrote: > Hi Ingo, > > On Thu, Mar 13, 2014 at 12:27:45AM -0700, tip-bot for Jean Pihet wrote: > > Commit-ID: 1acfb01a43db9d8cde2d4c1d51746bae0b46b06b > > Gitweb: http://git.kernel.org/tip/1acfb01a43db9d8cde2d4c1d51746bae0b46b06b > > Author: Jean Pihet <jean.pihet@linaro.org> > > AuthorDate: Mon, 3 Feb 2014 19:18:27 +0100 > > Committer: Ingo Molnar <mingo@kernel.org> > > CommitDate: Wed, 12 Mar 2014 13:45:28 +0100 > > > > ARM64, perf: Add support for perf registers API > > > > This patch implements the functions required for the perf > > registers API, allowing the perf tool to interface kernel > > register dumps with libunwind in order to provide userspace > > backtracing. Compat mode is also supported. > > > > Only the general purpose user space registers are exported, > > i.e.: PERF_REG_ARM_X0, > > ... > > PERF_REG_ARM_X28, > > PERF_REG_ARM_FP, > > PERF_REG_ARM_LR, > > PERF_REG_ARM_SP, > > PERF_REG_ARM_PC > > and not the PERF_REG_ARM_V* registers. > > > > Signed-off-by: Jean Pihet <jean.pihet@linaro.org> > > Acked-by: Will Deacon <will.deacon@arm.com> > > Cc: Arnaldo <acme@ghostprotocols.net> > > Cc: Jiri Olsa <jolsa@redhat.com> > > Cc: patches@linaro.org > > Cc: linaro-kernel@lists.linaro.org > > Cc: linux-arm-kernel@lists.infradead.org > > Link: http://lkml.kernel.org/r/1391451509-31265-2-git-send-email-jean.pihet@linaro.org > > Signed-off-by: Ingo Molnar <mingo@kernel.org> > > --- > > arch/arm64/Kconfig | 2 ++ > > arch/arm64/include/asm/ptrace.h | 1 + > > arch/arm64/include/uapi/asm/Kbuild | 1 + > > arch/arm64/include/uapi/asm/perf_regs.h | 40 ++++++++++++++++++++++++++++++ > > arch/arm64/kernel/Makefile | 1 + > > arch/arm64/kernel/perf_regs.c | 44 +++++++++++++++++++++++++++++++++ > > 6 files changed, 89 insertions(+) > > As I replied to Jean yesterday, I merged the arch/arm64 patches already > in the arm64 tree. Is it late to drop them from tip (and avoid potential > conflicts)? > > But please take the perf tools patch (tools/perf/arch/arm64/...). Well, I merged them so that the tooling bits can be tested on top of that and merged as well. Anyway, I dropped them, they were still the tail of tip:perf/core. Thanks, Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Thu, Mar 13, 2014 at 11:01:21AM +0000, Ingo Molnar wrote: > * Catalin Marinas <catalin.marinas@arm.com> wrote: > > On Thu, Mar 13, 2014 at 12:27:45AM -0700, tip-bot for Jean Pihet wrote: > > > Commit-ID: 1acfb01a43db9d8cde2d4c1d51746bae0b46b06b > > > Gitweb: http://git.kernel.org/tip/1acfb01a43db9d8cde2d4c1d51746bae0b46b06b > > > Author: Jean Pihet <jean.pihet@linaro.org> > > > AuthorDate: Mon, 3 Feb 2014 19:18:27 +0100 > > > Committer: Ingo Molnar <mingo@kernel.org> > > > CommitDate: Wed, 12 Mar 2014 13:45:28 +0100 > > > > > > ARM64, perf: Add support for perf registers API > > > > > > This patch implements the functions required for the perf > > > registers API, allowing the perf tool to interface kernel > > > register dumps with libunwind in order to provide userspace > > > backtracing. Compat mode is also supported. > > > > > > Only the general purpose user space registers are exported, > > > i.e.: PERF_REG_ARM_X0, > > > ... > > > PERF_REG_ARM_X28, > > > PERF_REG_ARM_FP, > > > PERF_REG_ARM_LR, > > > PERF_REG_ARM_SP, > > > PERF_REG_ARM_PC > > > and not the PERF_REG_ARM_V* registers. > > > > > > Signed-off-by: Jean Pihet <jean.pihet@linaro.org> > > > Acked-by: Will Deacon <will.deacon@arm.com> > > > Cc: Arnaldo <acme@ghostprotocols.net> > > > Cc: Jiri Olsa <jolsa@redhat.com> > > > Cc: patches@linaro.org > > > Cc: linaro-kernel@lists.linaro.org > > > Cc: linux-arm-kernel@lists.infradead.org > > > Link: http://lkml.kernel.org/r/1391451509-31265-2-git-send-email-jean.pihet@linaro.org > > > Signed-off-by: Ingo Molnar <mingo@kernel.org> > > > --- > > > arch/arm64/Kconfig | 2 ++ > > > arch/arm64/include/asm/ptrace.h | 1 + > > > arch/arm64/include/uapi/asm/Kbuild | 1 + > > > arch/arm64/include/uapi/asm/perf_regs.h | 40 ++++++++++++++++++++++++++++++ > > > arch/arm64/kernel/Makefile | 1 + > > > arch/arm64/kernel/perf_regs.c | 44 +++++++++++++++++++++++++++++++++ > > > 6 files changed, 89 insertions(+) > > > > As I replied to Jean yesterday, I merged the arch/arm64 patches already > > in the arm64 tree. Is it late to drop them from tip (and avoid potential > > conflicts)? > > > > But please take the perf tools patch (tools/perf/arch/arm64/...). > > Well, I merged them so that the tooling bits can be tested on top of > that and merged as well. That's why I asked if I should take the tooling bits but Will objected ;). > Anyway, I dropped them, they were still the tail of tip:perf/core. Thanks. I assume you still take the tooling patch?
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index dd4327f..e9899bb 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -37,6 +37,8 @@ config ARM64 select HAVE_HW_BREAKPOINT if PERF_EVENTS select HAVE_MEMBLOCK select HAVE_PERF_EVENTS + select HAVE_PERF_REGS + select HAVE_PERF_USER_STACK_DUMP select IRQ_DOMAIN select MODULES_USE_ELF_RELA select NO_BOOTMEM diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h index 0e7fa49..fbb0020 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -68,6 +68,7 @@ /* Architecturally defined mapping between AArch32 and AArch64 registers */ #define compat_usr(x) regs[(x)] +#define compat_fp regs[11] #define compat_sp regs[13] #define compat_lr regs[14] #define compat_sp_hyp regs[15] diff --git a/arch/arm64/include/uapi/asm/Kbuild b/arch/arm64/include/uapi/asm/Kbuild index e4b78bd..942376d 100644 --- a/arch/arm64/include/uapi/asm/Kbuild +++ b/arch/arm64/include/uapi/asm/Kbuild @@ -9,6 +9,7 @@ header-y += byteorder.h header-y += fcntl.h header-y += hwcap.h header-y += kvm_para.h +header-y += perf_regs.h header-y += param.h header-y += ptrace.h header-y += setup.h diff --git a/arch/arm64/include/uapi/asm/perf_regs.h b/arch/arm64/include/uapi/asm/perf_regs.h new file mode 100644 index 0000000..172b831 --- /dev/null +++ b/arch/arm64/include/uapi/asm/perf_regs.h @@ -0,0 +1,40 @@ +#ifndef _ASM_ARM64_PERF_REGS_H +#define _ASM_ARM64_PERF_REGS_H + +enum perf_event_arm_regs { + PERF_REG_ARM64_X0, + PERF_REG_ARM64_X1, + PERF_REG_ARM64_X2, + PERF_REG_ARM64_X3, + PERF_REG_ARM64_X4, + PERF_REG_ARM64_X5, + PERF_REG_ARM64_X6, + PERF_REG_ARM64_X7, + PERF_REG_ARM64_X8, + PERF_REG_ARM64_X9, + PERF_REG_ARM64_X10, + PERF_REG_ARM64_X11, + PERF_REG_ARM64_X12, + PERF_REG_ARM64_X13, + PERF_REG_ARM64_X14, + PERF_REG_ARM64_X15, + PERF_REG_ARM64_X16, + PERF_REG_ARM64_X17, + PERF_REG_ARM64_X18, + PERF_REG_ARM64_X19, + PERF_REG_ARM64_X20, + PERF_REG_ARM64_X21, + PERF_REG_ARM64_X22, + PERF_REG_ARM64_X23, + PERF_REG_ARM64_X24, + PERF_REG_ARM64_X25, + PERF_REG_ARM64_X26, + PERF_REG_ARM64_X27, + PERF_REG_ARM64_X28, + PERF_REG_ARM64_X29, + PERF_REG_ARM64_LR, + PERF_REG_ARM64_SP, + PERF_REG_ARM64_PC, + PERF_REG_ARM64_MAX, +}; +#endif /* _ASM_ARM64_PERF_REGS_H */ diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index 2d4554b..9a5d592 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -15,6 +15,7 @@ arm64-obj-$(CONFIG_COMPAT) += sys32.o kuser32.o signal32.o \ sys_compat.o arm64-obj-$(CONFIG_MODULES) += arm64ksyms.o module.o arm64-obj-$(CONFIG_SMP) += smp.o smp_spin_table.o +arm64-obj-$(CONFIG_PERF_EVENTS) += perf_regs.o arm64-obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)+= hw_breakpoint.o arm64-obj-$(CONFIG_EARLY_PRINTK) += early_printk.o diff --git a/arch/arm64/kernel/perf_regs.c b/arch/arm64/kernel/perf_regs.c new file mode 100644 index 0000000..f2d6f0a --- /dev/null +++ b/arch/arm64/kernel/perf_regs.c @@ -0,0 +1,44 @@ +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/perf_event.h> +#include <linux/bug.h> +#include <asm/perf_regs.h> +#include <asm/ptrace.h> + +u64 perf_reg_value(struct pt_regs *regs, int idx) +{ + if (WARN_ON_ONCE((u32)idx >= PERF_REG_ARM64_MAX)) + return 0; + + /* + * Compat (i.e. 32 bit) mode: + * - PC has been set in the pt_regs struct in kernel_entry, + * - Handle SP and LR here. + */ + if (compat_user_mode(regs)) { + if ((u32)idx == PERF_REG_ARM64_SP) + return regs->compat_sp; + if ((u32)idx == PERF_REG_ARM64_LR) + return regs->compat_lr; + } + + return regs->regs[idx]; +} + +#define REG_RESERVED (~((1ULL << PERF_REG_ARM64_MAX) - 1)) + +int perf_reg_validate(u64 mask) +{ + if (!mask || mask & REG_RESERVED) + return -EINVAL; + + return 0; +} + +u64 perf_reg_abi(struct task_struct *task) +{ + if (is_compat_thread(task_thread_info(task))) + return PERF_SAMPLE_REGS_ABI_32; + else + return PERF_SAMPLE_REGS_ABI_64; +}