From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932935AbdBOXnX (ORCPT ); Wed, 15 Feb 2017 18:43:23 -0500 Received: from mail.kernel.org ([198.145.29.136]:45878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755858AbdBOXnU (ORCPT ); Wed, 15 Feb 2017 18:43:20 -0500 Date: Thu, 16 Feb 2017 08:43:05 +0900 From: Masami Hiramatsu To: "Naveen N. Rao" Cc: Ananth N Mavinakayanahalli , Arnaldo Carvalho de Melo , Ingo Molnar , Namhyung Kim , linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/3] perf: revert "perf probe: Fix probing kretprobes" Message-Id: <20170216084305.2e03eeab6275a5f1a1443d0d@kernel.org> In-Reply-To: <5983c261ca94850ada6a1a617c07c261023da20f.1487181941.git.naveen.n.rao@linux.vnet.ibm.com> References: <20170215175346.GE3169@naverao1-tp.localdomain> <5983c261ca94850ada6a1a617c07c261023da20f.1487181941.git.naveen.n.rao@linux.vnet.ibm.com> X-Mailer: Sylpheed 3.5.0 (GTK+ 2.24.30; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 15 Feb 2017 23:47:54 +0530 "Naveen N. Rao" wrote: > This reverts commit 25dd9171f51c ("perf probe: Fix probing kretprobes"). > kprobe_events now accepts offsets for kretprobes. > > perf needs to be able to place return probes on static functions that > have the same name. Using the function name doesn't allow us to do that. > Instead, we should use the same scheme we use for kprobes: offset'ing > from _text/_stext. So now we can use retprobe on static functions safely :) Acked-by: Masami Hiramatsu Thanks! > > Signed-off-by: Naveen N. Rao > --- > tools/perf/util/probe-event.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c > index 6a6f44dd594b..fa7f81af11e8 100644 > --- a/tools/perf/util/probe-event.c > +++ b/tools/perf/util/probe-event.c > @@ -757,7 +757,7 @@ post_process_kernel_probe_trace_events(struct probe_trace_event *tevs, > } > > for (i = 0; i < ntevs; i++) { > - if (!tevs[i].point.address || tevs[i].point.retprobe) > + if (!tevs[i].point.address) > continue; > /* If we found a wrong one, mark it by NULL symbol */ > if (kprobe_warn_out_range(tevs[i].point.symbol, > @@ -2841,7 +2841,7 @@ static int find_probe_trace_events_from_map(struct perf_probe_event *pev, > } > > /* Note that the symbols in the kmodule are not relocated */ > - if (!pev->uprobes && !pp->retprobe && !pev->target) { > + if (!pev->uprobes && !pev->target) { > reloc_sym = kernel_get_ref_reloc_sym(); > if (!reloc_sym) { > pr_warning("Relocated base symbol is not found!\n"); > -- > 2.11.0 > -- Masami Hiramatsu