Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932146AbbFRIOe (ORCPT ); Thu, 18 Jun 2015 04:14:34 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57100 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753360AbbFRIN6 (ORCPT ); Thu, 18 Jun 2015 04:13:58 -0400 Date: Thu, 18 Jun 2015 01:12:38 -0700 From: tip-bot for Masami Hiramatsu Message-ID: Cc: dsahern@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, naota@elisp.net, mingo@kernel.org, acme@redhat.com, masami.hiramatsu.pt@hitachi.com, tglx@linutronix.de, jolsa@redhat.com, namhyung@kernel.org, peterz@infradead.org Reply-To: tglx@linutronix.de, acme@redhat.com, masami.hiramatsu.pt@hitachi.com, namhyung@kernel.org, jolsa@redhat.com, peterz@infradead.org, hpa@zytor.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, naota@elisp.net, mingo@kernel.org In-Reply-To: <20150612050820.20548.41625.stgit@localhost.localdomain> References: <20150612050820.20548.41625.stgit@localhost.localdomain> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf probe: Cut off the gcc optimization postfixes from function name Git-Commit-ID: 35a23ff928b066b00a826d0a9ed9411b8ab479ef X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3047 Lines: 84 Commit-ID: 35a23ff928b066b00a826d0a9ed9411b8ab479ef Gitweb: http://git.kernel.org/tip/35a23ff928b066b00a826d0a9ed9411b8ab479ef Author: Masami Hiramatsu AuthorDate: Fri, 12 Jun 2015 14:08:20 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 12 Jun 2015 16:14:48 -0300 perf probe: Cut off the gcc optimization postfixes from function name Cut off the postfixes which gcc added for optimized routines from the event name automatically generated from symbol name, since *probe-events doesn't accept it. Those symbols will be used if we don't use debuginfo to find target functions. E.g. without this fix; ----- # perf probe -va alloc_buf.isra.23 probe-definition(0): alloc_buf.isra.23 symbol:alloc_buf.isra.23 file:(null) line:0 offset:0 return:0 lazy:(null) [...] Opening /sys/kernel/debug/tracing/kprobe_events write=1 Added new event: Writing event: p:probe/alloc_buf.isra.23 _text+4869328 Failed to write event: Invalid argument Error: Failed to add events. Reason: Invalid argument (Code: -22) ----- With this fix; ----- perf probe -va alloc_buf.isra.23 probe-definition(0): alloc_buf.isra.23 symbol:alloc_buf.isra.23 file:(null) line:0 offset:0 return:0 lazy:(null) [...] Opening /sys/kernel/debug/tracing/kprobe_events write=1 Added new event: Writing event: p:probe/alloc_buf _text+4869328 probe:alloc_buf (on alloc_buf.isra.23) You can now use it in all perf tools, such as: perf record -e probe:alloc_buf -aR sleep 1 ----- Signed-off-by: Masami Hiramatsu Tested-by: Arnaldo Carvalho de Melo Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Naohiro Aota Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20150612050820.20548.41625.stgit@localhost.localdomain Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/probe-event.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index d4cf50b..daa24a2 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -2316,6 +2316,7 @@ static int get_new_event_name(char *buf, size_t len, const char *base, struct strlist *namelist, bool allow_suffix) { int i, ret; + char *p; if (*base == '.') base++; @@ -2326,6 +2327,10 @@ static int get_new_event_name(char *buf, size_t len, const char *base, pr_debug("snprintf() failed: %d\n", ret); return ret; } + /* Cut off the postfixes (e.g. .const, .isra)*/ + p = strchr(buf, '.'); + if (p && p != buf) + *p = '\0'; if (!strlist__has_entry(namelist, buf)) return 0; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/