Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b29dfbb authored by He Kuang's avatar He Kuang Committed by Arnaldo Carvalho de Melo
Browse files

perf probe: Fix wrong register name for arm64



The register name of arm64 architecture is x0-x31 not r0-r31, this patch
changes this typo.

Before this patch:

  # perf probe --definition 'sys_write count'
  p:probe/sys_write _text+1502872 count=%r2:s64

  # echo 'p:probe/sys_write _text+1502872 count=%r2:s64' > \
    /sys/kernel/debug/tracing/kprobe_events
  Parse error at argument[0]. (-22)

After this patch:

  # perf probe --definition 'sys_write count'
  p:probe/sys_write _text+1502872 count=%x2:s64

  # echo 'p:probe/sys_write _text+1502872 count=%x2:s64' > \
    /sys/kernel/debug/tracing/kprobe_events
  # echo 1 >/sys/kernel/debug/tracing/events/probe/enable
  # cat /sys/kernel/debug/tracing/trace
  ...
  sh-422   [000] d... 650.495930: sys_write: (SyS_write+0x0/0xc8) count=22
  sh-422   [000] d... 651.102389: sys_write: (SyS_write+0x0/0xc8) count=26
  sh-422   [000] d... 651.358653: sys_write: (SyS_write+0x0/0xc8) count=86

Signed-off-by: default avatarHe Kuang <hekuang@huawei.com>
Acked-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Bintian Wang <bintian.wang@huawei.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20170124103015.1936-2-hekuang@huawei.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 190bacca
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@
/* This is included in perf/util/dwarf-regs.c */

static const char * const aarch64_regstr_tbl[] = {
	"%r0", "%r1", "%r2", "%r3", "%r4",
	"%r5", "%r6", "%r7", "%r8", "%r9",
	"%r10", "%r11", "%r12", "%r13", "%r14",
	"%r15", "%r16", "%r17", "%r18", "%r19",
	"%r20", "%r21", "%r22", "%r23", "%r24",
	"%r25", "%r26", "%r27", "%r28", "%r29",
	"%x0", "%x1", "%x2", "%x3", "%x4",
	"%x5", "%x6", "%x7", "%x8", "%x9",
	"%x10", "%x11", "%x12", "%x13", "%x14",
	"%x15", "%x16", "%x17", "%x18", "%x19",
	"%x20", "%x21", "%x22", "%x23", "%x24",
	"%x25", "%x26", "%x27", "%x28", "%x29",
	"%lr", "%sp",
};
#endif