perf uretprobe ppc64le: Fix probe location
authorRavi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Tue, 4 Oct 2016 10:27:45 +0000 (15:57 +0530)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 5 Oct 2016 11:14:22 +0000 (08:14 -0300)
Perf uretprobe probes on GEP(Global Entry Point) which fails to record
all function calls via LEP(Local Entry Point). Fix that by probing on LEP.

Objdump:

  00000000100005f0 <doit>:
      100005f0:   02 10 40 3c     lis     r2,4098
      100005f4:   00 7f 42 38     addi    r2,r2,32512
      100005f8:   a6 02 08 7c     mflr    r0
      100005fc:   10 00 01 f8     std     r0,16(r1)
      10000600:   f8 ff e1 fb     std     r31,-8(r1)

Before applying patch:

  $ cat /sys/kernel/debug/tracing/uprobe_events
    r:probe_uprobe_test/doit /home/ravi/uprobe_test:0x00000000000005f0

After applying patch:

  $ cat /sys/kernel/debug/tracing/uprobe_events
    r:probe_uprobe_test/doit /home/ravi/uprobe_test:0x00000000000005f8

This is not the case with kretprobes because the kernel itself finds LEP
and probes on it.

Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1475576865-6562-1-git-send-email-ravi.bangoria@linux.vnet.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/arch/powerpc/util/sym-handling.c

index ed9d5d15d5b69223b7fd915cae1a982d53b73e4b..1030a6e504bb9fe2a8f7eca185a419332613d924 100644 (file)
@@ -82,7 +82,8 @@ void arch__fix_tev_from_maps(struct perf_probe_event *pev,
         *
         * In addition, we shouldn't specify an offset for kretprobes.
         */
-       if (pev->point.offset || pev->point.retprobe || !map || !sym)
+       if (pev->point.offset || (!pev->uprobes && pev->point.retprobe) ||
+           !map || !sym)
                return;
 
        lep_offset = PPC64_LOCAL_ENTRY_OFFSET(sym->arch_sym);