From nobody Sun Nov 24 04:34:35 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C1245212F13; Thu, 7 Nov 2024 14:53:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730991181; cv=none; b=CIQ2eb2mSBRg8gL/DxrfMoT2DwlkeVlaStOYgYwspmtMbNw5E61mBVBAn6t+AsrdIJGmqDoNsUxbGZZnYRcgmlFT/XzqUbAjuFryOVd12ufmwWnqLwkn8226wtXCJnPR1UkLJ+iH6/0Ldy/Ux9cLB15jm40+CEm9Bvg9eiW7avU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730991181; c=relaxed/simple; bh=aF5UWRxmpeI2jfApNUrAdqNXT9wZqj6b1Dborwa4GoA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Yc3S5wBRj1pfmymLqqQK2Sjbf/dIcZJFKKMdq17HMcPDBd8yLQZs9RD/gI7swfwhnTeWuDVbcWuINF5sQhgMz9N1hWjfM1V8BPz0X3TgBg06QJRvebXVIua0Poi1rCikpaSLYPzP1CEiJviLOeDvqqmBRbJsq58DtXd8X8Dz4Pg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=SNCa6TUE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="SNCa6TUE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EC241C4CECC; Thu, 7 Nov 2024 14:52:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730991181; bh=aF5UWRxmpeI2jfApNUrAdqNXT9wZqj6b1Dborwa4GoA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SNCa6TUEBx7JwU3aP10vL5rJXIEUBibgAdOd0nIz3Yyby1wvnt9d5BsRzT6WS1XBq AH8P4S6qazho8ykpqwWkxEXfg6di6xiQZQ+NSMB9OYb6S9ETxMFvof4jxgFS1xowop jAo47OqgtKNHXkIKubI6UxmcPLxRcseFD3u8d3Hi90+RxROoTxgDA8oSsusNqHj4L3 3i+0vDG52FRdJv1xCGu/5akmpDOAPFA7Gn0kZYBVnW26koH8qy82Q2wU9Y16XejSJZ h+I/ClGGEWo2aiMrOss26XJ+U2cukZp+VsM8VQMfNpnUN0+JglIDVU1thcj+KQVcTL e3HS5r/E57cvg== From: "Masami Hiramatsu (Google)" To: Arnaldo Carvalho de Melo , Namhyung Kim Cc: Peter Zijlstra , Ingo Molnar , Masami Hiramatsu , Ian Rogers , Dima Kogan , Alexander Lobakin , Przemek Kitszel , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/6] perf-probe: Replace unacceptable characters when generating event name Date: Thu, 7 Nov 2024 23:52:58 +0900 Message-ID: <173099117811.2431889.17590362733353379842.stgit@mhiramat.roam.corp.google.com> X-Mailer: git-send-email 2.47.0.277.g8800431eea-goog In-Reply-To: <173099112488.2431889.1181692857521683304.stgit@mhiramat.roam.corp.google.com> References: <173099112488.2431889.1181692857521683304.stgit@mhiramat.roam.corp.google.com> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Masami Hiramatsu (Google) Replace unacceptable characters with '_' when generating event name from the probing function name. This is not for C program. For the C program, it will continue to remove suffixes. Note that this language checking depends on the debuginfo. So without the debuginfo, perf probe will always replaces unacceptable characters with '_'. For example. $ ./perf probe -x cro3 -D \"cro3::cmd::servo::run_show\" p:probe_cro3/cro3_cmd_servo_run_show /work/cro3/target/x86_64-unknown-linux= -gnu/debug/cro3:0x197530 $ ./perf probe -x /work/go/example/outyet/main -D 'main.(*Server).poll' p:probe_main/main_Server_poll /work/go/example/outyet/main:0x353040 Signed-off-by: Masami Hiramatsu (Google) --- Changes in v2: - Check dwarf language instead of checking wildcards. --- tools/perf/util/probe-event.c | 32 +++++++++++++++++++++++++------- tools/perf/util/probe-event.h | 3 ++- tools/perf/util/probe-finder.c | 15 +++++++++++++++ tools/perf/util/probe-finder.h | 6 +++++- 4 files changed, 47 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 31e257c84cd1..9eaf0fc7975a 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -2771,7 +2771,7 @@ int show_perf_probe_events(struct strfilter *filter) =20 static int get_new_event_name(char *buf, size_t len, const char *base, struct strlist *namelist, bool ret_event, - bool allow_suffix) + bool allow_suffix, bool not_C_symname) { int i, ret; char *p, *nbase; @@ -2782,10 +2782,24 @@ static int get_new_event_name(char *buf, size_t len= , const char *base, if (!nbase) return -ENOMEM; =20 - /* Cut off the dot suffixes (e.g. .const, .isra) and version suffixes */ - p =3D strpbrk(nbase, ".@"); - if (p && p !=3D nbase) - *p =3D '\0'; + if (not_C_symname) { + /* Replace non-alnum with '_' */ + char *s, *d; + + s =3D d =3D nbase; + do { + if (*s && !isalnum(*s)) { + if (d !=3D nbase && *(d - 1) !=3D '_') + *d++ =3D '_'; + } else + *d++ =3D *s; + } while (*s++); + } else { + /* Cut off the dot suffixes (e.g. .const, .isra) and version suffixes */ + p =3D strpbrk(nbase, ".@"); + if (p && p !=3D nbase) + *p =3D '\0'; + } =20 /* Try no suffix number */ ret =3D e_snprintf(buf, len, "%s%s", nbase, ret_event ? "__return" : ""); @@ -2874,6 +2888,7 @@ static int probe_trace_event__set_name(struct probe_t= race_event *tev, bool allow_suffix) { const char *event, *group; + bool not_C_symname =3D true; char buf[64]; int ret; =20 @@ -2888,8 +2903,10 @@ static int probe_trace_event__set_name(struct probe_= trace_event *tev, (strncmp(pev->point.function, "0x", 2) !=3D 0) && !strisglob(pev->point.function)) event =3D pev->point.function; - else + else { event =3D tev->point.realname; + not_C_symname =3D !is_known_C_lang(tev->lang); + } } if (pev->group && !pev->sdt) group =3D pev->group; @@ -2900,7 +2917,8 @@ static int probe_trace_event__set_name(struct probe_t= race_event *tev, =20 /* Get an unused new event name */ ret =3D get_new_event_name(buf, sizeof(buf), event, namelist, - tev->point.retprobe, allow_suffix); + tev->point.retprobe, allow_suffix, + not_C_symname); if (ret < 0) return ret; =20 diff --git a/tools/perf/util/probe-event.h b/tools/perf/util/probe-event.h index 7e3b6c3d1f74..6516105f43e2 100644 --- a/tools/perf/util/probe-event.h +++ b/tools/perf/util/probe-event.h @@ -57,7 +57,8 @@ struct probe_trace_event { char *event; /* Event name */ char *group; /* Group name */ struct probe_trace_point point; /* Trace point */ - int nargs; /* Number of args */ + int nargs; /* Number of args */ + int lang; /* Dwarf language code */ bool uprobes; /* uprobes only */ struct probe_trace_arg *args; /* Arguments */ }; diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c index 630e16c54ed5..13ff45d3d6a4 100644 --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c @@ -35,6 +35,19 @@ /* Kprobe tracer basic type is up to u64 */ #define MAX_BASIC_TYPE_BITS 64 =20 +bool is_known_C_lang(int lang) +{ + switch (lang) { + case DW_LANG_C89: + case DW_LANG_C: + case DW_LANG_C99: + case DW_LANG_C11: + return true; + default: + return false; + } +} + /* * Probe finder related functions */ @@ -1272,6 +1285,8 @@ static int add_probe_trace_event(Dwarf_Die *sc_die, s= truct probe_finder *pf) ret =3D -ENOMEM; goto end; } + tev->lang =3D dwarf_srclang(dwarf_diecu(sc_die, &pf->cu_die, + NULL, NULL)); =20 pr_debug("Probe point found: %s+%lu\n", tev->point.symbol, tev->point.offset); diff --git a/tools/perf/util/probe-finder.h b/tools/perf/util/probe-finder.h index 3add5ff516e1..04a52d5fd568 100644 --- a/tools/perf/util/probe-finder.h +++ b/tools/perf/util/probe-finder.h @@ -26,6 +26,9 @@ static inline int is_c_varname(const char *name) #include "dwarf-aux.h" #include "debuginfo.h" =20 +/* Check the language code is known C */ +bool is_known_C_lang(int lang); + /* Find probe_trace_events specified by perf_probe_event from debuginfo */ int debuginfo__find_trace_events(struct debuginfo *dbg, struct perf_probe_event *pev, @@ -103,7 +106,8 @@ struct line_finder { Dwarf_Die sp_die; int found; }; - +#else +#define is_known_C_lang(lang) (false) #endif /* HAVE_DWARF_SUPPORT */ =20 #endif /*_PROBE_FINDER_H */