Skip to contentSkip to conversation

riscv: Add perf callchain support

PATCH Superseded Mao Han 4 participants 11 messages Aug 29, 2019 – Sep 5, 2019

Subsystems (3)

v6 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

Mao Han

author
#0 lore raw

v6 cover riscv: Add perf callchain support

This patch set add perf callchain(FP/DWARF) support for RISC-V. It comes from the csky version callchain support with some slight modifications. The patchset base on Linux 5.3-rc6.

Changes since v5:
- use walk_stackframe from stacktrace.c to handle kernel callchain unwinding(fix invalid mem access)

Changes since v4:
- Add missing PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET verified with extra CFLAGS(-Wall -Werror)

Changes since v3:
- Add more strict check for unwind_frame_kernel
- update for kernel 5.3

Changes since v2:
- fix inconsistent comment
- force to build kernel with -fno-omit-frame-pointer if perf event is enabled

Changes since v1:
- simplify implementation and code convention

Cc Paul Walmsley <[email protected]>
Cc Greentime Hu <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc linux-riscv <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Guo Ren <[email protected]>

Mao Han (3):
riscv: Add perf callchain support
riscv: Add support for perf registers sampling
riscv: Add support for libdw

 arch/riscv/Kconfig                            |  2 +
 arch/riscv/Makefile                           |  3 +
 arch/riscv/include/uapi/asm/perf_regs.h       | 42 ++++++++++++
 arch/riscv/kernel/Makefile                    |  4 +-
 arch/riscv/kernel/perf_callchain.c            | 95 ++++++++++++++++++++++++++
 arch/riscv/kernel/perf_regs.c                 | 44 ++++++++++++
 arch/riscv/kernel/stacktrace.c                |  2 +-
 tools/arch/riscv/include/uapi/asm/perf_regs.h | 42 ++++++++++++
 tools/perf/Makefile.config                    |  6 +-
 tools/perf/arch/riscv/Build                   |  1 +
 tools/perf/arch/riscv/Makefile                |  4 ++
 tools/perf/arch/riscv/include/perf_regs.h     | 96 +++++++++++++++++++++++++++
 tools/perf/arch/riscv/util/Build              |  2 +
 tools/perf/arch/riscv/util/dwarf-regs.c       | 72 ++++++++++++++++++++
 tools/perf/arch/riscv/util/unwind-libdw.c     | 57 ++++++++++++++++
 15 files changed, 469 insertions(+), 3 deletions(-)
 create mode 100644 arch/riscv/include/uapi/asm/perf_regs.h
 create mode 100644 arch/riscv/kernel/perf_callchain.c
 create mode 100644 arch/riscv/kernel/perf_regs.c
 create mode 100644 tools/arch/riscv/include/uapi/asm/perf_regs.h
 create mode 100644 tools/perf/arch/riscv/Build
 create mode 100644 tools/perf/arch/riscv/Makefile
 create mode 100644 tools/perf/arch/riscv/include/perf_regs.h
 create mode 100644 tools/perf/arch/riscv/util/Build
 create mode 100644 tools/perf/arch/riscv/util/dwarf-regs.c
 create mode 100644 tools/perf/arch/riscv/util/unwind-libdw.c
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH v6 1/3 riscv: Add perf callchain support

This patch add support for perf callchain sampling on riscv platform. The return address of leaf function is retrieved from pt_regs as it is not saved in the outmost frame.

Cc Paul Walmsley <[email protected]>
Cc Greentime Hu <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc linux-riscv <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Guo Ren <[email protected]>
---
 arch/riscv/Makefile                |  3 ++
 arch/riscv/kernel/Makefile         |  3 +-
 arch/riscv/kernel/perf_callchain.c | 95 ++++++++++++++++++++++++++++++++++++++
 arch/riscv/kernel/stacktrace.c     |  2 +-
 4 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 arch/riscv/kernel/perf_callchain.c
arch/riscv/Makefile +3 -0
index 7a117be..946565b 100644
@@ -54,6 +54,9 @@ endif
 ifeq ($(CONFIG_MODULE_SECTIONS),y)
 	KBUILD_LDFLAGS_MODULE += -T $(srctree)/arch/riscv/kernel/module.lds
 endif
+ifeq ($(CONFIG_PERF_EVENTS),y)
+        KBUILD_CFLAGS += -fno-omit-frame-pointer
+endif
 
 KBUILD_CFLAGS_MODULE += $(call cc-option,-mno-relax)
 
arch/riscv/kernel/Makefile +2 -1
index 2420d37..b1bea89 100644
@@ -38,6 +38,7 @@ obj-$(CONFIG_MODULE_SECTIONS)	+= module-sections.o
 obj-$(CONFIG_FUNCTION_TRACER)	+= mcount.o ftrace.o
 obj-$(CONFIG_DYNAMIC_FTRACE)	+= mcount-dyn.o
 
-obj-$(CONFIG_PERF_EVENTS)      += perf_event.o
+obj-$(CONFIG_PERF_EVENTS)	+= perf_event.o
+obj-$(CONFIG_PERF_EVENTS)	+= perf_callchain.o
 
 clean:
arch/riscv/kernel/perf_callchain.c new file +95 -0

95 lines not on this page · raw message

arch/riscv/kernel/stacktrace.c +1 -1
index f156427..9b376c1 100644
@@ -19,7 +19,7 @@ struct stackframe {
 	unsigned long ra;
 };
 
-static void notrace walk_stackframe(struct task_struct *task,
+void notrace walk_stackframe(struct task_struct *task,
 	struct pt_regs *regs, bool (*fn)(unsigned long, void *), void *arg)
 {
 	unsigned long fp, sp, pc;
Signature · 1 line
2.7.4
Tested-by Greentime Hu on v6 1/3
#2 lore raw

Hello Mao Han,

Quoted 11 lines · Mao Han

This patch add support for perf callchain sampling on riscv platform. The return address of leaf function is retrieved from pt_regs as it is not saved in the outmost frame.

Cc Paul Walmsley <[email protected]>
Cc Greentime Hu <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc linux-riscv <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Guo Ren <[email protected]>

There are some 'checkpatch.pl --strict' warnings with this patch (below). These have been fixed here. The following patch has been queued for v5.4-rc1 with Greentime's Tested-by:. Thanks for your hard work following up on the feedback with these patches -

- Paul

CHECK: Alignment should match open parenthesis
#77: FILE: arch/riscv/kernel/perf_callchain.c:18:
+static unsigned long user_backtrace(struct perf_callchain_entry_ctx *entry,
+ unsigned long fp, unsigned long reg_ra)

CHECK: Blank lines aren't necessary after an open brace '{' #146: FILE: arch/riscv/kernel/perf_callchain.c:87:
+{
+

CHECK: Alignment should match open parenthesis
#165: FILE: arch/riscv/kernel/stacktrace.c:23:
+void notrace walk_stackframe(struct task_struct *task,
struct pt_regs *regs, bool (*fn)(unsigned long, void *), void *arg)

------

From: Mao Han <[email protected]>
Date: Thu, 29 Aug 2019 14:57:00 +0800
Subject: [PATCH] riscv: Add perf callchain support

This patch adds support for perf callchain sampling on riscv platforms. The return address of leaf function is retrieved from pt_regs as it is not saved in the outmost frame.

Cc Paul Walmsley <[email protected]>
Cc Greentime Hu <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc linux-riscv <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Guo Ren <[email protected]>

[[email protected]: fixed some 'checkpatch.pl --strict' issues;
fixed patch description spelling]

---
 arch/riscv/Makefile                |  3 +
 arch/riscv/kernel/Makefile         |  3 +-
 arch/riscv/kernel/perf_callchain.c | 94 ++++++++++++++++++++++++++++++
 arch/riscv/kernel/stacktrace.c     |  4 +-
 4 files changed, 101 insertions(+), 3 deletions(-)
 create mode 100644 arch/riscv/kernel/perf_callchain.c
arch/riscv/Makefile +3 -0
index a73659e30f8d..4f0a3d2018d2 100644
@@ -54,6 +54,9 @@ endif
 ifeq ($(CONFIG_MODULE_SECTIONS),y)
 	KBUILD_LDFLAGS_MODULE += -T $(srctree)/arch/riscv/kernel/module.lds
 endif
+ifeq ($(CONFIG_PERF_EVENTS),y)
+        KBUILD_CFLAGS += -fno-omit-frame-pointer
+endif
 
 KBUILD_CFLAGS_MODULE += $(call cc-option,-mno-relax)
 
arch/riscv/kernel/Makefile +2 -1
index 2420d37d96de..b1bea89fc814 100644
@@ -38,6 +38,7 @@ obj-$(CONFIG_MODULE_SECTIONS)	+= module-sections.o
 obj-$(CONFIG_FUNCTION_TRACER)	+= mcount.o ftrace.o
 obj-$(CONFIG_DYNAMIC_FTRACE)	+= mcount-dyn.o
 
-obj-$(CONFIG_PERF_EVENTS)      += perf_event.o
+obj-$(CONFIG_PERF_EVENTS)	+= perf_event.o
+obj-$(CONFIG_PERF_EVENTS)	+= perf_callchain.o
 
 clean:
arch/riscv/kernel/perf_callchain.c new file +94 -0

94 lines not on this page · raw message

arch/riscv/kernel/stacktrace.c +2 -2
index f15642715d1a..0940681d2f68 100644
@@ -19,8 +19,8 @@ struct stackframe {
 	unsigned long ra;
 };
 
-static void notrace walk_stackframe(struct task_struct *task,
-	struct pt_regs *regs, bool (*fn)(unsigned long, void *), void *arg)
+void notrace walk_stackframe(struct task_struct *task, struct pt_regs *regs,
+			     bool (*fn)(unsigned long, void *), void *arg)
 {
 	unsigned long fp, sp, pc;
 
Signature · 1 line
2.23.0
author
#3 lore raw
Quoted 16 lines · Paul Walmsley

Hello Mao Han,

Quoted 11 lines · Mao Han

This patch add support for perf callchain sampling on riscv platform. The return address of leaf function is retrieved from pt_regs as it is not saved in the outmost frame.

Cc Paul Walmsley <[email protected]>
Cc Greentime Hu <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc linux-riscv <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Guo Ren <[email protected]>
Quoted 4 lines

There are some 'checkpatch.pl --strict' warnings with this patch (below). These have been fixed here. The following patch has been queued for v5.4-rc1 with Greentime's Tested-by:. Thanks for your hard work following up on the feedback with these patches -

Thanks for the fixes. I'll check patches with --strict next time.

Thanks,
Mao Han

author
#4 lore raw

PATCH v6 2/3 riscv: Add support for perf registers sampling

In reply to Mao Han

This patch implements the perf registers sampling and validation API for riscv arch. The valid registers and their register ID are defined in perf_regs.h. Perf tool can backtrace in userspace with unwind library and the registers/user stack dump support.

Cc Paul Walmsley <[email protected]>
Cc Greentime Hu <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc linux-riscv <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Guo Ren <[email protected]>
---
 arch/riscv/Kconfig                      |  2 ++
 arch/riscv/include/uapi/asm/perf_regs.h | 42 +++++++++++++++++++++++++++++++
 arch/riscv/kernel/Makefile              |  1 +
 arch/riscv/kernel/perf_regs.c           | 44 +++++++++++++++++++++++++++++++++
 4 files changed, 89 insertions(+)
 create mode 100644 arch/riscv/include/uapi/asm/perf_regs.h
 create mode 100644 arch/riscv/kernel/perf_regs.c
arch/riscv/Kconfig +2 -0
index 59a4727..4bc976d 100644
@@ -35,6 +35,8 @@ config RISCV
 	select HAVE_DMA_CONTIGUOUS
 	select HAVE_FUTEX_CMPXCHG if FUTEX
 	select HAVE_PERF_EVENTS
+	select HAVE_PERF_REGS
+	select HAVE_PERF_USER_STACK_DUMP
 	select HAVE_SYSCALL_TRACEPOINTS
 	select IRQ_DOMAIN
 	select SPARSE_IRQ
arch/riscv/include/uapi/asm/perf_regs.h new file +42 -0

42 lines not on this page · raw message

arch/riscv/kernel/Makefile +1 -0
index b1bea89..696020f 100644
@@ -40,5 +40,6 @@ obj-$(CONFIG_DYNAMIC_FTRACE)	+= mcount-dyn.o
 
 obj-$(CONFIG_PERF_EVENTS)	+= perf_event.o
 obj-$(CONFIG_PERF_EVENTS)	+= perf_callchain.o
+obj-$(CONFIG_HAVE_PERF_REGS)	+= perf_regs.o
 
 clean:
arch/riscv/kernel/perf_regs.c new file +44 -0

44 lines not on this page · raw message

Signature · 1 line
2.7.4
#5 lore raw

Re: [PATCH V6 2/3] riscv: Add support for perf registers sampling

Hello Mao Han,

Quoted 4 lines · Mao Han

This patch implements the perf registers sampling and validation API for riscv arch. The valid registers and their register ID are defined in perf_regs.h. Perf tool can backtrace in userspace with unwind library and the registers/user stack dump support.

[ ... ]

arch/riscv/include/uapi/asm/perf_regs.h line 1

Quoted 7 lines
arch/riscv/include/uapi/asm/perf_regs.h new file +1 -0
new file mode 100644
index 0000000..df1a581
@@ -0,0 +1,42 @@
+/* SPDX-License-Identifier: GPL-2.0 */

All of the other Linux architectures use "GPL-2.0 WITH Linux-syscall-note" for their license for the perf uapi files. Could you please change this license string to match the standard Linux practice? Then I think it should be good to merge.

- Paul

author
#6 lore raw

PATCH v6 3/3 riscv: Add support for libdw

In reply to Mao Han

This patch add support for DWARF register mappings and libdw registers initialization, which is used by perf callchain analyzing when --call-graph=dwarf is given.

Cc Paul Walmsley <[email protected]>
Cc Greentime Hu <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc linux-riscv <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Guo Ren <[email protected]>
---
 tools/arch/riscv/include/uapi/asm/perf_regs.h | 42 ++++++++++++
 tools/perf/Makefile.config                    |  6 +-
 tools/perf/arch/riscv/Build                   |  1 +
 tools/perf/arch/riscv/Makefile                |  4 ++
 tools/perf/arch/riscv/include/perf_regs.h     | 96 +++++++++++++++++++++++++++
 tools/perf/arch/riscv/util/Build              |  2 +
 tools/perf/arch/riscv/util/dwarf-regs.c       | 72 ++++++++++++++++++++
 tools/perf/arch/riscv/util/unwind-libdw.c     | 57 ++++++++++++++++
 8 files changed, 279 insertions(+), 1 deletion(-)
 create mode 100644 tools/arch/riscv/include/uapi/asm/perf_regs.h
 create mode 100644 tools/perf/arch/riscv/Build
 create mode 100644 tools/perf/arch/riscv/Makefile
 create mode 100644 tools/perf/arch/riscv/include/perf_regs.h
 create mode 100644 tools/perf/arch/riscv/util/Build
 create mode 100644 tools/perf/arch/riscv/util/dwarf-regs.c
 create mode 100644 tools/perf/arch/riscv/util/unwind-libdw.c
tools/arch/riscv/include/uapi/asm/perf_regs.h new file +42 -0
new file mode 100644
index 0000000..df1a581
@@ -0,0 +1,42 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (C) 2019 Hangzhou C-SKY Microsystems co.,ltd. */
+
+#ifndef _ASM_RISCV_PERF_REGS_H
+#define _ASM_RISCV_PERF_REGS_H
+
+enum perf_event_riscv_regs {
+	PERF_REG_RISCV_PC,
+	PERF_REG_RISCV_RA,
+	PERF_REG_RISCV_SP,
+	PERF_REG_RISCV_GP,
+	PERF_REG_RISCV_TP,
+	PERF_REG_RISCV_T0,
+	PERF_REG_RISCV_T1,
+	PERF_REG_RISCV_T2,
+	PERF_REG_RISCV_S0,
+	PERF_REG_RISCV_S1,
+	PERF_REG_RISCV_A0,
+	PERF_REG_RISCV_A1,
+	PERF_REG_RISCV_A2,
+	PERF_REG_RISCV_A3,
+	PERF_REG_RISCV_A4,
+	PERF_REG_RISCV_A5,
+	PERF_REG_RISCV_A6,
+	PERF_REG_RISCV_A7,
+	PERF_REG_RISCV_S2,
+	PERF_REG_RISCV_S3,
+	PERF_REG_RISCV_S4,
+	PERF_REG_RISCV_S5,
+	PERF_REG_RISCV_S6,
+	PERF_REG_RISCV_S7,
+	PERF_REG_RISCV_S8,
+	PERF_REG_RISCV_S9,
+	PERF_REG_RISCV_S10,
+	PERF_REG_RISCV_S11,
+	PERF_REG_RISCV_T3,
+	PERF_REG_RISCV_T4,
+	PERF_REG_RISCV_T5,
+	PERF_REG_RISCV_T6,
+	PERF_REG_RISCV_MAX,
+};
+#endif /* _ASM_RISCV_PERF_REGS_H */
tools/perf/Makefile.config +5 -1
index 89ac5a1..eaf25ee 100644
@@ -60,6 +60,10 @@ ifeq ($(SRCARCH),arm64)
   LIBUNWIND_LIBS = -lunwind -lunwind-aarch64
 endif
 
+ifeq ($(SRCARCH),riscv)
+  NO_PERF_REGS := 0
+endif
+
 ifeq ($(SRCARCH),csky)
   NO_PERF_REGS := 0
 endif
@@ -82,7 +86,7 @@ endif
 # Disable it on all other architectures in case libdw unwind
 # support is detected in system. Add supported architectures
 # to the check.
-ifneq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc s390 csky))
+ifneq ($(SRCARCH),$(filter $(SRCARCH),x86 arm arm64 powerpc s390 csky riscv))
   NO_LIBDW_DWARF_UNWIND := 1
 endif
 
tools/perf/arch/riscv/Build new file +1 -0
new file mode 100644
index 0000000..e4e5f33
@@ -0,0 +1 @@
+perf-y += util/
tools/perf/arch/riscv/Makefile new file +4 -0
new file mode 100644
index 0000000..1aa9dd7
@@ -0,0 +1,4 @@
+ifndef NO_DWARF
+PERF_HAVE_DWARF_REGS := 1
+endif
+PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1
tools/perf/arch/riscv/include/perf_regs.h new file +96 -0

96 lines not on this page · raw message

tools/perf/arch/riscv/util/Build new file +2 -0
new file mode 100644
index 0000000..1160bb2
@@ -0,0 +1,2 @@
+perf-$(CONFIG_DWARF) += dwarf-regs.o
+perf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
tools/perf/arch/riscv/util/dwarf-regs.c new file +72 -0

72 lines not on this page · raw message

tools/perf/arch/riscv/util/unwind-libdw.c new file +57 -0

57 lines not on this page · raw message

Signature · 1 line
2.7.4
#7 lore raw

Re: [PATCH V6 3/3] riscv: Add support for libdw

Hello Mao Han,

tools/arch/riscv/include/uapi/asm/perf_regs.h line 1

Quoted 11 lines · Mao Han

This patch add support for DWARF register mappings and libdw registers initialization, which is used by perf callchain analyzing when --call-graph=dwarf is given.

tools/arch/riscv/include/uapi/asm/perf_regs.h new file +1 -0
new file mode 100644
index 0000000..df1a581
@@ -0,0 +1,42 @@
+/* SPDX-License-Identifier: GPL-2.0 */

As with

https://lore.kernel.org/linux-riscv/CAJF2gTRXH_bx0rwsTZMTnX+umZfVTL_iVnewPtVM50sLaqJPTg@mail.gmail.com/T/#t

is it possible to change this license string to "GPL-2.0 WITH Linux-syscall-note" to match the other Linux architectures?

- Paul

author
#8 lore raw

Re: [PATCH V6 3/3] riscv: Add support for libdw

Quoted 18 lines · Paul Walmsley

Hello Mao Han,

tools/arch/riscv/include/uapi/asm/perf_regs.h line 1

Quoted 11 lines · Mao Han

This patch add support for DWARF register mappings and libdw registers initialization, which is used by perf callchain analyzing when --call-graph=dwarf is given.

tools/arch/riscv/include/uapi/asm/perf_regs.h new file +1 -0
new file mode 100644
index 0000000..df1a581
@@ -0,0 +1,42 @@
+/* SPDX-License-Identifier: GPL-2.0 */

As with

Quoted 5 lines

https://lore.kernel.org/linux-riscv/CAJF2gTRXH_bx0rwsTZMTnX+umZfVTL_iVnewPtVM50sLaqJPTg@mail.gmail.com/T/#t

is it possible to change this license string to "GPL-2.0 WITH Linux-syscall-note" to match the other Linux architectures?

Thanks for suggestion. I didn't notice the UAPI headers are supposed to have the exception notes. I'll update the license string and resend them.

Thanks,
Mao Han

Tested-by on the v6 series
#9 lore raw
In reply to Mao Han

Mao Han <[email protected]> 於 2019年8月29日 週四 下午2:57寫道:

Quoted 55 lines

This patch set add perf callchain(FP/DWARF) support for RISC-V. It comes from the csky version callchain support with some slight modifications. The patchset base on Linux 5.3-rc6.

Changes since v5:
- use walk_stackframe from stacktrace.c to handle kernel callchain unwinding(fix invalid mem access)

Changes since v4:
- Add missing PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET verified with extra CFLAGS(-Wall -Werror)

Changes since v3:
- Add more strict check for unwind_frame_kernel
- update for kernel 5.3

Changes since v2:
- fix inconsistent comment
- force to build kernel with -fno-omit-frame-pointer if perf event is enabled

Changes since v1:
- simplify implementation and code convention

Cc Paul Walmsley <[email protected]>
Cc Greentime Hu <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc linux-riscv <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Guo Ren <[email protected]>

Mao Han (3):
riscv: Add perf callchain support
riscv: Add support for perf registers sampling
riscv: Add support for libdw

 arch/riscv/Kconfig                            |  2 +
 arch/riscv/Makefile                           |  3 +
 arch/riscv/include/uapi/asm/perf_regs.h       | 42 ++++++++++++
 arch/riscv/kernel/Makefile                    |  4 +-
 arch/riscv/kernel/perf_callchain.c            | 95 ++++++++++++++++++++++++++
 arch/riscv/kernel/perf_regs.c                 | 44 ++++++++++++
 arch/riscv/kernel/stacktrace.c                |  2 +-
 tools/arch/riscv/include/uapi/asm/perf_regs.h | 42 ++++++++++++
 tools/perf/Makefile.config                    |  6 +-
 tools/perf/arch/riscv/Build                   |  1 +
 tools/perf/arch/riscv/Makefile                |  4 ++
 tools/perf/arch/riscv/include/perf_regs.h     | 96 +++++++++++++++++++++++++++
 tools/perf/arch/riscv/util/Build              |  2 +
 tools/perf/arch/riscv/util/dwarf-regs.c       | 72 ++++++++++++++++++++
 tools/perf/arch/riscv/util/unwind-libdw.c     | 57 ++++++++++++++++
 15 files changed, 469 insertions(+), 3 deletions(-)
 create mode 100644 arch/riscv/include/uapi/asm/perf_regs.h
 create mode 100644 arch/riscv/kernel/perf_callchain.c
Quoted 9 lines
 create mode 100644 arch/riscv/kernel/perf_regs.c
 create mode 100644 tools/arch/riscv/include/uapi/asm/perf_regs.h
 create mode 100644 tools/perf/arch/riscv/Build
 create mode 100644 tools/perf/arch/riscv/Makefile
 create mode 100644 tools/perf/arch/riscv/include/perf_regs.h
 create mode 100644 tools/perf/arch/riscv/util/Build
 create mode 100644 tools/perf/arch/riscv/util/dwarf-regs.c
 create mode 100644 tools/perf/arch/riscv/util/unwind-libdw.c

I tested this patchset based on v5.3-rc6 and it can use dwarf or fp to backtrace in Unleashed board.

# perf record -e cpu-clock --call-graph dwarf ls -l /
total 4
drwxr-xr-x    2 root     root             0 Aug 26  2019 bin
drwxr-xr-x    5 root     root         12720 Jan  1 00:00 dev
drwxr-xr-x    5 root     root             0 Jan  1 00:00 etc
-rwxr-xr-x    1 root     root           178 Aug 26  2019 init
drwxr-xr-x    2 root     root             0 Aug 26  2019 lib
lrwxrwxrwx    1 root     root             3 Aug 19  2019 lib64 -> lib
lrwxrwxrwx    1 root     root            11 Aug 19  2019 linuxrc -> bin/busybox
drwxr-xr-x    2 root     root             0 Aug 19  2019 media
drwxr-xr-x    2 root     root             0 Aug 19  2019 mnt
drwxr-xr-x    2 root     root             0 Aug 19  2019 opt
dr-xr-xr-x   66 root     root             0 Jan  1 00:00 proc
drwx------    3 root     root             0 Jan  1 00:01 root
drwxr-xr-x    3 root     root           140 Jan  1 00:00 run
drwxr-xr-x    2 root     root             0 Aug 19  2019 sbin
dr-xr-xr-x   11 root     root             0 Jan  1 00:00 sys
drwxrwxrwt    2 root     root            60 Jan  1 00:00 tmp
drwxr-xr-x    6 root     root             0 Aug 26  2019 usr
drwxr-xr-x    4 root     root             0 Aug 26  2019 var
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.175 MB perf.data (21 samples) ]
# perf record -e cpu-clock --call-graph fp ls -l /
total 4
drwxr-xr-x    2 root     root             0 Aug 26  2019 bin
drwxr-xr-x    5 root     root         12720 Jan  1 00:00 dev
drwxr-xr-x    5 root     root             0 Jan  1 00:00 etc
-rwxr-xr-x    1 root     root           178 Aug 26  2019 init
drwxr-xr-x    2 root     root             0 Aug 26  2019 lib
lrwxrwxrwx    1 root     root             3 Aug 19  2019 lib64 -> lib
lrwxrwxrwx    1 root     root            11 Aug 19  2019 linuxrc -> bin/busybox
drwxr-xr-x    2 root     root             0 Aug 19  2019 media
drwxr-xr-x    2 root     root             0 Aug 19  2019 mnt
drwxr-xr-x    2 root     root             0 Aug 19  2019 opt
dr-xr-xr-x   66 root     root             0 Jan  1 00:00 proc
drwx------    3 root     root             0 Jan  1 00:00 root
drwxr-xr-x    3 root     root           140 Jan  1 00:00 run
drwxr-xr-x    2 root     root             0 Aug 19  2019 sbin
dr-xr-xr-x   11 root     root             0 Jan  1 00:00 sys
drwxrwxrwt    2 root     root            60 Jan  1 00:00 tmp
drwxr-xr-x    6 root     root             0 Aug 26  2019 usr
drwxr-xr-x    4 root     root             0 Aug 26  2019 var
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.004 MB perf.data (19 samples) ]
# perf test
 1: vmlinux symtab matches kallsyms            : Skip
 2: Detect openat syscall event                : FAILED!
 3: Detect openat syscall event on all cpus    : FAILED!
 4: Read samples using the mmap interface      : FAILED!
 5: Test data source output                    : Ok
 6: Parse event definition strings             : FAILED!
 7: Simple expression parser                   : Ok
 8: PERF_RECORD_* events & perf_sample fields  : FAILED!
 9: Parse perf pmu format                      : Ok
10: DSO data read                              : Ok
11: DSO data cache                             : Ok
12: DSO data reopen                            : Ok
13: Roundtrip evsel->name                      : Ok
14: Parse sched tracepoints fields             : Ok
15: syscalls:sys_enter_openat event fields     : FAILED!
16: Setup struct perf_event_attr               : Skip
17: Match and link multiple hists              : Ok
18: 'import perf' in python                    : FAILED!
19: Breakpoint overflow signal handler         : FAILED!
20: Breakpoint overflow sampling               : FAILED!
21: Breakpoint accounting                      : Skip
22: Watchpoint                                 :
22.1: Read Only Watchpoint                     : FAILED!
22.2: Write Only Watchpoint                    : FAILED!
22.3: Read / Write Watchpoint                  : FAILED!
22.4: Modify Watchpoint                        : FAILED!
23: Number of exit events of a simple workload : Ok
24: Software clock events period values        : Ok
25: Object code reading                        : Ok
26: Sample parsing                             : Ok
27: Use a dummy software event to keep tracking: Ok
28: Parse with no sample_id_all bit set        : Ok
29: Filter hist entries                        : Ok
30: Lookup mmap thread                         : Ok
31: Share thread mg                            : Ok
32: Sort output of hist entries                : Ok
33: Cumulate child hist entries                : Ok
34: Track with sched_switch                    : FAILED!
35: Filter fds with revents mask in a fdarray  : Ok
36: Add fd to a fdarray, making it autogrow    : Ok
37: kmod_path__parse                           : Ok
38: Thread map                                 : Ok
39: LLVM search and compile                    :
39.1: Basic BPF llvm compile                    : Skip
39.2: kbuild searching                          : Skip
39.3: Compile source for BPF prologue generation: Skip
39.4: Compile source for BPF relocation         : Skip
40: Session topology                           : FAILED!
41: BPF filter                                 :
41.1: Basic BPF filtering                      : Skip
41.2: BPF pinning                              : Skip
41.3: BPF prologue generation                  : Skip
41.4: BPF relocation checker                   : Skip
42: Synthesize thread map                      : Ok
43: Remove thread map                          : Ok
44: Synthesize cpu map                         : Ok
45: Synthesize stat config                     : Ok
46: Synthesize stat                            : Ok
47: Synthesize stat round                      : Ok
48: Synthesize attr update                     : Ok
49: Event times                                : Ok
50: Read backward ring buffer                  : Skip
51: Print cpu map                              : Ok
52: Probe SDT events                           : Skip
53: is_printable_array                         : Ok
54: Print bitmap                               : Ok
55: perf hooks                                 : Ok
56: builtin clang support                      : Skip (not compiled in)
57: unit_number__scnprintf                     : Ok
58: mem2node                                   : Ok
59: time utils                                 : Ok
60: map_groups__merge_in                       : Ok
#
maintainer
#10 lore raw

Nice job, thank you :)

Quoted 192 lines · Greentime Hu

Mao Han <[email protected]> 於 2019年8月29日 週四 下午2:57寫道:

Quoted 55 lines

This patch set add perf callchain(FP/DWARF) support for RISC-V. It comes from the csky version callchain support with some slight modifications. The patchset base on Linux 5.3-rc6.

Changes since v5:
- use walk_stackframe from stacktrace.c to handle kernel callchain unwinding(fix invalid mem access)

Changes since v4:
- Add missing PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET verified with extra CFLAGS(-Wall -Werror)

Changes since v3:
- Add more strict check for unwind_frame_kernel
- update for kernel 5.3

Changes since v2:
- fix inconsistent comment
- force to build kernel with -fno-omit-frame-pointer if perf event is enabled

Changes since v1:
- simplify implementation and code convention

Cc Paul Walmsley <[email protected]>
Cc Greentime Hu <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc linux-riscv <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Guo Ren <[email protected]>

Mao Han (3):
riscv: Add perf callchain support
riscv: Add support for perf registers sampling
riscv: Add support for libdw

 arch/riscv/Kconfig                            |  2 +
 arch/riscv/Makefile                           |  3 +
 arch/riscv/include/uapi/asm/perf_regs.h       | 42 ++++++++++++
 arch/riscv/kernel/Makefile                    |  4 +-
 arch/riscv/kernel/perf_callchain.c            | 95 ++++++++++++++++++++++++++
 arch/riscv/kernel/perf_regs.c                 | 44 ++++++++++++
 arch/riscv/kernel/stacktrace.c                |  2 +-
 tools/arch/riscv/include/uapi/asm/perf_regs.h | 42 ++++++++++++
 tools/perf/Makefile.config                    |  6 +-
 tools/perf/arch/riscv/Build                   |  1 +
 tools/perf/arch/riscv/Makefile                |  4 ++
 tools/perf/arch/riscv/include/perf_regs.h     | 96 +++++++++++++++++++++++++++
 tools/perf/arch/riscv/util/Build              |  2 +
 tools/perf/arch/riscv/util/dwarf-regs.c       | 72 ++++++++++++++++++++
 tools/perf/arch/riscv/util/unwind-libdw.c     | 57 ++++++++++++++++
 15 files changed, 469 insertions(+), 3 deletions(-)
 create mode 100644 arch/riscv/include/uapi/asm/perf_regs.h
 create mode 100644 arch/riscv/kernel/perf_callchain.c
Quoted 9 lines
 create mode 100644 arch/riscv/kernel/perf_regs.c
 create mode 100644 tools/arch/riscv/include/uapi/asm/perf_regs.h
 create mode 100644 tools/perf/arch/riscv/Build
 create mode 100644 tools/perf/arch/riscv/Makefile
 create mode 100644 tools/perf/arch/riscv/include/perf_regs.h
 create mode 100644 tools/perf/arch/riscv/util/Build
 create mode 100644 tools/perf/arch/riscv/util/dwarf-regs.c
 create mode 100644 tools/perf/arch/riscv/util/unwind-libdw.c

I tested this patchset based on v5.3-rc6 and it can use dwarf or fp to backtrace in Unleashed board.

# perf record -e cpu-clock --call-graph dwarf ls -l /
total 4
drwxr-xr-x    2 root     root             0 Aug 26  2019 bin
drwxr-xr-x    5 root     root         12720 Jan  1 00:00 dev
drwxr-xr-x    5 root     root             0 Jan  1 00:00 etc
-rwxr-xr-x    1 root     root           178 Aug 26  2019 init
drwxr-xr-x    2 root     root             0 Aug 26  2019 lib
lrwxrwxrwx    1 root     root             3 Aug 19  2019 lib64 -> lib
lrwxrwxrwx    1 root     root            11 Aug 19  2019 linuxrc -> bin/busybox
drwxr-xr-x    2 root     root             0 Aug 19  2019 media
drwxr-xr-x    2 root     root             0 Aug 19  2019 mnt
drwxr-xr-x    2 root     root             0 Aug 19  2019 opt
dr-xr-xr-x   66 root     root             0 Jan  1 00:00 proc
drwx------    3 root     root             0 Jan  1 00:01 root
drwxr-xr-x    3 root     root           140 Jan  1 00:00 run
drwxr-xr-x    2 root     root             0 Aug 19  2019 sbin
dr-xr-xr-x   11 root     root             0 Jan  1 00:00 sys
drwxrwxrwt    2 root     root            60 Jan  1 00:00 tmp
drwxr-xr-x    6 root     root             0 Aug 26  2019 usr
drwxr-xr-x    4 root     root             0 Aug 26  2019 var
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.175 MB perf.data (21 samples) ]
# perf record -e cpu-clock --call-graph fp ls -l /
total 4
drwxr-xr-x    2 root     root             0 Aug 26  2019 bin
drwxr-xr-x    5 root     root         12720 Jan  1 00:00 dev
drwxr-xr-x    5 root     root             0 Jan  1 00:00 etc
-rwxr-xr-x    1 root     root           178 Aug 26  2019 init
drwxr-xr-x    2 root     root             0 Aug 26  2019 lib
lrwxrwxrwx    1 root     root             3 Aug 19  2019 lib64 -> lib
lrwxrwxrwx    1 root     root            11 Aug 19  2019 linuxrc -> bin/busybox
drwxr-xr-x    2 root     root             0 Aug 19  2019 media
drwxr-xr-x    2 root     root             0 Aug 19  2019 mnt
drwxr-xr-x    2 root     root             0 Aug 19  2019 opt
dr-xr-xr-x   66 root     root             0 Jan  1 00:00 proc
drwx------    3 root     root             0 Jan  1 00:00 root
drwxr-xr-x    3 root     root           140 Jan  1 00:00 run
drwxr-xr-x    2 root     root             0 Aug 19  2019 sbin
dr-xr-xr-x   11 root     root             0 Jan  1 00:00 sys
drwxrwxrwt    2 root     root            60 Jan  1 00:00 tmp
drwxr-xr-x    6 root     root             0 Aug 26  2019 usr
drwxr-xr-x    4 root     root             0 Aug 26  2019 var
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.004 MB perf.data (19 samples) ]
# perf test
 1: vmlinux symtab matches kallsyms            : Skip
 2: Detect openat syscall event                : FAILED!
 3: Detect openat syscall event on all cpus    : FAILED!
 4: Read samples using the mmap interface      : FAILED!
 5: Test data source output                    : Ok
 6: Parse event definition strings             : FAILED!
 7: Simple expression parser                   : Ok
 8: PERF_RECORD_* events & perf_sample fields  : FAILED!
 9: Parse perf pmu format                      : Ok
10: DSO data read                              : Ok
11: DSO data cache                             : Ok
12: DSO data reopen                            : Ok
13: Roundtrip evsel->name                      : Ok
14: Parse sched tracepoints fields             : Ok
15: syscalls:sys_enter_openat event fields     : FAILED!
16: Setup struct perf_event_attr               : Skip
17: Match and link multiple hists              : Ok
18: 'import perf' in python                    : FAILED!
19: Breakpoint overflow signal handler         : FAILED!
20: Breakpoint overflow sampling               : FAILED!
21: Breakpoint accounting                      : Skip
22: Watchpoint                                 :
22.1: Read Only Watchpoint                     : FAILED!
22.2: Write Only Watchpoint                    : FAILED!
22.3: Read / Write Watchpoint                  : FAILED!
22.4: Modify Watchpoint                        : FAILED!
23: Number of exit events of a simple workload : Ok
24: Software clock events period values        : Ok
25: Object code reading                        : Ok
26: Sample parsing                             : Ok
27: Use a dummy software event to keep tracking: Ok
28: Parse with no sample_id_all bit set        : Ok
29: Filter hist entries                        : Ok
30: Lookup mmap thread                         : Ok
31: Share thread mg                            : Ok
32: Sort output of hist entries                : Ok
33: Cumulate child hist entries                : Ok
34: Track with sched_switch                    : FAILED!
35: Filter fds with revents mask in a fdarray  : Ok
36: Add fd to a fdarray, making it autogrow    : Ok
37: kmod_path__parse                           : Ok
38: Thread map                                 : Ok
39: LLVM search and compile                    :
39.1: Basic BPF llvm compile                    : Skip
39.2: kbuild searching                          : Skip
39.3: Compile source for BPF prologue generation: Skip
39.4: Compile source for BPF relocation         : Skip
40: Session topology                           : FAILED!
41: BPF filter                                 :
41.1: Basic BPF filtering                      : Skip
41.2: BPF pinning                              : Skip
41.3: BPF prologue generation                  : Skip
41.4: BPF relocation checker                   : Skip
42: Synthesize thread map                      : Ok
43: Remove thread map                          : Ok
44: Synthesize cpu map                         : Ok
45: Synthesize stat config                     : Ok
46: Synthesize stat                            : Ok
47: Synthesize stat round                      : Ok
48: Synthesize attr update                     : Ok
49: Event times                                : Ok
50: Read backward ring buffer                  : Skip
51: Print cpu map                              : Ok
52: Probe SDT events                           : Skip
53: is_printable_array                         : Ok
54: Print bitmap                               : Ok
55: perf hooks                                 : Ok
56: builtin clang support                      : Skip (not compiled in)
57: unit_number__scnprintf                     : Ok
58: mem2node                                   : Ok
59: time utils                                 : Ok
60: map_groups__merge_in                       : Ok
#
Signature · 4 lines
Best Regards
 Guo Ren

ML: https://lore.kernel.org/linux-csky/