perf, riscv: Wire up perf trace support for RISC-V
Subsystems (2)
PATCH 1/1 perf, riscv: Wire up perf trace support for RISC-V
From: Björn Töpel <[email protected]>
RISC-V does not currently support perf trace, since the system call table is not generated.
Perform the copy/paste exercise, wiring up RISC-V system call table generation.
--- tools/perf/Makefile.config | 6 ++- tools/perf/arch/riscv/Makefile | 22 +++++++++ .../arch/riscv/entry/syscalls/mksyscalltbl | 47 +++++++++++++++++++ tools/perf/util/syscalltbl.c | 4 ++ 4 files changed, 78 insertions(+), 1 deletion(-) create mode 100755 tools/perf/arch/riscv/entry/syscalls/mksyscalltbl
tools/perf/Makefile.config +5 -1
@@ -31,7 +31,7 @@ $(call detected_var,SRCARCH) ifneq ($(NO_SYSCALL_TABLE),1) NO_SYSCALL_TABLE := 1 - ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 powerpc arm64 s390 mips loongarch)) + ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 powerpc arm64 s390 mips loongarch riscv)) NO_SYSCALL_TABLE := 0 endif
@@ -83,6 +83,10 @@ ifeq ($(ARCH),mips) LIBUNWIND_LIBS = -lunwind -lunwind-mips endif +ifeq ($(ARCH),riscv) + CFLAGS += -I$(OUTPUT)arch/riscv/include/generated +endif + # So far there's only x86 and arm libdw unwind support merged in perf. # Disable it on all other architectures in case libdw unwind # support is detected in system. Add supported architectures
tools/perf/arch/riscv/Makefile +22 -0
@@ -4,3 +4,25 @@ endif PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1 PERF_HAVE_JITDUMP := 1 HAVE_KVM_STAT_SUPPORT := 1 + +# +# Syscall table generation for perf +# + +out := $(OUTPUT)arch/riscv/include/generated/asm +header := $(out)/syscalls.c +incpath := $(srctree)/tools +sysdef := $(srctree)/tools/arch/riscv/include/uapi/asm/unistd.h +sysprf := $(srctree)/tools/perf/arch/riscv/entry/syscalls/ +systbl := $(sysprf)/mksyscalltbl + +# Create output directory if not already present +$(shell [ -d '$(out)' ] || mkdir -p '$(out)') + +$(header): $(sysdef) $(systbl) + $(Q)$(SHELL) '$(systbl)' '$(CC)' '$(HOSTCC)' $(incpath) $(sysdef) > $@ + +clean:: + $(call QUIET_CLEAN, riscv) $(RM) $(header) + +archheaders: $(header)
tools/perf/arch/riscv/entry/syscalls/mksyscalltbl new file +47 -0
47 lines not on this page · raw message
tools/perf/util/syscalltbl.c +4 -0
@@ -46,6 +46,10 @@ static const char *const *syscalltbl_native = syscalltbl_mips_n64;#include <asm/syscalls.c> const int syscalltbl_native_max_id =SYSCALLTBL_LOONGARCH_MAX_ID ;static const char *const *syscalltbl_native = syscalltbl_loongarch; +#elif defined(__riscv) +#include <asm/syscalls.c> +const int syscalltbl_native_max_id =SYSCALLTBL_RISCV_MAX_ID ; +static const char *const *syscalltbl_native = syscalltbl_riscv;#endif struct syscall {
base-commit: c2ee9f594da826bea183ed14f2cc029c719bf4da
Signature · 1 line
2.45.2
Namhyung Kim
maintainerHello,
Quoted 7 lines · Björn Töpel
From: Björn Töpel <[email protected]>
RISC-V does not currently support perf trace, since the system call table is not generated.
Perform the copy/paste exercise, wiring up RISC-V system call table generation.
Can anybody with RISC-V please test this?
Thanks,
Namhyung
Quoted 137 lines
Signed-off-by Björn Töpel <[email protected]>--- tools/perf/Makefile.config | 6 ++- tools/perf/arch/riscv/Makefile | 22 +++++++++ .../arch/riscv/entry/syscalls/mksyscalltbl | 47 +++++++++++++++++++ tools/perf/util/syscalltbl.c | 4 ++ 4 files changed, 78 insertions(+), 1 deletion(-) create mode 100755 tools/perf/arch/riscv/entry/syscalls/mksyscalltbltools/perf/Makefile.config +5
-1@@ -31,7 +31,7 @@ $(call detected_var,SRCARCH) ifneq ($(NO_SYSCALL_TABLE),1) NO_SYSCALL_TABLE := 1 - ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 powerpc arm64 s390 mips loongarch)) + ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 powerpc arm64 s390 mips loongarch riscv)) NO_SYSCALL_TABLE := 0 endif@@ -83,6 +83,10 @@ ifeq ($(ARCH),mips) LIBUNWIND_LIBS = -lunwind -lunwind-mips endif +ifeq ($(ARCH),riscv) + CFLAGS += -I$(OUTPUT)arch/riscv/include/generated +endif + # So far there's only x86 and arm libdw unwind support merged in perf. # Disable it on all other architectures in case libdw unwind # support is detected in system. Add supported architecturestools/perf/arch/riscv/Makefile +22
-0@@ -4,3 +4,25 @@ endif PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1 PERF_HAVE_JITDUMP := 1 HAVE_KVM_STAT_SUPPORT := 1 + +# +# Syscall table generation for perf +# + +out := $(OUTPUT)arch/riscv/include/generated/asm +header := $(out)/syscalls.c +incpath := $(srctree)/tools +sysdef := $(srctree)/tools/arch/riscv/include/uapi/asm/unistd.h +sysprf := $(srctree)/tools/perf/arch/riscv/entry/syscalls/ +systbl := $(sysprf)/mksyscalltbl + +# Create output directory if not already present +$(shell [ -d '$(out)' ] || mkdir -p '$(out)') + +$(header): $(sysdef) $(systbl) + $(Q)$(SHELL) '$(systbl)' '$(CC)' '$(HOSTCC)' $(incpath) $(sysdef) > $@ + +clean:: + $(call QUIET_CLEAN, riscv) $(RM) $(header) + +archheaders: $(header)tools/perf/arch/riscv/entry/syscalls/mksyscalltbl new file +47
-0@@ -0,0 +1,47 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# Generate system call table for perf. Derived from +# powerpc script. +# +# Copyright IBM Corp. 2017 +# Author(s): Hendrik Brueckner <[email protected]> +# Changed by: Ravi Bangoria <[email protected]> +# Changed by: Kim Phillips <[email protected]> +# Changed by: Björn Töpel <[email protected]> + +gcc=$1 +hostcc=$2 +incpath=$3 +input=$4 + +if ! test -r $input; then + echo "Could not read input file" >&2 + exit 1 +fi + +create_sc_table() +{ + local sc nr max_nr + + while read sc nr; do + printf "%s\n" " [$nr] = \"$sc\"," + max_nr=$nr + done + + echo "#define SYSCALLTBL_RISCV_MAX_ID $max_nr" +} + +create_table() +{ + echo "#include \"$input\"" + echo "static const char *const syscalltbl_riscv[] = {" + create_sc_table + echo "};" +} + +$gcc -E -dM -x c -I $incpath/include/uapi $input \ + |awk '$2 ~ "__NR" && $3 !~ "__NR3264_" { + sub("^#define __NR(3264)?_", ""); + print | "sort -k2 -n"}' \ + |create_tabletools/perf/util/syscalltbl.c +4
-0@@ -46,6 +46,10 @@ static const char *const *syscalltbl_native = syscalltbl_mips_n64;#include <asm/syscalls.c> const int syscalltbl_native_max_id =SYSCALLTBL_LOONGARCH_MAX_ID ;static const char *const *syscalltbl_native = syscalltbl_loongarch; +#elif defined(__riscv) +#include <asm/syscalls.c> +const int syscalltbl_native_max_id =SYSCALLTBL_RISCV_MAX_ID ; +static const char *const *syscalltbl_native = syscalltbl_riscv;#endif struct syscall {base-commit:
c2ee9f594da826bea183ed14f2cc029c719bf4daSignature · 1 line
2.45.2
Hi Bjorn, Namhyung,
Quoted 11 lines · Namhyung Kim
Hello,
Quoted 7 lines · Björn Töpel
From: Björn Töpel <[email protected]>
RISC-V does not currently support perf trace, since the system call table is not generated.
Perform the copy/paste exercise, wiring up RISC-V system call table generation.
Can anybody with RISC-V please test this?
So before this patch, I get:
Error::5File /sys/kernel/tracing//events/raw_syscalls/sys_(enter|exit) not found. Hint: Perhaps this kernel misses some CONFIG_ setting to enable this feature?.
After applying this patch, I get a proper trace:
....
7.435 ( 0.332 ms): ls/1307 openat(dfd: CWD, filename: 0xb36ef668, flags: RDONLY|CLOEXEC) = 3 8.023 ( 0.454 ms): ls/1307 mmap(len: 23171, prot: READ, flags: PRIVATE, fd: 3) = 0x7fffb36cd000 8.558 ( 0.065 ms): ls/1307 close(fd: 3) = 0 8.850 ( 0.294 ms): ls/1307 openat(dfd: CWD, filename: 0xb36f9f80, flags: RDONLY|CLOEXEC) = 3 9.223 ( 0.152 ms): ls/1307 read(fd: 3, buf: 0x7fffe27b3c20, count: 832)
...
So you can add:
Thanks,
Alex
Quoted 144 lines
Thanks,
NamhyungQuoted 132 lines
Signed-off-by Björn Töpel <[email protected]>--- tools/perf/Makefile.config | 6 ++- tools/perf/arch/riscv/Makefile | 22 +++++++++ .../arch/riscv/entry/syscalls/mksyscalltbl | 47 +++++++++++++++++++ tools/perf/util/syscalltbl.c | 4 ++ 4 files changed, 78 insertions(+), 1 deletion(-)create mode 100755
tools/perf/arch/riscv/entry/syscalls/mksyscalltbltools/perf/Makefile.config +5
-1@@ -31,7 +31,7 @@ $(call detected_var,SRCARCH) ifneq ($(NO_SYSCALL_TABLE),1) NO_SYSCALL_TABLE := 1 - ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 powerpc arm64 s390 mips loongarch)) + ifeq ($(SRCARCH),$(filter $(SRCARCH),x86 powerpc arm64 s390 mips loongarch riscv)) NO_SYSCALL_TABLE := 0 endif@@ -83,6 +83,10 @@ ifeq ($(ARCH),mips) LIBUNWIND_LIBS = -lunwind -lunwind-mips endif +ifeq ($(ARCH),riscv) + CFLAGS += -I$(OUTPUT)arch/riscv/include/generated +endif + # So far there's only x86 and arm libdw unwind support merged in perf. # Disable it on all other architectures in case libdw unwind # support is detected in system. Add supported architecturestools/perf/arch/riscv/Makefile +22
-0@@ -4,3 +4,25 @@ endif PERF_HAVE_ARCH_REGS_QUERY_REGISTER_OFFSET := 1 PERF_HAVE_JITDUMP := 1 HAVE_KVM_STAT_SUPPORT := 1 + +# +# Syscall table generation for perf +# + +out := $(OUTPUT)arch/riscv/include/generated/asm +header := $(out)/syscalls.c +incpath := $(srctree)/tools +sysdef := $(srctree)/tools/arch/riscv/include/uapi/asm/unistd.h +sysprf := $(srctree)/tools/perf/arch/riscv/entry/syscalls/ +systbl := $(sysprf)/mksyscalltbl + +# Create output directory if not already present +$(shell [ -d '$(out)' ] || mkdir -p '$(out)') + +$(header): $(sysdef) $(systbl) + $(Q)$(SHELL) '$(systbl)' '$(CC)' '$(HOSTCC)' $(incpath) $(sysdef) > $@ + +clean:: + $(call QUIET_CLEAN, riscv) $(RM) $(header) + +archheaders: $(header)tools/perf/arch/riscv/entry/syscalls/mksyscalltbl new file +47
-0@@ -0,0 +1,47 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# Generate system call table for perf. Derived from +# powerpc script. +# +# Copyright IBM Corp. 2017 +# Author(s): Hendrik Brueckner <[email protected]> +# Changed by: Ravi Bangoria <[email protected]> +# Changed by: Kim Phillips <[email protected]> +# Changed by: Björn Töpel <[email protected]> + +gcc=$1 +hostcc=$2 +incpath=$3 +input=$4 + +if ! test -r $input; then + echo "Could not read input file" >&2 + exit 1 +fi + +create_sc_table() +{ + local sc nr max_nr + + while read sc nr; do + printf "%s\n" " [$nr] = \"$sc\"," + max_nr=$nr + done + + echo "#define SYSCALLTBL_RISCV_MAX_ID $max_nr" +} + +create_table() +{ + echo "#include \"$input\"" + echo "static const char *const syscalltbl_riscv[] = {" + create_sc_table + echo "};" +} + +$gcc -E -dM -x c -I $incpath/include/uapi $input \ + |awk '$2 ~ "__NR" && $3 !~ "__NR3264_" { + sub("^#define __NR(3264)?_", ""); + print | "sort -k2 -n"}' \ + |create_tabletools/perf/util/syscalltbl.c +4
-0@@ -46,6 +46,10 @@ static const char *const *syscalltbl_native = syscalltbl_mips_n64;#include <asm/syscalls.c> const int syscalltbl_native_max_id =SYSCALLTBL_LOONGARCH_MAX_ID ;static const char *const *syscalltbl_native = syscalltbl_loongarch; +#elif defined(__riscv) +#include <asm/syscalls.c> +const int syscalltbl_native_max_id =SYSCALLTBL_RISCV_MAX_ID ; +static const char *const *syscalltbl_native = syscalltbl_riscv;#endif struct syscall {Quoted 4 lines
base-commit:
c2ee9f594da826bea183ed14f2cc029c719bf4daSignature · 1 line
2.45.2_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Namhyung Kim
maintainerHello,
Quoted 36 lines · Alexandre Ghiti
Hi Bjorn, Namhyung,
Quoted 11 lines · Namhyung Kim
Hello,
Quoted 7 lines · Björn Töpel
From: Björn Töpel <[email protected]>
RISC-V does not currently support perf trace, since the system call table is not generated.
Perform the copy/paste exercise, wiring up RISC-V system call table generation.
Can anybody with RISC-V please test this?
So before this patch, I get:
Error::5File /sys/kernel/tracing//events/raw_syscalls/sys_(enter|exit) not found.
Hint: Perhaps this kernel misses someCONFIG_setting to enable this feature?.After applying this patch, I get a proper trace:
....7.435 ( 0.332 ms): ls/1307 openat(dfd: CWD, filename:
0xb36ef668,
flags: RDONLY|CLOEXEC) = 3
8.023 ( 0.454 ms): ls/1307 mmap(len: 23171, prot: READ, flags: PRIVATE,
fd: 3) =0x7fffb36cd000
8.558 ( 0.065 ms): ls/1307 close(fd:
3) = 0 8.850 ( 0.294 ms): ls/1307 openat(dfd: CWD, filename:0xb36f9f80,
flags: RDONLY|CLOEXEC) = 3
9.223 ( 0.152 ms): ls/1307read(fd: 3, buf: 0x7fffe27b3c20, count: 832)
Quoted 5 lines
...
So you can add:
Tested-by Alexandre Ghiti <[email protected]>
Thanks for your test!
Namhyung
Quoted 8 lines · Björn Töpel
RISC-V does not currently support perf trace, since the system call table is not generated.
Perform the copy/paste exercise, wiring up RISC-V system call table generation.
[...]
Applied to perf-tools-next, thanks!
Best regards,
Namhyung
This patch was applied to riscv/linux.git (fixes) by Namhyung Kim <[email protected]>:
Hello:
This patch was applied to riscv/linux.git (fixes)
by Namhyung Kim <[email protected]>:
Quoted 9 lines · On Thu, 24 Oct 2024 12:03:51 -0700 you wrote:
From: Björn Töpel <[email protected]>
RISC-V does not currently support perf trace, since the system call table is not generated.
Perform the copy/paste exercise, wiring up RISC-V system call table generation.
[...]
Here is the summary with links:
- perf, riscv: Wire up perf trace support for RISC-V
https://git.kernel.org/riscv/c/8c0d1202bad3
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html