From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755195AbdLGQ5L (ORCPT ); Thu, 7 Dec 2017 11:57:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:33530 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754532AbdLGQ5J (ORCPT ); Thu, 7 Dec 2017 11:57:09 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AAF5D2199D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=acme@kernel.org Date: Thu, 7 Dec 2017 13:56:59 -0300 From: Arnaldo Carvalho de Melo To: Masami Hiramatsu Cc: bhargavb , linux-kernel@vger.kernel.org, Paul Clarke , Ravi Bangoria , linux-rt-users@vger.kernel.org, linux-perf-users@vger.kernel.org Subject: Re: [PATCH v2 2/5] perf-probe: Cut off the version suffix from event name Message-ID: <20171207165659.GD3173@kernel.org> References: <151263115609.13843.6362262297053841418.stgit@devbox> <151263122864.13843.10998234736675352577.stgit@devbox> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <151263122864.13843.10998234736675352577.stgit@devbox> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.9.1 (2017-09-22) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Thu, Dec 07, 2017 at 04:20:28PM +0900, Masami Hiramatsu escreveu: > Cut off the version suffix (e.g. @GLIBC_2.2.5 etc.) from > automatic generated event name. This fixes wildcard event > adding like below case; > > ===== > # perf probe -x /lib64/libc-2.25.so malloc* > Internal error: "malloc_get_state@GLIBC_2" is wrong event name. > Error: Failed to add events. > ===== > > This failure was caused by a versioned suffix symbol. > With this fix, perf probe automatically cuts the > suffix after @ as below. > > ===== > # ./perf probe -x /lib64/libc-2.25.so malloc* > Added new events: > probe_libc:malloc_printerr (on malloc* in /usr/lib64/libc-2.25.so) > probe_libc:malloc_consolidate (on malloc* in /usr/lib64/libc-2.25.so) > probe_libc:malloc_check (on malloc* in /usr/lib64/libc-2.25.so) > probe_libc:malloc_hook_ini (on malloc* in /usr/lib64/libc-2.25.so) > probe_libc:malloc (on malloc* in /usr/lib64/libc-2.25.so) > probe_libc:malloc_trim (on malloc* in /usr/lib64/libc-2.25.so) > probe_libc:malloc_usable_size (on malloc* in /usr/lib64/libc-2.25.so) > probe_libc:malloc_stats (on malloc* in /usr/lib64/libc-2.25.so) > probe_libc:malloc_info (on malloc* in /usr/lib64/libc-2.25.so) > probe_libc:mallochook (on malloc* in /usr/lib64/libc-2.25.so) > probe_libc:malloc_get_state (on malloc* in /usr/lib64/libc-2.25.so) > probe_libc:malloc_set_state (on malloc* in /usr/lib64/libc-2.25.so) Thanks for working on this! I'm now going over it, and one thing I noticed was that the (on malloc*) on all the entries matched by that wildcard, can I suggest that you expand it there as well? I.e. probe_libc:malloc_set_state (on malloc_set_state in /usr/lib64/libc-2.25.so) This way we'll now when aliases are used, and also for the versioning case, i.e. to which version is a probe pointing? See also Paul Clarke's question and suggestion, which I agree, i.e. instead of chopping off the version, just replace the chars with valid ones or better, do what Paul suggests, be more flexible in interpreting @, i.e. if it is a number and/or fails to point to any file, interpret it as versioning. - Arnaldo > You can now use it in all perf tools, such as: > > perf record -e probe_libc:malloc_set_state -aR sleep 1 > > ===== > > Signed-off-by: Masami Hiramatsu > Reported-by: Arnaldo Carvalho de Melo > Reported-by: bhargavb > --- > 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 c0067950e56f..74435fb7ab7f 100644 > --- a/tools/perf/util/probe-event.c > +++ b/tools/perf/util/probe-event.c > @@ -2584,8 +2584,8 @@ static int get_new_event_name(char *buf, size_t len, const char *base, > if (!nbase) > return -ENOMEM; > > - /* Cut off the dot suffixes (e.g. .const, .isra)*/ > - p = strchr(nbase, '.'); > + /* Cut off the dot suffixes (e.g. .const, .isra) and version suffixes */ > + p = strpbrk(nbase, ".@"); > if (p && p != nbase) > *p = '\0'; >