From: Leo Yan <leo.yan@arm.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
"Liang, Kan" <kan.liang@linux.intel.com>,
Dima Kogan <dima@secretsauce.net>,
james.clark@linaro.org, linux-perf-users@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Leo Yan <leo.yan@arm.com>
Subject: [PATCH v1 3/3] perf probe: Generate hash event for long symbol
Date: Mon, 7 Oct 2024 15:11:16 +0100 [thread overview]
Message-ID: <20241007141116.882450-4-leo.yan@arm.com> (raw)
In-Reply-To: <20241007141116.882450-1-leo.yan@arm.com>
If a symbol name is longer than the maximum event length (64 bytes),
generate an new event name with below combination:
TruncatedSymbol + '_' + HashString + '__return' + '\0'
`> 46B + 1B + 8B + 8B + 1B = 64 Bytes.
With this change, a probe can be injected for long symbol.
Before:
# nm test_cpp_mangle | grep -E "print_data|Point"
0000000000000cac t _GLOBAL__sub_I__Z62this_is_a_very_very_long_print_data_abcdefghijklmnopqrstuvwxyzi
0000000000000b50 T _Z62this_is_a_very_very_long_print_data_abcdefghijklmnopqrstuvwxyzR5Point
0000000000000b14 T _Z62this_is_a_very_very_long_print_data_abcdefghijklmnopqrstuvwxyzi
# perf probe -x test_cpp_mangle --add \
"_Z62this_is_a_very_very_long_print_data_abcdefghijklmnopqrstuvwxyzi"
snprintf() failed: -7; the event name nbase='_Z62this_is_a_very_very_long_print_data_abcdefghijklmnopqrstuvwxyzi' is too long
Error: Failed to add events.
After:
# perf probe -x test_cpp_mangle --add \
"_Z62this_is_a_very_very_long_print_data_abcdefghijklmnopqrstuvwxyzi"
Probe event='_Z62this_is_a_very_very_long_print_data_abcdefghijklmnopqrstuvwxyzi' is too long (>= 64 bytes).
Generate hashed event name='_Z62this_is_a_very_very_long_print_data_abcdef_91f40679'
Added new event:
probe_test_cpp_mangle: _Z62this_is_a_very_very_long_print_data_abcdef_91f40679
(on _Z62this_is_a_very_very_long_print_data_abcdefghijklmnopqrstuvwxyzi in /mnt/test_cpp_mangle)
You can now use it in all perf tools, such as:
perf record -e probe_test_cpp_mangle: _Z62this_is_a_very_very_long_print_data_abcdef_91f40679 -aR sleep 1
Signed-off-by: Leo Yan <leo.yan@arm.com>
---
tools/perf/util/probe-event.c | 42 ++++++++++++++++++++++++++++++++++-
1 file changed, 41 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 71acea07cb46..bacd29b95c75 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -2837,6 +2837,32 @@ static void warn_uprobe_event_compat(struct probe_trace_event *tev)
/* Defined in kernel/trace/trace.h */
#define MAX_EVENT_NAME_LEN 64
+static char *probe_trace_event__hash_event(const char *event)
+{
+ char *str = NULL;
+ size_t hash;
+
+ str = malloc(MAX_EVENT_NAME_LEN);
+ if (!str)
+ return NULL;
+
+ hash = str_hash(event);
+
+ /*
+ * Reserve characters for the "__return" suffix for the return probe.
+ * Thus the string buffer (64 bytes) are used for:
+ * Truncated event: 46 bytes
+ * '_' : 1 byte
+ * hash string : 8 bytes
+ * reserved : 8 bytes (for suffix "__return")
+ * '\0' : 1 byte
+ */
+ strncpy(str, event, 46);
+ /* '_' + hash string + '\0' */
+ snprintf(str + 46, 10, "_%lx", hash);
+ return str;
+}
+
/* Set new name from original perf_probe_event and namelist */
static int probe_trace_event__set_name(struct probe_trace_event *tev,
struct perf_probe_event *pev,
@@ -2844,7 +2870,7 @@ static int probe_trace_event__set_name(struct probe_trace_event *tev,
bool allow_suffix)
{
const char *event, *group;
- char *buf;
+ char *buf, *hash_event = NULL;
int ret;
buf = malloc(MAX_EVENT_NAME_LEN);
@@ -2864,6 +2890,19 @@ static int probe_trace_event__set_name(struct probe_trace_event *tev,
event = pev->point.function;
else
event = tev->point.realname;
+
+ if (strlen(event) >= MAX_EVENT_NAME_LEN) {
+ pr_warning("Probe event='%s' is too long (>= %d bytes).\n",
+ event, MAX_EVENT_NAME_LEN);
+
+ hash_event = probe_trace_event__hash_event(event);
+ if (!hash_event) {
+ ret = -ENOMEM;
+ goto out;
+ }
+ pr_warning("Generate hashed event name='%s'\n", hash_event);
+ event = hash_event;
+ }
}
if (pev->group && !pev->sdt)
group = pev->group;
@@ -2903,6 +2942,7 @@ static int probe_trace_event__set_name(struct probe_trace_event *tev,
strlist__add(namelist, event);
out:
+ free(hash_event);
free(buf);
return ret < 0 ? ret : 0;
}
--
2.34.1
next prev parent reply other threads:[~2024-10-07 14:11 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-07 14:11 [PATCH v1 0/3] perf probe: Support " Leo Yan
2024-10-07 14:11 ` [PATCH v1 1/3] perf: Dynamically allocate buffer for event string Leo Yan
2024-10-10 15:21 ` Masami Hiramatsu
2024-10-07 14:11 ` [PATCH v1 2/3] perf probe: Check group string length Leo Yan
2024-10-10 15:22 ` Masami Hiramatsu
2024-10-07 14:11 ` Leo Yan [this message]
2024-10-10 15:34 ` [PATCH v1 3/3] perf probe: Generate hash event for long symbol Masami Hiramatsu
2024-10-10 15:53 ` Leo Yan
2024-10-11 3:07 ` Masami Hiramatsu
2024-10-11 8:41 ` Leo Yan
2024-10-12 5:30 ` Masami Hiramatsu
2024-10-12 14:21 ` Leo Yan
2024-10-10 1:12 ` [PATCH v1 0/3] perf probe: Support " Namhyung Kim
2024-10-10 14:48 ` Masami Hiramatsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241007141116.882450-4-leo.yan@arm.com \
--to=leo.yan@arm.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=dima@secretsauce.net \
--cc=irogers@google.com \
--cc=james.clark@linaro.org \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®