* [PATCH] tools/perf: Use long-running addr2line per dso
@ 2021-09-09 11:22 Tony Garnock-Jones
2021-09-09 16:52 ` Alex Xu (Hello71)
` (2 more replies)
0 siblings, 3 replies; 17+ messages in thread
From: Tony Garnock-Jones @ 2021-09-09 11:22 UTC (permalink / raw)
To: peterz, mingo, acme; +Cc: linux-perf-users, Tony Garnock-Jones
Invoking addr2line in a separate subprocess, one for each required
lookup, takes a terribly long time. This patch introduces a
long-running addr2line process for each dso, *DRAMATICALLY* speeding
up runs of perf. What used to take tens of minutes now takes tens of
seconds.
Debian bug report about this issue:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911815
Signed-off-by: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
---
tools/perf/util/srcline.c | 430 +++++++++++++++++++++++++++++---------
1 file changed, 330 insertions(+), 100 deletions(-)
diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
index 5b7d6c16d33f..767dc9af2789 100644
--- a/tools/perf/util/srcline.c
+++ b/tools/perf/util/srcline.c
@@ -1,8 +1,13 @@
// SPDX-License-Identifier: GPL-2.0
#include <inttypes.h>
+#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
#include <linux/kernel.h>
#include <linux/string.h>
@@ -119,6 +124,8 @@ static struct symbol *new_inline_sym(struct dso *dso,
return inline_sym;
}
+#define MAX_INLINE_NEST 1024
+
#ifdef HAVE_LIBBFD_SUPPORT
/*
@@ -273,8 +280,6 @@ static void addr2line_cleanup(struct a2l_data *a2l)
free(a2l);
}
-#define MAX_INLINE_NEST 1024
-
static int inline_list__append_dso_a2l(struct dso *dso,
struct inline_node *node,
struct symbol *sym)
@@ -361,26 +366,14 @@ void dso__free_a2l(struct dso *dso)
dso->a2l = NULL;
}
-static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
- struct dso *dso, struct symbol *sym)
-{
- struct inline_node *node;
-
- node = zalloc(sizeof(*node));
- if (node == NULL) {
- perror("not enough memory for the inline node");
- return NULL;
- }
-
- INIT_LIST_HEAD(&node->val);
- node->addr = addr;
-
- addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
- return node;
-}
-
#else /* HAVE_LIBBFD_SUPPORT */
+struct a2l_subprocess {
+ pid_t addr2line_pid;
+ FILE *to_child;
+ FILE *from_child;
+};
+
static int filename_split(char *filename, unsigned int *line_nr)
{
char *sep;
@@ -402,114 +395,351 @@ static int filename_split(char *filename, unsigned int *line_nr)
return 0;
}
+static FILE *dup_fdopen(int fd, const char *mode)
+{
+ FILE *f = NULL;
+ int nfd = dup(fd);
+
+ if (nfd == -1)
+ goto out;
+
+ f = fdopen(nfd, mode);
+ if (f == NULL) {
+ close(nfd);
+ goto out;
+ }
+
+out:
+ return f;
+}
+
+static void addr2line_subprocess_cleanup(struct a2l_subprocess *a2l)
+{
+ int _wstatus = 0;
+
+ if (a2l->addr2line_pid != -1) {
+ kill(a2l->addr2line_pid, SIGKILL);
+ waitpid(a2l->addr2line_pid, &_wstatus, 0);
+ a2l->addr2line_pid = -1;
+ }
+
+ if (a2l->to_child != NULL) {
+ fclose(a2l->to_child);
+ a2l->to_child = NULL;
+ }
+
+ if (a2l->from_child != NULL) {
+ fclose(a2l->from_child);
+ a2l->from_child = NULL;
+ }
+
+ free(a2l);
+}
+
+static struct a2l_subprocess *addr2line_subprocess_init(const char *path)
+{
+ struct a2l_subprocess *a2l = NULL;
+ int sockets[2] = {-1, -1};
+
+ a2l = zalloc(sizeof(*a2l));
+ if (a2l == NULL)
+ goto out;
+
+ a2l->addr2line_pid = -1;
+ a2l->to_child = NULL;
+ a2l->from_child = NULL;
+
+ /* Our convention: sockets[0] is for the parent, sockets[1] for the child */
+ if (socketpair(AF_UNIX, SOCK_STREAM, 0, sockets) == -1)
+ goto out;
+
+ a2l->addr2line_pid = fork();
+
+ switch (a2l->addr2line_pid) {
+ case -1:
+ pr_warning("fork failed for addr2line of %s\n", path);
+ goto out;
+ case 0:
+ /* We are in the child process. */
+ if (sockets[1] != STDIN_FILENO) {
+ if (dup2(sockets[1], STDIN_FILENO) == -1) {
+ pr_warning("could not set stdin for addr2line of %s\n", path);
+ close(sockets[1]);
+ goto out;
+ }
+ close(sockets[1]);
+ sockets[1] = STDIN_FILENO;
+ }
+ if (sockets[1] != STDOUT_FILENO) {
+ if (dup2(sockets[1], STDOUT_FILENO) == -1) {
+ pr_warning("could not set stdout for addr2line of %s\n", path);
+ close(sockets[1]);
+ goto out;
+ }
+ }
+ close(sockets[0]);
+ execlp("addr2line", "addr2line", "-e", path, "-i", "-f", NULL);
+ abort(); /* If execute reaches here, we're in serious trouble anyway, so be noisy */
+ /* not reached */
+ break;
+
+ default:
+ close(sockets[1]);
+ break;
+ }
+
+ /*
+ * We are in the parent process, sockets[1] is closed, and sockets[0] is waiting to be
+ * used.
+ */
+
+ a2l->to_child = dup_fdopen(sockets[0], "w");
+ if (a2l->to_child == NULL) {
+ pr_warning("could not open write-stream to addr2line of %s\n", path);
+ goto out;
+ }
+
+ a2l->from_child = dup_fdopen(sockets[0], "r");
+ if (a2l->from_child == NULL) {
+ pr_warning("could not open read-stream from addr2line of %s\n", path);
+ goto out;
+ }
+
+ close(sockets[0]);
+
+ return a2l;
+
+out:
+ if (a2l)
+ addr2line_subprocess_cleanup(a2l);
+
+ close(sockets[0]);
+ close(sockets[1]);
+ return NULL;
+}
+
+static int read_addr2line_stanza(struct a2l_subprocess *a2l,
+ char **function,
+ char **filename,
+ unsigned int *line_nr)
+{
+ /*
+ * Returns:
+ * -1 ==> error
+ * 0 ==> sentinel (or other ill-formed) stanza read
+ * 1 ==> a genuine stanza read
+ */
+ char *line = NULL;
+ size_t line_len = 0;
+ unsigned int dummy_line_nr = 0;
+ int ret = -1;
+
+ if (function != NULL && *function != NULL) {
+ free(*function);
+ *function = NULL;
+ }
+
+ if (filename != NULL && *filename != NULL) {
+ free(*filename);
+ *filename = NULL;
+ }
+
+ if (line_nr != NULL)
+ *line_nr = 0;
+
+ if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
+ goto error;
+
+ if (function != NULL)
+ *function = strdup(strim(line));
+
+ free(line);
+ line = NULL;
+ line_len = 0;
+
+ if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
+ goto error;
+
+ if (filename_split(line, line_nr == NULL ? &dummy_line_nr : line_nr) == 0) {
+ ret = 0;
+ goto error;
+ }
+
+ if (filename != NULL)
+ *filename = strdup(line);
+
+ free(line);
+ line = NULL;
+ line_len = 0;
+
+ return 1;
+
+error:
+ if (line != NULL)
+ free(line);
+ if (function != NULL && *function != NULL) {
+ free(*function);
+ *function = NULL;
+ }
+ if (filename != NULL && *filename != NULL) {
+ free(*filename);
+ *filename = NULL;
+ }
+ return ret;
+}
+
+static int inline_list__append_stanza(struct dso *dso,
+ struct inline_node *node,
+ struct symbol *sym,
+ const char *function,
+ const char *filename,
+ unsigned int line_nr)
+{
+ struct symbol *inline_sym = new_inline_sym(dso, sym, function);
+
+ return inline_list__append(inline_sym, srcline_from_fileline(filename, line_nr), node);
+}
+
static int addr2line(const char *dso_name, u64 addr,
char **file, unsigned int *line_nr,
- struct dso *dso __maybe_unused,
- bool unwind_inlines __maybe_unused,
- struct inline_node *node __maybe_unused,
+ struct dso *dso,
+ bool unwind_inlines,
+ struct inline_node *node,
struct symbol *sym __maybe_unused)
{
- FILE *fp;
- char cmd[PATH_MAX];
- char *filename = NULL;
- size_t len;
+ struct a2l_subprocess *a2l = dso->a2l;
+ char *stanza_function = NULL;
+ char *stanza_filename = NULL;
+ unsigned int stanza_line_nr = 0;
+ int stanza_status = -1;
int ret = 0;
+ size_t inline_count = 0;
- scnprintf(cmd, sizeof(cmd), "addr2line -e %s %016"PRIx64,
- dso_name, addr);
+ if (!a2l) {
+ dso->a2l = addr2line_subprocess_init(dso_name);
+ a2l = dso->a2l;
+ }
- fp = popen(cmd, "r");
- if (fp == NULL) {
- pr_warning("popen failed for %s\n", dso_name);
- return 0;
+ if (a2l == NULL) {
+ if (!symbol_conf.disable_add2line_warn)
+ pr_warning("%s %s: addr2line_subprocess_init failed\n", __func__, dso_name);
+ goto out;
}
- if (getline(&filename, &len, fp) < 0 || !len) {
- pr_warning("addr2line has no output for %s\n", dso_name);
+ /*
+ * Send our request and then *deliberately* send something that can't be interpreted as
+ * a valid address to ask addr2line about (namely, ","). This causes addr2line to first
+ * write out the answer to our request, in an unbounded/unknown number of stanzas, and
+ * then to write out the lines "??" and "??:0", so that we can detect when it has
+ * finished giving us anything useful. We have to be careful about the first stanza,
+ * though, because it may be genuinely unknown, in which case we'll get two sets of
+ * "??"/"??:0" lines.
+ */
+ if (fprintf(a2l->to_child, "%016"PRIx64"\n,\n", addr) < 0 || fflush(a2l->to_child) != 0) {
+ pr_warning("%s %s: could not send request\n", __func__, dso_name);
goto out;
}
- ret = filename_split(filename, line_nr);
- if (ret != 1) {
- free(filename);
+ switch (read_addr2line_stanza(a2l, &stanza_function, &stanza_filename, &stanza_line_nr)) {
+ case -1:
+ pr_warning("%s %s: could not read first stanza\n", __func__, dso_name);
goto out;
+ case 0:
+ /*
+ * The first stanza was invalid, so return failure, but first read another
+ * stanza, since we asked a junk question and have to clear the answer out.
+ */
+ switch (read_addr2line_stanza(a2l, NULL, NULL, NULL)) {
+ case -1:
+ pr_warning("%s %s: could not read delimiter stanza\n", __func__, dso_name);
+ break;
+ case 0:
+ /* As expected. */
+ break;
+ default:
+ pr_warning("%s %s: unexpected stanza instead of sentinel",
+ __func__, dso_name);
+ break;
+ }
+ goto out;
+ default:
+ break;
+ }
+
+ if (file) {
+ *file = strdup(stanza_filename);
+ ret = 1;
+ }
+ if (line_nr)
+ *line_nr = stanza_line_nr;
+
+ if (unwind_inlines) {
+ if (node && inline_list__append_stanza(dso, node, sym,
+ stanza_function,
+ stanza_filename,
+ stanza_line_nr)) {
+ ret = 0;
+ goto out;
+ }
}
- *file = filename;
+ /* We have to read the stanzas even if we don't care about the inline info. */
+ while ((stanza_status = read_addr2line_stanza(a2l,
+ &stanza_function,
+ &stanza_filename,
+ &stanza_line_nr)) == 1) {
+ if (unwind_inlines && node && inline_count++ < MAX_INLINE_NEST) {
+ if (inline_list__append_stanza(dso, node, sym,
+ stanza_function,
+ stanza_filename,
+ stanza_line_nr)) {
+ ret = 0;
+ goto out;
+ }
+ ret = 1; /* found at least one inline frame */
+ }
+ }
out:
- pclose(fp);
+ if (stanza_function != NULL)
+ free(stanza_function);
+ if (stanza_filename != NULL)
+ free(stanza_filename);
return ret;
}
-void dso__free_a2l(struct dso *dso __maybe_unused)
+void dso__free_a2l(struct dso *dso)
{
-}
+ struct a2l_subprocess *a2l = dso->a2l;
-static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
- struct dso *dso __maybe_unused,
- struct symbol *sym)
-{
- FILE *fp;
- char cmd[PATH_MAX];
- struct inline_node *node;
- char *filename = NULL;
- char *funcname = NULL;
- size_t filelen, funclen;
- unsigned int line_nr = 0;
-
- scnprintf(cmd, sizeof(cmd), "addr2line -e %s -i -f %016"PRIx64,
- dso_name, addr);
-
- fp = popen(cmd, "r");
- if (fp == NULL) {
- pr_err("popen failed for %s\n", dso_name);
- return NULL;
- }
-
- node = zalloc(sizeof(*node));
- if (node == NULL) {
- perror("not enough memory for the inline node");
- goto out;
- }
-
- INIT_LIST_HEAD(&node->val);
- node->addr = addr;
-
- /* addr2line -f generates two lines for each inlined functions */
- while (getline(&funcname, &funclen, fp) != -1) {
- char *srcline;
- struct symbol *inline_sym;
-
- strim(funcname);
-
- if (getline(&filename, &filelen, fp) == -1)
- goto out;
-
- if (filename_split(filename, &line_nr) != 1)
- goto out;
-
- srcline = srcline_from_fileline(filename, line_nr);
- inline_sym = new_inline_sym(dso, sym, funcname);
-
- if (inline_list__append(inline_sym, srcline, node) != 0) {
- free(srcline);
- if (inline_sym && inline_sym->inlined)
- symbol__delete(inline_sym);
- goto out;
- }
- }
+ if (!a2l)
+ return;
-out:
- pclose(fp);
- free(filename);
- free(funcname);
+ addr2line_subprocess_cleanup(a2l);
- return node;
+ dso->a2l = NULL;
}
#endif /* HAVE_LIBBFD_SUPPORT */
+static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
+ struct dso *dso, struct symbol *sym)
+{
+ struct inline_node *node;
+
+ node = zalloc(sizeof(*node));
+ if (node == NULL) {
+ perror("not enough memory for the inline node");
+ return NULL;
+ }
+
+ INIT_LIST_HEAD(&node->val);
+ node->addr = addr;
+
+ addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
+ return node;
+}
+
/*
* Number of addr2line failures (without success) before disabling it for that
* dso.
--
2.33.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH] tools/perf: Use long-running addr2line per dso
2021-09-09 11:22 [PATCH] tools/perf: Use long-running addr2line per dso Tony Garnock-Jones
@ 2021-09-09 16:52 ` Alex Xu (Hello71)
2021-09-09 20:19 ` Arnaldo Carvalho de Melo
2021-09-10 8:54 ` Tony Garnock-Jones
2021-09-09 19:05 ` Ian Rogers
2021-09-10 10:23 ` [PATCH v2] " Tony Garnock-Jones
2 siblings, 2 replies; 17+ messages in thread
From: Alex Xu (Hello71) @ 2021-09-09 16:52 UTC (permalink / raw)
To: acme, mingo, peterz, Tony Garnock-Jones; +Cc: linux-perf-users
Excerpts from Tony Garnock-Jones's message of September 9, 2021 7:22 am:
> Invoking addr2line in a separate subprocess, one for each required
> lookup, takes a terribly long time. This patch introduces a
> long-running addr2line process for each dso, *DRAMATICALLY* speeding
> up runs of perf. What used to take tens of minutes now takes tens of
> seconds.
>
> Debian bug report about this issue:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911815
>
> Signed-off-by: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
This patch seems awfully complicated, especially considering it still
uses relatively slow stdio instead of direct library calls. Did you look
into calling elfutils instead of libbfd if the latter is not available?
It is GPLv2 compatible, so can be linked against perf for distribution.
Additionally, elfutils is already used by perf for unwinding, but not
addr2line.
On the patch specifically, why was popen changed to socketpair? It looks
like it adds significant complexity, and the advanced features of
socketpair are not being used (SOCK_DGRAM/SOCK_SEQPACKET, SCM_RIGHTS).
Regards,
Alex.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] tools/perf: Use long-running addr2line per dso
2021-09-09 11:22 [PATCH] tools/perf: Use long-running addr2line per dso Tony Garnock-Jones
2021-09-09 16:52 ` Alex Xu (Hello71)
@ 2021-09-09 19:05 ` Ian Rogers
2021-09-10 8:57 ` Tony Garnock-Jones
2021-09-10 10:23 ` [PATCH v2] " Tony Garnock-Jones
2 siblings, 1 reply; 17+ messages in thread
From: Ian Rogers @ 2021-09-09 19:05 UTC (permalink / raw)
To: Tony Garnock-Jones; +Cc: peterz, mingo, acme, linux-perf-users
On Thu, Sep 9, 2021 at 4:28 AM Tony Garnock-Jones
<tonyg@leastfixedpoint.com> wrote:
>
> Invoking addr2line in a separate subprocess, one for each required
> lookup, takes a terribly long time. This patch introduces a
> long-running addr2line process for each dso, *DRAMATICALLY* speeding
> up runs of perf. What used to take tens of minutes now takes tens of
> seconds.
>
> Debian bug report about this issue:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911815
This is very cool and the performance wins in the bug report are
impressive! Could some of the process management functionality in the
change make use of start_command and similar code in
tools/lib/subcmd/run-command.h ?
Thanks,
Ian
> Signed-off-by: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
>
> ---
> tools/perf/util/srcline.c | 430 +++++++++++++++++++++++++++++---------
> 1 file changed, 330 insertions(+), 100 deletions(-)
>
> diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
> index 5b7d6c16d33f..767dc9af2789 100644
> --- a/tools/perf/util/srcline.c
> +++ b/tools/perf/util/srcline.c
> @@ -1,8 +1,13 @@
> // SPDX-License-Identifier: GPL-2.0
> #include <inttypes.h>
> +#include <signal.h>
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> +#include <sys/socket.h>
> +#include <sys/types.h>
> +#include <sys/wait.h>
> +#include <unistd.h>
>
> #include <linux/kernel.h>
> #include <linux/string.h>
> @@ -119,6 +124,8 @@ static struct symbol *new_inline_sym(struct dso *dso,
> return inline_sym;
> }
>
> +#define MAX_INLINE_NEST 1024
> +
> #ifdef HAVE_LIBBFD_SUPPORT
>
> /*
> @@ -273,8 +280,6 @@ static void addr2line_cleanup(struct a2l_data *a2l)
> free(a2l);
> }
>
> -#define MAX_INLINE_NEST 1024
> -
> static int inline_list__append_dso_a2l(struct dso *dso,
> struct inline_node *node,
> struct symbol *sym)
> @@ -361,26 +366,14 @@ void dso__free_a2l(struct dso *dso)
> dso->a2l = NULL;
> }
>
> -static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
> - struct dso *dso, struct symbol *sym)
> -{
> - struct inline_node *node;
> -
> - node = zalloc(sizeof(*node));
> - if (node == NULL) {
> - perror("not enough memory for the inline node");
> - return NULL;
> - }
> -
> - INIT_LIST_HEAD(&node->val);
> - node->addr = addr;
> -
> - addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
> - return node;
> -}
> -
> #else /* HAVE_LIBBFD_SUPPORT */
>
> +struct a2l_subprocess {
> + pid_t addr2line_pid;
> + FILE *to_child;
> + FILE *from_child;
> +};
> +
> static int filename_split(char *filename, unsigned int *line_nr)
> {
> char *sep;
> @@ -402,114 +395,351 @@ static int filename_split(char *filename, unsigned int *line_nr)
> return 0;
> }
>
> +static FILE *dup_fdopen(int fd, const char *mode)
> +{
> + FILE *f = NULL;
> + int nfd = dup(fd);
> +
> + if (nfd == -1)
> + goto out;
> +
> + f = fdopen(nfd, mode);
> + if (f == NULL) {
> + close(nfd);
> + goto out;
> + }
> +
> +out:
> + return f;
> +}
> +
> +static void addr2line_subprocess_cleanup(struct a2l_subprocess *a2l)
> +{
> + int _wstatus = 0;
> +
> + if (a2l->addr2line_pid != -1) {
> + kill(a2l->addr2line_pid, SIGKILL);
> + waitpid(a2l->addr2line_pid, &_wstatus, 0);
> + a2l->addr2line_pid = -1;
> + }
> +
> + if (a2l->to_child != NULL) {
> + fclose(a2l->to_child);
> + a2l->to_child = NULL;
> + }
> +
> + if (a2l->from_child != NULL) {
> + fclose(a2l->from_child);
> + a2l->from_child = NULL;
> + }
> +
> + free(a2l);
> +}
> +
> +static struct a2l_subprocess *addr2line_subprocess_init(const char *path)
> +{
> + struct a2l_subprocess *a2l = NULL;
> + int sockets[2] = {-1, -1};
> +
> + a2l = zalloc(sizeof(*a2l));
> + if (a2l == NULL)
> + goto out;
> +
> + a2l->addr2line_pid = -1;
> + a2l->to_child = NULL;
> + a2l->from_child = NULL;
> +
> + /* Our convention: sockets[0] is for the parent, sockets[1] for the child */
> + if (socketpair(AF_UNIX, SOCK_STREAM, 0, sockets) == -1)
> + goto out;
> +
> + a2l->addr2line_pid = fork();
> +
> + switch (a2l->addr2line_pid) {
> + case -1:
> + pr_warning("fork failed for addr2line of %s\n", path);
> + goto out;
> + case 0:
> + /* We are in the child process. */
> + if (sockets[1] != STDIN_FILENO) {
> + if (dup2(sockets[1], STDIN_FILENO) == -1) {
> + pr_warning("could not set stdin for addr2line of %s\n", path);
> + close(sockets[1]);
> + goto out;
> + }
> + close(sockets[1]);
> + sockets[1] = STDIN_FILENO;
> + }
> + if (sockets[1] != STDOUT_FILENO) {
> + if (dup2(sockets[1], STDOUT_FILENO) == -1) {
> + pr_warning("could not set stdout for addr2line of %s\n", path);
> + close(sockets[1]);
> + goto out;
> + }
> + }
> + close(sockets[0]);
> + execlp("addr2line", "addr2line", "-e", path, "-i", "-f", NULL);
> + abort(); /* If execute reaches here, we're in serious trouble anyway, so be noisy */
> + /* not reached */
> + break;
> +
> + default:
> + close(sockets[1]);
> + break;
> + }
> +
> + /*
> + * We are in the parent process, sockets[1] is closed, and sockets[0] is waiting to be
> + * used.
> + */
> +
> + a2l->to_child = dup_fdopen(sockets[0], "w");
> + if (a2l->to_child == NULL) {
> + pr_warning("could not open write-stream to addr2line of %s\n", path);
> + goto out;
> + }
> +
> + a2l->from_child = dup_fdopen(sockets[0], "r");
> + if (a2l->from_child == NULL) {
> + pr_warning("could not open read-stream from addr2line of %s\n", path);
> + goto out;
> + }
> +
> + close(sockets[0]);
> +
> + return a2l;
> +
> +out:
> + if (a2l)
> + addr2line_subprocess_cleanup(a2l);
> +
> + close(sockets[0]);
> + close(sockets[1]);
> + return NULL;
> +}
> +
> +static int read_addr2line_stanza(struct a2l_subprocess *a2l,
> + char **function,
> + char **filename,
> + unsigned int *line_nr)
> +{
> + /*
> + * Returns:
> + * -1 ==> error
> + * 0 ==> sentinel (or other ill-formed) stanza read
> + * 1 ==> a genuine stanza read
> + */
> + char *line = NULL;
> + size_t line_len = 0;
> + unsigned int dummy_line_nr = 0;
> + int ret = -1;
> +
> + if (function != NULL && *function != NULL) {
> + free(*function);
> + *function = NULL;
> + }
> +
> + if (filename != NULL && *filename != NULL) {
> + free(*filename);
> + *filename = NULL;
> + }
> +
> + if (line_nr != NULL)
> + *line_nr = 0;
> +
> + if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
> + goto error;
> +
> + if (function != NULL)
> + *function = strdup(strim(line));
> +
> + free(line);
> + line = NULL;
> + line_len = 0;
> +
> + if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
> + goto error;
> +
> + if (filename_split(line, line_nr == NULL ? &dummy_line_nr : line_nr) == 0) {
> + ret = 0;
> + goto error;
> + }
> +
> + if (filename != NULL)
> + *filename = strdup(line);
> +
> + free(line);
> + line = NULL;
> + line_len = 0;
> +
> + return 1;
> +
> +error:
> + if (line != NULL)
> + free(line);
> + if (function != NULL && *function != NULL) {
> + free(*function);
> + *function = NULL;
> + }
> + if (filename != NULL && *filename != NULL) {
> + free(*filename);
> + *filename = NULL;
> + }
> + return ret;
> +}
> +
> +static int inline_list__append_stanza(struct dso *dso,
> + struct inline_node *node,
> + struct symbol *sym,
> + const char *function,
> + const char *filename,
> + unsigned int line_nr)
> +{
> + struct symbol *inline_sym = new_inline_sym(dso, sym, function);
> +
> + return inline_list__append(inline_sym, srcline_from_fileline(filename, line_nr), node);
> +}
> +
> static int addr2line(const char *dso_name, u64 addr,
> char **file, unsigned int *line_nr,
> - struct dso *dso __maybe_unused,
> - bool unwind_inlines __maybe_unused,
> - struct inline_node *node __maybe_unused,
> + struct dso *dso,
> + bool unwind_inlines,
> + struct inline_node *node,
> struct symbol *sym __maybe_unused)
> {
> - FILE *fp;
> - char cmd[PATH_MAX];
> - char *filename = NULL;
> - size_t len;
> + struct a2l_subprocess *a2l = dso->a2l;
> + char *stanza_function = NULL;
> + char *stanza_filename = NULL;
> + unsigned int stanza_line_nr = 0;
> + int stanza_status = -1;
> int ret = 0;
> + size_t inline_count = 0;
>
> - scnprintf(cmd, sizeof(cmd), "addr2line -e %s %016"PRIx64,
> - dso_name, addr);
> + if (!a2l) {
> + dso->a2l = addr2line_subprocess_init(dso_name);
> + a2l = dso->a2l;
> + }
>
> - fp = popen(cmd, "r");
> - if (fp == NULL) {
> - pr_warning("popen failed for %s\n", dso_name);
> - return 0;
> + if (a2l == NULL) {
> + if (!symbol_conf.disable_add2line_warn)
> + pr_warning("%s %s: addr2line_subprocess_init failed\n", __func__, dso_name);
> + goto out;
> }
>
> - if (getline(&filename, &len, fp) < 0 || !len) {
> - pr_warning("addr2line has no output for %s\n", dso_name);
> + /*
> + * Send our request and then *deliberately* send something that can't be interpreted as
> + * a valid address to ask addr2line about (namely, ","). This causes addr2line to first
> + * write out the answer to our request, in an unbounded/unknown number of stanzas, and
> + * then to write out the lines "??" and "??:0", so that we can detect when it has
> + * finished giving us anything useful. We have to be careful about the first stanza,
> + * though, because it may be genuinely unknown, in which case we'll get two sets of
> + * "??"/"??:0" lines.
> + */
> + if (fprintf(a2l->to_child, "%016"PRIx64"\n,\n", addr) < 0 || fflush(a2l->to_child) != 0) {
> + pr_warning("%s %s: could not send request\n", __func__, dso_name);
> goto out;
> }
>
> - ret = filename_split(filename, line_nr);
> - if (ret != 1) {
> - free(filename);
> + switch (read_addr2line_stanza(a2l, &stanza_function, &stanza_filename, &stanza_line_nr)) {
> + case -1:
> + pr_warning("%s %s: could not read first stanza\n", __func__, dso_name);
> goto out;
> + case 0:
> + /*
> + * The first stanza was invalid, so return failure, but first read another
> + * stanza, since we asked a junk question and have to clear the answer out.
> + */
> + switch (read_addr2line_stanza(a2l, NULL, NULL, NULL)) {
> + case -1:
> + pr_warning("%s %s: could not read delimiter stanza\n", __func__, dso_name);
> + break;
> + case 0:
> + /* As expected. */
> + break;
> + default:
> + pr_warning("%s %s: unexpected stanza instead of sentinel",
> + __func__, dso_name);
> + break;
> + }
> + goto out;
> + default:
> + break;
> + }
> +
> + if (file) {
> + *file = strdup(stanza_filename);
> + ret = 1;
> + }
> + if (line_nr)
> + *line_nr = stanza_line_nr;
> +
> + if (unwind_inlines) {
> + if (node && inline_list__append_stanza(dso, node, sym,
> + stanza_function,
> + stanza_filename,
> + stanza_line_nr)) {
> + ret = 0;
> + goto out;
> + }
> }
>
> - *file = filename;
> + /* We have to read the stanzas even if we don't care about the inline info. */
> + while ((stanza_status = read_addr2line_stanza(a2l,
> + &stanza_function,
> + &stanza_filename,
> + &stanza_line_nr)) == 1) {
> + if (unwind_inlines && node && inline_count++ < MAX_INLINE_NEST) {
> + if (inline_list__append_stanza(dso, node, sym,
> + stanza_function,
> + stanza_filename,
> + stanza_line_nr)) {
> + ret = 0;
> + goto out;
> + }
> + ret = 1; /* found at least one inline frame */
> + }
> + }
>
> out:
> - pclose(fp);
> + if (stanza_function != NULL)
> + free(stanza_function);
> + if (stanza_filename != NULL)
> + free(stanza_filename);
> return ret;
> }
>
> -void dso__free_a2l(struct dso *dso __maybe_unused)
> +void dso__free_a2l(struct dso *dso)
> {
> -}
> + struct a2l_subprocess *a2l = dso->a2l;
>
> -static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
> - struct dso *dso __maybe_unused,
> - struct symbol *sym)
> -{
> - FILE *fp;
> - char cmd[PATH_MAX];
> - struct inline_node *node;
> - char *filename = NULL;
> - char *funcname = NULL;
> - size_t filelen, funclen;
> - unsigned int line_nr = 0;
> -
> - scnprintf(cmd, sizeof(cmd), "addr2line -e %s -i -f %016"PRIx64,
> - dso_name, addr);
> -
> - fp = popen(cmd, "r");
> - if (fp == NULL) {
> - pr_err("popen failed for %s\n", dso_name);
> - return NULL;
> - }
> -
> - node = zalloc(sizeof(*node));
> - if (node == NULL) {
> - perror("not enough memory for the inline node");
> - goto out;
> - }
> -
> - INIT_LIST_HEAD(&node->val);
> - node->addr = addr;
> -
> - /* addr2line -f generates two lines for each inlined functions */
> - while (getline(&funcname, &funclen, fp) != -1) {
> - char *srcline;
> - struct symbol *inline_sym;
> -
> - strim(funcname);
> -
> - if (getline(&filename, &filelen, fp) == -1)
> - goto out;
> -
> - if (filename_split(filename, &line_nr) != 1)
> - goto out;
> -
> - srcline = srcline_from_fileline(filename, line_nr);
> - inline_sym = new_inline_sym(dso, sym, funcname);
> -
> - if (inline_list__append(inline_sym, srcline, node) != 0) {
> - free(srcline);
> - if (inline_sym && inline_sym->inlined)
> - symbol__delete(inline_sym);
> - goto out;
> - }
> - }
> + if (!a2l)
> + return;
>
> -out:
> - pclose(fp);
> - free(filename);
> - free(funcname);
> + addr2line_subprocess_cleanup(a2l);
>
> - return node;
> + dso->a2l = NULL;
> }
>
> #endif /* HAVE_LIBBFD_SUPPORT */
>
> +static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
> + struct dso *dso, struct symbol *sym)
> +{
> + struct inline_node *node;
> +
> + node = zalloc(sizeof(*node));
> + if (node == NULL) {
> + perror("not enough memory for the inline node");
> + return NULL;
> + }
> +
> + INIT_LIST_HEAD(&node->val);
> + node->addr = addr;
> +
> + addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
> + return node;
> +}
> +
> /*
> * Number of addr2line failures (without success) before disabling it for that
> * dso.
> --
> 2.33.0
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] tools/perf: Use long-running addr2line per dso
2021-09-09 16:52 ` Alex Xu (Hello71)
@ 2021-09-09 20:19 ` Arnaldo Carvalho de Melo
2021-09-10 8:58 ` Tony Garnock-Jones
2021-09-10 8:54 ` Tony Garnock-Jones
1 sibling, 1 reply; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2021-09-09 20:19 UTC (permalink / raw)
To: Alex Xu (Hello71); +Cc: mingo, peterz, Tony Garnock-Jones, linux-perf-users
Em Thu, Sep 09, 2021 at 12:52:31PM -0400, Alex Xu (Hello71) escreveu:
> Excerpts from Tony Garnock-Jones's message of September 9, 2021 7:22 am:
> > Invoking addr2line in a separate subprocess, one for each required
> > lookup, takes a terribly long time. This patch introduces a
> > long-running addr2line process for each dso, *DRAMATICALLY* speeding
> > up runs of perf. What used to take tens of minutes now takes tens of
> > seconds.
> >
> > Debian bug report about this issue:
> > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911815
> >
> > Signed-off-by: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
>
> This patch seems awfully complicated, especially considering it still
> uses relatively slow stdio instead of direct library calls. Did you look
> into calling elfutils instead of libbfd if the latter is not available?
That would be better, indeed, but since nobody has worked on this area
for white some time and we have it in a far worse shape right now, I'm
inclined to accept his work after I have time to review it.
> It is GPLv2 compatible, so can be linked against perf for distribution.
> Additionally, elfutils is already used by perf for unwinding, but not
> addr2line.
> On the patch specifically, why was popen changed to socketpair? It looks
> like it adds significant complexity, and the advanced features of
> socketpair are not being used (SOCK_DGRAM/SOCK_SEQPACKET, SCM_RIGHTS).
Valid questions, perhaps we can get what Tony did and improve it and
then try working with the library.
- Arnaldo
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] tools/perf: Use long-running addr2line per dso
2021-09-09 16:52 ` Alex Xu (Hello71)
2021-09-09 20:19 ` Arnaldo Carvalho de Melo
@ 2021-09-10 8:54 ` Tony Garnock-Jones
1 sibling, 0 replies; 17+ messages in thread
From: Tony Garnock-Jones @ 2021-09-10 8:54 UTC (permalink / raw)
To: Alex Xu (Hello71), acme, mingo, peterz; +Cc: linux-perf-users
Hi Alex,
Thanks for taking a look at the patch!
On 9/9/21 6:52 PM, Alex Xu (Hello71) wrote:
> This patch seems awfully complicated, especially considering it still
> uses relatively slow stdio instead of direct library calls.
It is comparable in speed to the libbfd variant, apparently: in
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911815#38, Steinar
Gunderson reports that the bfd and patched non-bfd versions have similar
run-times.
The complication is a bit of a shame, but I think it's reasonable given
that it is essentially reimplementing a variant of popen(3) with
bidirectional communication.
> Did you look
> into calling elfutils instead of libbfd if the latter is not available?
No, I didn't; I don't know the domain very well, so I adapted the
existing solution to run more efficiently.
> On the patch specifically, why was popen changed to socketpair? It looks
> like it adds significant complexity, and the advanced features of
> socketpair are not being used (SOCK_DGRAM/SOCK_SEQPACKET, SCM_RIGHTS).
Because popen is unidirectional, and with a long-running process we need
bidirectional communication. I could have used two pipes, but I figured
socketpair was just sitting there and why spend the extra two fds if I
didn't have to?
Regards,
Tony
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] tools/perf: Use long-running addr2line per dso
2021-09-09 19:05 ` Ian Rogers
@ 2021-09-10 8:57 ` Tony Garnock-Jones
0 siblings, 0 replies; 17+ messages in thread
From: Tony Garnock-Jones @ 2021-09-10 8:57 UTC (permalink / raw)
To: Ian Rogers; +Cc: peterz, mingo, acme, linux-perf-users
On 9/9/21 9:05 PM, Ian Rogers wrote:
> This is very cool and the performance wins in the bug report are
> impressive! Could some of the process management functionality in the
> change make use of start_command and similar code in
> tools/lib/subcmd/run-command.h ?
Excellent! I didn't know that was there. Yes, that would be a good idea,
and would remove much of the popen(3) ~reimplementation code from the
patch. In fact, looking at the code, it's the same general shape, and
has improved error handling around waitpid(2) (though it's not critical
in this case), so the patch would certainly be better expressed with
that code. Thanks for the pointer, I'll revise and resubmit.
Regards,
Tony
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] tools/perf: Use long-running addr2line per dso
2021-09-09 20:19 ` Arnaldo Carvalho de Melo
@ 2021-09-10 8:58 ` Tony Garnock-Jones
0 siblings, 0 replies; 17+ messages in thread
From: Tony Garnock-Jones @ 2021-09-10 8:58 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo, Alex Xu (Hello71)
Cc: mingo, peterz, linux-perf-users
On 9/9/21 10:19 PM, Arnaldo Carvalho de Melo wrote:
> That would be better, indeed, but since nobody has worked on this area
> for white some time and we have it in a far worse shape right now, I'm
> inclined to accept his work after I have time to review it.
I'd like to see the patch land and *then* be replaced with something
even better, so that sounds good to me :-)
> Valid questions, perhaps we can get what Tony did and improve it and
> then try working with the library.
(See my reply to Alex for answers!)
Regards,
Tony
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v2] tools/perf: Use long-running addr2line per dso
2021-09-09 11:22 [PATCH] tools/perf: Use long-running addr2line per dso Tony Garnock-Jones
2021-09-09 16:52 ` Alex Xu (Hello71)
2021-09-09 19:05 ` Ian Rogers
@ 2021-09-10 10:23 ` Tony Garnock-Jones
2021-09-10 22:45 ` Ian Rogers
2021-09-10 22:55 ` [PATCH v3] " Tony Garnock-Jones
2 siblings, 2 replies; 17+ messages in thread
From: Tony Garnock-Jones @ 2021-09-10 10:23 UTC (permalink / raw)
To: peterz, mingo, acme; +Cc: linux-perf-users, Tony Garnock-Jones
Invoking addr2line in a separate subprocess, one for each required
lookup, takes a terribly long time. This patch introduces a
long-running addr2line process for each dso, *DRAMATICALLY* speeding
up runs of perf. What used to take tens of minutes now takes tens of
seconds.
Debian bug report about this issue:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911815
Signed-off-by: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
---
Changes since v1:
- use "subcmd/run-command.h" machinery instead of socketpair/fork/exec directly
tools/perf/util/srcline.c | 384 ++++++++++++++++++++++++++++----------
1 file changed, 284 insertions(+), 100 deletions(-)
diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
index 5b7d6c16d33f..1e0b0be4de04 100644
--- a/tools/perf/util/srcline.c
+++ b/tools/perf/util/srcline.c
@@ -1,8 +1,10 @@
// SPDX-License-Identifier: GPL-2.0
#include <inttypes.h>
+#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/types.h>
#include <linux/kernel.h>
#include <linux/string.h>
@@ -15,6 +17,7 @@
#include "srcline.h"
#include "string2.h"
#include "symbol.h"
+#include "subcmd/run-command.h"
bool srcline_full_filename;
@@ -119,6 +122,8 @@ static struct symbol *new_inline_sym(struct dso *dso,
return inline_sym;
}
+#define MAX_INLINE_NEST 1024
+
#ifdef HAVE_LIBBFD_SUPPORT
/*
@@ -273,8 +278,6 @@ static void addr2line_cleanup(struct a2l_data *a2l)
free(a2l);
}
-#define MAX_INLINE_NEST 1024
-
static int inline_list__append_dso_a2l(struct dso *dso,
struct inline_node *node,
struct symbol *sym)
@@ -361,26 +364,14 @@ void dso__free_a2l(struct dso *dso)
dso->a2l = NULL;
}
-static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
- struct dso *dso, struct symbol *sym)
-{
- struct inline_node *node;
-
- node = zalloc(sizeof(*node));
- if (node == NULL) {
- perror("not enough memory for the inline node");
- return NULL;
- }
-
- INIT_LIST_HEAD(&node->val);
- node->addr = addr;
-
- addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
- return node;
-}
-
#else /* HAVE_LIBBFD_SUPPORT */
+struct a2l_subprocess {
+ struct child_process addr2line;
+ FILE *to_child;
+ FILE *from_child;
+};
+
static int filename_split(char *filename, unsigned int *line_nr)
{
char *sep;
@@ -402,114 +393,307 @@ static int filename_split(char *filename, unsigned int *line_nr)
return 0;
}
+static void addr2line_subprocess_cleanup(struct a2l_subprocess *a2l)
+{
+ if (a2l->addr2line.pid != -1) {
+ kill(a2l->addr2line.pid, SIGKILL);
+ finish_command(&a2l->addr2line); /* ignore result, we don't care */
+ a2l->addr2line.pid = -1;
+ }
+
+ if (a2l->to_child != NULL) {
+ fclose(a2l->to_child);
+ a2l->to_child = NULL;
+ }
+
+ if (a2l->from_child != NULL) {
+ fclose(a2l->from_child);
+ a2l->from_child = NULL;
+ }
+
+ free(a2l);
+}
+
+static struct a2l_subprocess *addr2line_subprocess_init(const char *path)
+{
+ const char *argv[] = { "addr2line", "-e", path, "-i", "-f", NULL };
+ struct a2l_subprocess *a2l = NULL;
+ int start_command_status = 0;
+
+ a2l = zalloc(sizeof(*a2l));
+ if (a2l == NULL)
+ goto out;
+
+ a2l->to_child = NULL;
+ a2l->from_child = NULL;
+
+ a2l->addr2line.pid = -1;
+ a2l->addr2line.in = -1;
+ a2l->addr2line.out = -1;
+ a2l->addr2line.err = 0;
+ a2l->addr2line.dir = NULL;
+ a2l->addr2line.env = NULL;
+ a2l->addr2line.no_stdin = 0;
+ a2l->addr2line.no_stdout = 0;
+ a2l->addr2line.no_stderr = 1;
+ a2l->addr2line.exec_cmd = 0;
+ a2l->addr2line.stdout_to_stderr = 0;
+ a2l->addr2line.preexec_cb = NULL;
+
+ a2l->addr2line.argv = argv;
+ start_command_status = start_command(&a2l->addr2line);
+ a2l->addr2line.argv = NULL; /* it's not used after start_command; avoid dangling pointers */
+
+ if (start_command_status != 0) {
+ pr_warning("could not start addr2line for %s: start_command return code %d\n",
+ path,
+ start_command_status);
+ goto out;
+ }
+
+ a2l->to_child = fdopen(a2l->addr2line.in, "w");
+ if (a2l->to_child == NULL) {
+ pr_warning("could not open write-stream to addr2line of %s\n", path);
+ goto out;
+ }
+
+ a2l->from_child = fdopen(a2l->addr2line.out, "r");
+ if (a2l->from_child == NULL) {
+ pr_warning("could not open read-stream from addr2line of %s\n", path);
+ goto out;
+ }
+
+ return a2l;
+
+out:
+ if (a2l)
+ addr2line_subprocess_cleanup(a2l);
+
+ return NULL;
+}
+
+static int read_addr2line_stanza(struct a2l_subprocess *a2l,
+ char **function,
+ char **filename,
+ unsigned int *line_nr)
+{
+ /*
+ * Returns:
+ * -1 ==> error
+ * 0 ==> sentinel (or other ill-formed) stanza read
+ * 1 ==> a genuine stanza read
+ */
+ char *line = NULL;
+ size_t line_len = 0;
+ unsigned int dummy_line_nr = 0;
+ int ret = -1;
+
+ if (function != NULL && *function != NULL) {
+ free(*function);
+ *function = NULL;
+ }
+
+ if (filename != NULL && *filename != NULL) {
+ free(*filename);
+ *filename = NULL;
+ }
+
+ if (line_nr != NULL)
+ *line_nr = 0;
+
+ if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
+ goto error;
+
+ if (function != NULL)
+ *function = strdup(strim(line));
+
+ free(line);
+ line = NULL;
+ line_len = 0;
+
+ if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
+ goto error;
+
+ if (filename_split(line, line_nr == NULL ? &dummy_line_nr : line_nr) == 0) {
+ ret = 0;
+ goto error;
+ }
+
+ if (filename != NULL)
+ *filename = strdup(line);
+
+ free(line);
+ line = NULL;
+ line_len = 0;
+
+ return 1;
+
+error:
+ if (line != NULL)
+ free(line);
+ if (function != NULL && *function != NULL) {
+ free(*function);
+ *function = NULL;
+ }
+ if (filename != NULL && *filename != NULL) {
+ free(*filename);
+ *filename = NULL;
+ }
+ return ret;
+}
+
+static int inline_list__append_stanza(struct dso *dso,
+ struct inline_node *node,
+ struct symbol *sym,
+ const char *function,
+ const char *filename,
+ unsigned int line_nr)
+{
+ struct symbol *inline_sym = new_inline_sym(dso, sym, function);
+
+ return inline_list__append(inline_sym, srcline_from_fileline(filename, line_nr), node);
+}
+
static int addr2line(const char *dso_name, u64 addr,
char **file, unsigned int *line_nr,
- struct dso *dso __maybe_unused,
- bool unwind_inlines __maybe_unused,
- struct inline_node *node __maybe_unused,
+ struct dso *dso,
+ bool unwind_inlines,
+ struct inline_node *node,
struct symbol *sym __maybe_unused)
{
- FILE *fp;
- char cmd[PATH_MAX];
- char *filename = NULL;
- size_t len;
+ struct a2l_subprocess *a2l = dso->a2l;
+ char *stanza_function = NULL;
+ char *stanza_filename = NULL;
+ unsigned int stanza_line_nr = 0;
+ int stanza_status = -1;
int ret = 0;
+ size_t inline_count = 0;
- scnprintf(cmd, sizeof(cmd), "addr2line -e %s %016"PRIx64,
- dso_name, addr);
+ if (!a2l) {
+ dso->a2l = addr2line_subprocess_init(dso_name);
+ a2l = dso->a2l;
+ }
- fp = popen(cmd, "r");
- if (fp == NULL) {
- pr_warning("popen failed for %s\n", dso_name);
- return 0;
+ if (a2l == NULL) {
+ if (!symbol_conf.disable_add2line_warn)
+ pr_warning("%s %s: addr2line_subprocess_init failed\n", __func__, dso_name);
+ goto out;
}
- if (getline(&filename, &len, fp) < 0 || !len) {
- pr_warning("addr2line has no output for %s\n", dso_name);
+ /*
+ * Send our request and then *deliberately* send something that can't be interpreted as
+ * a valid address to ask addr2line about (namely, ","). This causes addr2line to first
+ * write out the answer to our request, in an unbounded/unknown number of stanzas, and
+ * then to write out the lines "??" and "??:0", so that we can detect when it has
+ * finished giving us anything useful. We have to be careful about the first stanza,
+ * though, because it may be genuinely unknown, in which case we'll get two sets of
+ * "??"/"??:0" lines.
+ */
+ if (fprintf(a2l->to_child, "%016"PRIx64"\n,\n", addr) < 0 || fflush(a2l->to_child) != 0) {
+ pr_warning("%s %s: could not send request\n", __func__, dso_name);
goto out;
}
- ret = filename_split(filename, line_nr);
- if (ret != 1) {
- free(filename);
+ switch (read_addr2line_stanza(a2l, &stanza_function, &stanza_filename, &stanza_line_nr)) {
+ case -1:
+ pr_warning("%s %s: could not read first stanza\n", __func__, dso_name);
goto out;
+ case 0:
+ /*
+ * The first stanza was invalid, so return failure, but first read another
+ * stanza, since we asked a junk question and have to clear the answer out.
+ */
+ switch (read_addr2line_stanza(a2l, NULL, NULL, NULL)) {
+ case -1:
+ pr_warning("%s %s: could not read delimiter stanza\n", __func__, dso_name);
+ break;
+ case 0:
+ /* As expected. */
+ break;
+ default:
+ pr_warning("%s %s: unexpected stanza instead of sentinel",
+ __func__, dso_name);
+ break;
+ }
+ goto out;
+ default:
+ break;
+ }
+
+ if (file) {
+ *file = strdup(stanza_filename);
+ ret = 1;
+ }
+ if (line_nr)
+ *line_nr = stanza_line_nr;
+
+ if (unwind_inlines) {
+ if (node && inline_list__append_stanza(dso, node, sym,
+ stanza_function,
+ stanza_filename,
+ stanza_line_nr)) {
+ ret = 0;
+ goto out;
+ }
}
- *file = filename;
+ /* We have to read the stanzas even if we don't care about the inline info. */
+ while ((stanza_status = read_addr2line_stanza(a2l,
+ &stanza_function,
+ &stanza_filename,
+ &stanza_line_nr)) == 1) {
+ if (unwind_inlines && node && inline_count++ < MAX_INLINE_NEST) {
+ if (inline_list__append_stanza(dso, node, sym,
+ stanza_function,
+ stanza_filename,
+ stanza_line_nr)) {
+ ret = 0;
+ goto out;
+ }
+ ret = 1; /* found at least one inline frame */
+ }
+ }
out:
- pclose(fp);
+ if (stanza_function != NULL)
+ free(stanza_function);
+ if (stanza_filename != NULL)
+ free(stanza_filename);
return ret;
}
-void dso__free_a2l(struct dso *dso __maybe_unused)
+void dso__free_a2l(struct dso *dso)
{
-}
+ struct a2l_subprocess *a2l = dso->a2l;
-static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
- struct dso *dso __maybe_unused,
- struct symbol *sym)
-{
- FILE *fp;
- char cmd[PATH_MAX];
- struct inline_node *node;
- char *filename = NULL;
- char *funcname = NULL;
- size_t filelen, funclen;
- unsigned int line_nr = 0;
-
- scnprintf(cmd, sizeof(cmd), "addr2line -e %s -i -f %016"PRIx64,
- dso_name, addr);
-
- fp = popen(cmd, "r");
- if (fp == NULL) {
- pr_err("popen failed for %s\n", dso_name);
- return NULL;
- }
-
- node = zalloc(sizeof(*node));
- if (node == NULL) {
- perror("not enough memory for the inline node");
- goto out;
- }
-
- INIT_LIST_HEAD(&node->val);
- node->addr = addr;
-
- /* addr2line -f generates two lines for each inlined functions */
- while (getline(&funcname, &funclen, fp) != -1) {
- char *srcline;
- struct symbol *inline_sym;
-
- strim(funcname);
-
- if (getline(&filename, &filelen, fp) == -1)
- goto out;
-
- if (filename_split(filename, &line_nr) != 1)
- goto out;
-
- srcline = srcline_from_fileline(filename, line_nr);
- inline_sym = new_inline_sym(dso, sym, funcname);
-
- if (inline_list__append(inline_sym, srcline, node) != 0) {
- free(srcline);
- if (inline_sym && inline_sym->inlined)
- symbol__delete(inline_sym);
- goto out;
- }
- }
+ if (!a2l)
+ return;
-out:
- pclose(fp);
- free(filename);
- free(funcname);
+ addr2line_subprocess_cleanup(a2l);
- return node;
+ dso->a2l = NULL;
}
#endif /* HAVE_LIBBFD_SUPPORT */
+static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
+ struct dso *dso, struct symbol *sym)
+{
+ struct inline_node *node;
+
+ node = zalloc(sizeof(*node));
+ if (node == NULL) {
+ perror("not enough memory for the inline node");
+ return NULL;
+ }
+
+ INIT_LIST_HEAD(&node->val);
+ node->addr = addr;
+
+ addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
+ return node;
+}
+
/*
* Number of addr2line failures (without success) before disabling it for that
* dso.
--
2.33.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v2] tools/perf: Use long-running addr2line per dso
2021-09-10 10:23 ` [PATCH v2] " Tony Garnock-Jones
@ 2021-09-10 22:45 ` Ian Rogers
2021-09-10 22:55 ` Tony Garnock-Jones
2021-09-10 22:55 ` [PATCH v3] " Tony Garnock-Jones
1 sibling, 1 reply; 17+ messages in thread
From: Ian Rogers @ 2021-09-10 22:45 UTC (permalink / raw)
To: Tony Garnock-Jones; +Cc: peterz, mingo, acme, linux-perf-users
On Fri, Sep 10, 2021 at 3:23 AM Tony Garnock-Jones
<tonyg@leastfixedpoint.com> wrote:
>
> Invoking addr2line in a separate subprocess, one for each required
> lookup, takes a terribly long time. This patch introduces a
> long-running addr2line process for each dso, *DRAMATICALLY* speeding
> up runs of perf. What used to take tens of minutes now takes tens of
> seconds.
>
> Debian bug report about this issue:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911815
>
> Signed-off-by: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
I tested with memory sanitizer and no issues.
> ---
> Changes since v1:
> - use "subcmd/run-command.h" machinery instead of socketpair/fork/exec directly
>
>
> tools/perf/util/srcline.c | 384 ++++++++++++++++++++++++++++----------
> 1 file changed, 284 insertions(+), 100 deletions(-)
>
> diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
> index 5b7d6c16d33f..1e0b0be4de04 100644
> --- a/tools/perf/util/srcline.c
> +++ b/tools/perf/util/srcline.c
> @@ -1,8 +1,10 @@
> // SPDX-License-Identifier: GPL-2.0
> #include <inttypes.h>
> +#include <signal.h>
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> +#include <sys/types.h>
>
> #include <linux/kernel.h>
> #include <linux/string.h>
> @@ -15,6 +17,7 @@
> #include "srcline.h"
> #include "string2.h"
> #include "symbol.h"
> +#include "subcmd/run-command.h"
>
> bool srcline_full_filename;
>
> @@ -119,6 +122,8 @@ static struct symbol *new_inline_sym(struct dso *dso,
> return inline_sym;
> }
>
> +#define MAX_INLINE_NEST 1024
> +
> #ifdef HAVE_LIBBFD_SUPPORT
>
> /*
> @@ -273,8 +278,6 @@ static void addr2line_cleanup(struct a2l_data *a2l)
> free(a2l);
> }
>
> -#define MAX_INLINE_NEST 1024
> -
> static int inline_list__append_dso_a2l(struct dso *dso,
> struct inline_node *node,
> struct symbol *sym)
> @@ -361,26 +364,14 @@ void dso__free_a2l(struct dso *dso)
> dso->a2l = NULL;
> }
>
> -static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
> - struct dso *dso, struct symbol *sym)
> -{
> - struct inline_node *node;
> -
> - node = zalloc(sizeof(*node));
> - if (node == NULL) {
> - perror("not enough memory for the inline node");
> - return NULL;
> - }
> -
> - INIT_LIST_HEAD(&node->val);
> - node->addr = addr;
> -
> - addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
> - return node;
> -}
> -
> #else /* HAVE_LIBBFD_SUPPORT */
>
> +struct a2l_subprocess {
> + struct child_process addr2line;
> + FILE *to_child;
> + FILE *from_child;
> +};
> +
> static int filename_split(char *filename, unsigned int *line_nr)
> {
> char *sep;
> @@ -402,114 +393,307 @@ static int filename_split(char *filename, unsigned int *line_nr)
> return 0;
> }
>
> +static void addr2line_subprocess_cleanup(struct a2l_subprocess *a2l)
> +{
> + if (a2l->addr2line.pid != -1) {
> + kill(a2l->addr2line.pid, SIGKILL);
> + finish_command(&a2l->addr2line); /* ignore result, we don't care */
> + a2l->addr2line.pid = -1;
> + }
> +
> + if (a2l->to_child != NULL) {
> + fclose(a2l->to_child);
> + a2l->to_child = NULL;
> + }
> +
> + if (a2l->from_child != NULL) {
> + fclose(a2l->from_child);
> + a2l->from_child = NULL;
> + }
> +
> + free(a2l);
> +}
> +
> +static struct a2l_subprocess *addr2line_subprocess_init(const char *path)
> +{
> + const char *argv[] = { "addr2line", "-e", path, "-i", "-f", NULL };
> + struct a2l_subprocess *a2l = NULL;
> + int start_command_status = 0;
> +
> + a2l = zalloc(sizeof(*a2l));
> + if (a2l == NULL)
> + goto out;
> +
> + a2l->to_child = NULL;
> + a2l->from_child = NULL;
> +
> + a2l->addr2line.pid = -1;
> + a2l->addr2line.in = -1;
> + a2l->addr2line.out = -1;
> + a2l->addr2line.err = 0;
> + a2l->addr2line.dir = NULL;
> + a2l->addr2line.env = NULL;
> + a2l->addr2line.no_stdin = 0;
> + a2l->addr2line.no_stdout = 0;
> + a2l->addr2line.no_stderr = 1;
> + a2l->addr2line.exec_cmd = 0;
> + a2l->addr2line.stdout_to_stderr = 0;
> + a2l->addr2line.preexec_cb = NULL;
The assignments of 0 and NULL here are redundant.
> +
> + a2l->addr2line.argv = argv;
> + start_command_status = start_command(&a2l->addr2line);
> + a2l->addr2line.argv = NULL; /* it's not used after start_command; avoid dangling pointers */
> +
> + if (start_command_status != 0) {
> + pr_warning("could not start addr2line for %s: start_command return code %d\n",
> + path,
> + start_command_status);
> + goto out;
> + }
> +
> + a2l->to_child = fdopen(a2l->addr2line.in, "w");
> + if (a2l->to_child == NULL) {
> + pr_warning("could not open write-stream to addr2line of %s\n", path);
> + goto out;
> + }
> +
> + a2l->from_child = fdopen(a2l->addr2line.out, "r");
> + if (a2l->from_child == NULL) {
> + pr_warning("could not open read-stream from addr2line of %s\n", path);
> + goto out;
> + }
> +
> + return a2l;
> +
> +out:
> + if (a2l)
> + addr2line_subprocess_cleanup(a2l);
> +
> + return NULL;
> +}
> +
I'm not clear on the use of stanza here, it seems to imply reading >1
line but the out arguments/function don't agree with this. I think
this would read better by just dropping the word stanza.
Thanks,
Ian
> +static int read_addr2line_stanza(struct a2l_subprocess *a2l,
> + char **function,
> + char **filename,
> + unsigned int *line_nr)
> +{
> + /*
> + * Returns:
> + * -1 ==> error
> + * 0 ==> sentinel (or other ill-formed) stanza read
> + * 1 ==> a genuine stanza read
> + */
> + char *line = NULL;
> + size_t line_len = 0;
> + unsigned int dummy_line_nr = 0;
> + int ret = -1;
> +
> + if (function != NULL && *function != NULL) {
> + free(*function);
> + *function = NULL;
> + }
> +
> + if (filename != NULL && *filename != NULL) {
> + free(*filename);
> + *filename = NULL;
> + }
> +
> + if (line_nr != NULL)
> + *line_nr = 0;
> +
> + if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
> + goto error;
> +
> + if (function != NULL)
> + *function = strdup(strim(line));
> +
> + free(line);
> + line = NULL;
> + line_len = 0;
> +
> + if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
> + goto error;
> +
> + if (filename_split(line, line_nr == NULL ? &dummy_line_nr : line_nr) == 0) {
> + ret = 0;
> + goto error;
> + }
> +
> + if (filename != NULL)
> + *filename = strdup(line);
> +
> + free(line);
> + line = NULL;
> + line_len = 0;
> +
> + return 1;
> +
> +error:
> + if (line != NULL)
> + free(line);
> + if (function != NULL && *function != NULL) {
> + free(*function);
> + *function = NULL;
> + }
> + if (filename != NULL && *filename != NULL) {
> + free(*filename);
> + *filename = NULL;
> + }
> + return ret;
> +}
> +
> +static int inline_list__append_stanza(struct dso *dso,
> + struct inline_node *node,
> + struct symbol *sym,
> + const char *function,
> + const char *filename,
> + unsigned int line_nr)
> +{
> + struct symbol *inline_sym = new_inline_sym(dso, sym, function);
> +
> + return inline_list__append(inline_sym, srcline_from_fileline(filename, line_nr), node);
> +}
> +
> static int addr2line(const char *dso_name, u64 addr,
> char **file, unsigned int *line_nr,
> - struct dso *dso __maybe_unused,
> - bool unwind_inlines __maybe_unused,
> - struct inline_node *node __maybe_unused,
> + struct dso *dso,
> + bool unwind_inlines,
> + struct inline_node *node,
> struct symbol *sym __maybe_unused)
> {
> - FILE *fp;
> - char cmd[PATH_MAX];
> - char *filename = NULL;
> - size_t len;
> + struct a2l_subprocess *a2l = dso->a2l;
> + char *stanza_function = NULL;
> + char *stanza_filename = NULL;
> + unsigned int stanza_line_nr = 0;
> + int stanza_status = -1;
> int ret = 0;
> + size_t inline_count = 0;
>
> - scnprintf(cmd, sizeof(cmd), "addr2line -e %s %016"PRIx64,
> - dso_name, addr);
> + if (!a2l) {
> + dso->a2l = addr2line_subprocess_init(dso_name);
> + a2l = dso->a2l;
> + }
>
> - fp = popen(cmd, "r");
> - if (fp == NULL) {
> - pr_warning("popen failed for %s\n", dso_name);
> - return 0;
> + if (a2l == NULL) {
> + if (!symbol_conf.disable_add2line_warn)
> + pr_warning("%s %s: addr2line_subprocess_init failed\n", __func__, dso_name);
> + goto out;
> }
>
> - if (getline(&filename, &len, fp) < 0 || !len) {
> - pr_warning("addr2line has no output for %s\n", dso_name);
> + /*
> + * Send our request and then *deliberately* send something that can't be interpreted as
> + * a valid address to ask addr2line about (namely, ","). This causes addr2line to first
> + * write out the answer to our request, in an unbounded/unknown number of stanzas, and
> + * then to write out the lines "??" and "??:0", so that we can detect when it has
> + * finished giving us anything useful. We have to be careful about the first stanza,
> + * though, because it may be genuinely unknown, in which case we'll get two sets of
> + * "??"/"??:0" lines.
> + */
> + if (fprintf(a2l->to_child, "%016"PRIx64"\n,\n", addr) < 0 || fflush(a2l->to_child) != 0) {
> + pr_warning("%s %s: could not send request\n", __func__, dso_name);
> goto out;
> }
>
> - ret = filename_split(filename, line_nr);
> - if (ret != 1) {
> - free(filename);
> + switch (read_addr2line_stanza(a2l, &stanza_function, &stanza_filename, &stanza_line_nr)) {
> + case -1:
> + pr_warning("%s %s: could not read first stanza\n", __func__, dso_name);
> goto out;
> + case 0:
> + /*
> + * The first stanza was invalid, so return failure, but first read another
> + * stanza, since we asked a junk question and have to clear the answer out.
> + */
> + switch (read_addr2line_stanza(a2l, NULL, NULL, NULL)) {
> + case -1:
> + pr_warning("%s %s: could not read delimiter stanza\n", __func__, dso_name);
> + break;
> + case 0:
> + /* As expected. */
> + break;
> + default:
> + pr_warning("%s %s: unexpected stanza instead of sentinel",
> + __func__, dso_name);
> + break;
> + }
> + goto out;
> + default:
> + break;
> + }
> +
> + if (file) {
> + *file = strdup(stanza_filename);
> + ret = 1;
> + }
> + if (line_nr)
> + *line_nr = stanza_line_nr;
> +
> + if (unwind_inlines) {
> + if (node && inline_list__append_stanza(dso, node, sym,
> + stanza_function,
> + stanza_filename,
> + stanza_line_nr)) {
> + ret = 0;
> + goto out;
> + }
> }
>
> - *file = filename;
> + /* We have to read the stanzas even if we don't care about the inline info. */
> + while ((stanza_status = read_addr2line_stanza(a2l,
> + &stanza_function,
> + &stanza_filename,
> + &stanza_line_nr)) == 1) {
> + if (unwind_inlines && node && inline_count++ < MAX_INLINE_NEST) {
> + if (inline_list__append_stanza(dso, node, sym,
> + stanza_function,
> + stanza_filename,
> + stanza_line_nr)) {
> + ret = 0;
> + goto out;
> + }
> + ret = 1; /* found at least one inline frame */
> + }
> + }
>
> out:
> - pclose(fp);
> + if (stanza_function != NULL)
> + free(stanza_function);
> + if (stanza_filename != NULL)
> + free(stanza_filename);
> return ret;
> }
>
> -void dso__free_a2l(struct dso *dso __maybe_unused)
> +void dso__free_a2l(struct dso *dso)
> {
> -}
> + struct a2l_subprocess *a2l = dso->a2l;
>
> -static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
> - struct dso *dso __maybe_unused,
> - struct symbol *sym)
> -{
> - FILE *fp;
> - char cmd[PATH_MAX];
> - struct inline_node *node;
> - char *filename = NULL;
> - char *funcname = NULL;
> - size_t filelen, funclen;
> - unsigned int line_nr = 0;
> -
> - scnprintf(cmd, sizeof(cmd), "addr2line -e %s -i -f %016"PRIx64,
> - dso_name, addr);
> -
> - fp = popen(cmd, "r");
> - if (fp == NULL) {
> - pr_err("popen failed for %s\n", dso_name);
> - return NULL;
> - }
> -
> - node = zalloc(sizeof(*node));
> - if (node == NULL) {
> - perror("not enough memory for the inline node");
> - goto out;
> - }
> -
> - INIT_LIST_HEAD(&node->val);
> - node->addr = addr;
> -
> - /* addr2line -f generates two lines for each inlined functions */
> - while (getline(&funcname, &funclen, fp) != -1) {
> - char *srcline;
> - struct symbol *inline_sym;
> -
> - strim(funcname);
> -
> - if (getline(&filename, &filelen, fp) == -1)
> - goto out;
> -
> - if (filename_split(filename, &line_nr) != 1)
> - goto out;
> -
> - srcline = srcline_from_fileline(filename, line_nr);
> - inline_sym = new_inline_sym(dso, sym, funcname);
> -
> - if (inline_list__append(inline_sym, srcline, node) != 0) {
> - free(srcline);
> - if (inline_sym && inline_sym->inlined)
> - symbol__delete(inline_sym);
> - goto out;
> - }
> - }
> + if (!a2l)
> + return;
>
> -out:
> - pclose(fp);
> - free(filename);
> - free(funcname);
> + addr2line_subprocess_cleanup(a2l);
>
> - return node;
> + dso->a2l = NULL;
> }
>
> #endif /* HAVE_LIBBFD_SUPPORT */
>
> +static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
> + struct dso *dso, struct symbol *sym)
> +{
> + struct inline_node *node;
> +
> + node = zalloc(sizeof(*node));
> + if (node == NULL) {
> + perror("not enough memory for the inline node");
> + return NULL;
> + }
> +
> + INIT_LIST_HEAD(&node->val);
> + node->addr = addr;
> +
> + addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
> + return node;
> +}
> +
> /*
> * Number of addr2line failures (without success) before disabling it for that
> * dso.
> --
> 2.33.0
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2] tools/perf: Use long-running addr2line per dso
2021-09-10 22:45 ` Ian Rogers
@ 2021-09-10 22:55 ` Tony Garnock-Jones
0 siblings, 0 replies; 17+ messages in thread
From: Tony Garnock-Jones @ 2021-09-10 22:55 UTC (permalink / raw)
To: Ian Rogers; +Cc: peterz, mingo, acme, linux-perf-users
Hi Ian,
On 9/11/21 12:45 AM, Ian Rogers wrote:
> I tested with memory sanitizer and no issues.
Great!
> The assignments of 0 and NULL here are redundant.
Yes, ok. I usually spell these things out for the reader, but it makes
perfect sense to let zalloc() do its job :)
> I'm not clear on the use of stanza here, it seems to imply reading >1
> line but the out arguments/function don't agree with this. I think
> this would read better by just dropping the word stanza.
It does read more than one line - it reads exactly two lines. But
calling it a stanza is a bit silly, I agree; how about "record"?
I'm about to mail v3 of the patch incorporating your comments.
Regards,
Tony
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v3] tools/perf: Use long-running addr2line per dso
2021-09-10 10:23 ` [PATCH v2] " Tony Garnock-Jones
2021-09-10 22:45 ` Ian Rogers
@ 2021-09-10 22:55 ` Tony Garnock-Jones
2021-09-11 0:25 ` Ian Rogers
2021-09-13 20:05 ` Arnaldo Carvalho de Melo
1 sibling, 2 replies; 17+ messages in thread
From: Tony Garnock-Jones @ 2021-09-10 22:55 UTC (permalink / raw)
To: peterz, mingo, acme; +Cc: linux-perf-users, Tony Garnock-Jones
Invoking addr2line in a separate subprocess, one for each required
lookup, takes a terribly long time. This patch introduces a
long-running addr2line process for each dso, *DRAMATICALLY* speeding
up runs of perf. What used to take tens of minutes now takes tens of
seconds.
Debian bug report about this issue:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911815
Signed-off-by: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
---
Changes since v2:
- remove redundant initializations to 0 and NULL
- use terminology "record" instead of "stanza" for input from addr2line
Changes since v1:
- use "subcmd/run-command.h" machinery instead of socketpair/fork/exec directly
tools/perf/util/srcline.c | 376 ++++++++++++++++++++++++++++----------
1 file changed, 276 insertions(+), 100 deletions(-)
diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
index 5b7d6c16d33f..3e591bd0b7c4 100644
--- a/tools/perf/util/srcline.c
+++ b/tools/perf/util/srcline.c
@@ -1,8 +1,10 @@
// SPDX-License-Identifier: GPL-2.0
#include <inttypes.h>
+#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/types.h>
#include <linux/kernel.h>
#include <linux/string.h>
@@ -15,6 +17,7 @@
#include "srcline.h"
#include "string2.h"
#include "symbol.h"
+#include "subcmd/run-command.h"
bool srcline_full_filename;
@@ -119,6 +122,8 @@ static struct symbol *new_inline_sym(struct dso *dso,
return inline_sym;
}
+#define MAX_INLINE_NEST 1024
+
#ifdef HAVE_LIBBFD_SUPPORT
/*
@@ -273,8 +278,6 @@ static void addr2line_cleanup(struct a2l_data *a2l)
free(a2l);
}
-#define MAX_INLINE_NEST 1024
-
static int inline_list__append_dso_a2l(struct dso *dso,
struct inline_node *node,
struct symbol *sym)
@@ -361,26 +364,14 @@ void dso__free_a2l(struct dso *dso)
dso->a2l = NULL;
}
-static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
- struct dso *dso, struct symbol *sym)
-{
- struct inline_node *node;
-
- node = zalloc(sizeof(*node));
- if (node == NULL) {
- perror("not enough memory for the inline node");
- return NULL;
- }
-
- INIT_LIST_HEAD(&node->val);
- node->addr = addr;
-
- addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
- return node;
-}
-
#else /* HAVE_LIBBFD_SUPPORT */
+struct a2l_subprocess {
+ struct child_process addr2line;
+ FILE *to_child;
+ FILE *from_child;
+};
+
static int filename_split(char *filename, unsigned int *line_nr)
{
char *sep;
@@ -402,114 +393,299 @@ static int filename_split(char *filename, unsigned int *line_nr)
return 0;
}
+static void addr2line_subprocess_cleanup(struct a2l_subprocess *a2l)
+{
+ if (a2l->addr2line.pid != -1) {
+ kill(a2l->addr2line.pid, SIGKILL);
+ finish_command(&a2l->addr2line); /* ignore result, we don't care */
+ a2l->addr2line.pid = -1;
+ }
+
+ if (a2l->to_child != NULL) {
+ fclose(a2l->to_child);
+ a2l->to_child = NULL;
+ }
+
+ if (a2l->from_child != NULL) {
+ fclose(a2l->from_child);
+ a2l->from_child = NULL;
+ }
+
+ free(a2l);
+}
+
+static struct a2l_subprocess *addr2line_subprocess_init(const char *path)
+{
+ const char *argv[] = { "addr2line", "-e", path, "-i", "-f", NULL };
+ struct a2l_subprocess *a2l = NULL;
+ int start_command_status = 0;
+
+ a2l = zalloc(sizeof(*a2l));
+ if (a2l == NULL)
+ goto out;
+
+ a2l->to_child = NULL;
+ a2l->from_child = NULL;
+
+ a2l->addr2line.pid = -1;
+ a2l->addr2line.in = -1;
+ a2l->addr2line.out = -1;
+ a2l->addr2line.no_stderr = 1;
+
+ a2l->addr2line.argv = argv;
+ start_command_status = start_command(&a2l->addr2line);
+ a2l->addr2line.argv = NULL; /* it's not used after start_command; avoid dangling pointers */
+
+ if (start_command_status != 0) {
+ pr_warning("could not start addr2line for %s: start_command return code %d\n",
+ path,
+ start_command_status);
+ goto out;
+ }
+
+ a2l->to_child = fdopen(a2l->addr2line.in, "w");
+ if (a2l->to_child == NULL) {
+ pr_warning("could not open write-stream to addr2line of %s\n", path);
+ goto out;
+ }
+
+ a2l->from_child = fdopen(a2l->addr2line.out, "r");
+ if (a2l->from_child == NULL) {
+ pr_warning("could not open read-stream from addr2line of %s\n", path);
+ goto out;
+ }
+
+ return a2l;
+
+out:
+ if (a2l)
+ addr2line_subprocess_cleanup(a2l);
+
+ return NULL;
+}
+
+static int read_addr2line_record(struct a2l_subprocess *a2l,
+ char **function,
+ char **filename,
+ unsigned int *line_nr)
+{
+ /*
+ * Returns:
+ * -1 ==> error
+ * 0 ==> sentinel (or other ill-formed) record read
+ * 1 ==> a genuine record read
+ */
+ char *line = NULL;
+ size_t line_len = 0;
+ unsigned int dummy_line_nr = 0;
+ int ret = -1;
+
+ if (function != NULL && *function != NULL) {
+ free(*function);
+ *function = NULL;
+ }
+
+ if (filename != NULL && *filename != NULL) {
+ free(*filename);
+ *filename = NULL;
+ }
+
+ if (line_nr != NULL)
+ *line_nr = 0;
+
+ if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
+ goto error;
+
+ if (function != NULL)
+ *function = strdup(strim(line));
+
+ free(line);
+ line = NULL;
+ line_len = 0;
+
+ if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
+ goto error;
+
+ if (filename_split(line, line_nr == NULL ? &dummy_line_nr : line_nr) == 0) {
+ ret = 0;
+ goto error;
+ }
+
+ if (filename != NULL)
+ *filename = strdup(line);
+
+ free(line);
+ line = NULL;
+ line_len = 0;
+
+ return 1;
+
+error:
+ if (line != NULL)
+ free(line);
+ if (function != NULL && *function != NULL) {
+ free(*function);
+ *function = NULL;
+ }
+ if (filename != NULL && *filename != NULL) {
+ free(*filename);
+ *filename = NULL;
+ }
+ return ret;
+}
+
+static int inline_list__append_record(struct dso *dso,
+ struct inline_node *node,
+ struct symbol *sym,
+ const char *function,
+ const char *filename,
+ unsigned int line_nr)
+{
+ struct symbol *inline_sym = new_inline_sym(dso, sym, function);
+
+ return inline_list__append(inline_sym, srcline_from_fileline(filename, line_nr), node);
+}
+
static int addr2line(const char *dso_name, u64 addr,
char **file, unsigned int *line_nr,
- struct dso *dso __maybe_unused,
- bool unwind_inlines __maybe_unused,
- struct inline_node *node __maybe_unused,
+ struct dso *dso,
+ bool unwind_inlines,
+ struct inline_node *node,
struct symbol *sym __maybe_unused)
{
- FILE *fp;
- char cmd[PATH_MAX];
- char *filename = NULL;
- size_t len;
+ struct a2l_subprocess *a2l = dso->a2l;
+ char *record_function = NULL;
+ char *record_filename = NULL;
+ unsigned int record_line_nr = 0;
+ int record_status = -1;
int ret = 0;
+ size_t inline_count = 0;
- scnprintf(cmd, sizeof(cmd), "addr2line -e %s %016"PRIx64,
- dso_name, addr);
+ if (!a2l) {
+ dso->a2l = addr2line_subprocess_init(dso_name);
+ a2l = dso->a2l;
+ }
- fp = popen(cmd, "r");
- if (fp == NULL) {
- pr_warning("popen failed for %s\n", dso_name);
- return 0;
+ if (a2l == NULL) {
+ if (!symbol_conf.disable_add2line_warn)
+ pr_warning("%s %s: addr2line_subprocess_init failed\n", __func__, dso_name);
+ goto out;
}
- if (getline(&filename, &len, fp) < 0 || !len) {
- pr_warning("addr2line has no output for %s\n", dso_name);
+ /*
+ * Send our request and then *deliberately* send something that can't be interpreted as
+ * a valid address to ask addr2line about (namely, ","). This causes addr2line to first
+ * write out the answer to our request, in an unbounded/unknown number of records, and
+ * then to write out the lines "??" and "??:0", so that we can detect when it has
+ * finished giving us anything useful. We have to be careful about the first record,
+ * though, because it may be genuinely unknown, in which case we'll get two sets of
+ * "??"/"??:0" lines.
+ */
+ if (fprintf(a2l->to_child, "%016"PRIx64"\n,\n", addr) < 0 || fflush(a2l->to_child) != 0) {
+ pr_warning("%s %s: could not send request\n", __func__, dso_name);
goto out;
}
- ret = filename_split(filename, line_nr);
- if (ret != 1) {
- free(filename);
+ switch (read_addr2line_record(a2l, &record_function, &record_filename, &record_line_nr)) {
+ case -1:
+ pr_warning("%s %s: could not read first record\n", __func__, dso_name);
goto out;
+ case 0:
+ /*
+ * The first record was invalid, so return failure, but first read another
+ * record, since we asked a junk question and have to clear the answer out.
+ */
+ switch (read_addr2line_record(a2l, NULL, NULL, NULL)) {
+ case -1:
+ pr_warning("%s %s: could not read delimiter record\n", __func__, dso_name);
+ break;
+ case 0:
+ /* As expected. */
+ break;
+ default:
+ pr_warning("%s %s: unexpected record instead of sentinel",
+ __func__, dso_name);
+ break;
+ }
+ goto out;
+ default:
+ break;
+ }
+
+ if (file) {
+ *file = strdup(record_filename);
+ ret = 1;
+ }
+ if (line_nr)
+ *line_nr = record_line_nr;
+
+ if (unwind_inlines) {
+ if (node && inline_list__append_record(dso, node, sym,
+ record_function,
+ record_filename,
+ record_line_nr)) {
+ ret = 0;
+ goto out;
+ }
}
- *file = filename;
+ /* We have to read the records even if we don't care about the inline info. */
+ while ((record_status = read_addr2line_record(a2l,
+ &record_function,
+ &record_filename,
+ &record_line_nr)) == 1) {
+ if (unwind_inlines && node && inline_count++ < MAX_INLINE_NEST) {
+ if (inline_list__append_record(dso, node, sym,
+ record_function,
+ record_filename,
+ record_line_nr)) {
+ ret = 0;
+ goto out;
+ }
+ ret = 1; /* found at least one inline frame */
+ }
+ }
out:
- pclose(fp);
+ if (record_function != NULL)
+ free(record_function);
+ if (record_filename != NULL)
+ free(record_filename);
return ret;
}
-void dso__free_a2l(struct dso *dso __maybe_unused)
+void dso__free_a2l(struct dso *dso)
{
-}
+ struct a2l_subprocess *a2l = dso->a2l;
-static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
- struct dso *dso __maybe_unused,
- struct symbol *sym)
-{
- FILE *fp;
- char cmd[PATH_MAX];
- struct inline_node *node;
- char *filename = NULL;
- char *funcname = NULL;
- size_t filelen, funclen;
- unsigned int line_nr = 0;
-
- scnprintf(cmd, sizeof(cmd), "addr2line -e %s -i -f %016"PRIx64,
- dso_name, addr);
-
- fp = popen(cmd, "r");
- if (fp == NULL) {
- pr_err("popen failed for %s\n", dso_name);
- return NULL;
- }
-
- node = zalloc(sizeof(*node));
- if (node == NULL) {
- perror("not enough memory for the inline node");
- goto out;
- }
-
- INIT_LIST_HEAD(&node->val);
- node->addr = addr;
-
- /* addr2line -f generates two lines for each inlined functions */
- while (getline(&funcname, &funclen, fp) != -1) {
- char *srcline;
- struct symbol *inline_sym;
-
- strim(funcname);
-
- if (getline(&filename, &filelen, fp) == -1)
- goto out;
-
- if (filename_split(filename, &line_nr) != 1)
- goto out;
-
- srcline = srcline_from_fileline(filename, line_nr);
- inline_sym = new_inline_sym(dso, sym, funcname);
-
- if (inline_list__append(inline_sym, srcline, node) != 0) {
- free(srcline);
- if (inline_sym && inline_sym->inlined)
- symbol__delete(inline_sym);
- goto out;
- }
- }
+ if (!a2l)
+ return;
-out:
- pclose(fp);
- free(filename);
- free(funcname);
+ addr2line_subprocess_cleanup(a2l);
- return node;
+ dso->a2l = NULL;
}
#endif /* HAVE_LIBBFD_SUPPORT */
+static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
+ struct dso *dso, struct symbol *sym)
+{
+ struct inline_node *node;
+
+ node = zalloc(sizeof(*node));
+ if (node == NULL) {
+ perror("not enough memory for the inline node");
+ return NULL;
+ }
+
+ INIT_LIST_HEAD(&node->val);
+ node->addr = addr;
+
+ addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
+ return node;
+}
+
/*
* Number of addr2line failures (without success) before disabling it for that
* dso.
--
2.33.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v3] tools/perf: Use long-running addr2line per dso
2021-09-10 22:55 ` [PATCH v3] " Tony Garnock-Jones
@ 2021-09-11 0:25 ` Ian Rogers
2021-09-13 20:05 ` Arnaldo Carvalho de Melo
1 sibling, 0 replies; 17+ messages in thread
From: Ian Rogers @ 2021-09-11 0:25 UTC (permalink / raw)
To: Tony Garnock-Jones; +Cc: peterz, mingo, acme, linux-perf-users
On Fri, Sep 10, 2021 at 3:56 PM Tony Garnock-Jones
<tonyg@leastfixedpoint.com> wrote:
>
> Invoking addr2line in a separate subprocess, one for each required
> lookup, takes a terribly long time. This patch introduces a
> long-running addr2line process for each dso, *DRAMATICALLY* speeding
> up runs of perf. What used to take tens of minutes now takes tens of
> seconds.
>
> Debian bug report about this issue:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911815
>
> Signed-off-by: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Looks good to me, thanks!
Tested-by: Ian Rogers <irogers@google.com>
Ian
> ---
> Changes since v2:
> - remove redundant initializations to 0 and NULL
> - use terminology "record" instead of "stanza" for input from addr2line
>
> Changes since v1:
> - use "subcmd/run-command.h" machinery instead of socketpair/fork/exec directly
>
>
> tools/perf/util/srcline.c | 376 ++++++++++++++++++++++++++++----------
> 1 file changed, 276 insertions(+), 100 deletions(-)
>
> diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
> index 5b7d6c16d33f..3e591bd0b7c4 100644
> --- a/tools/perf/util/srcline.c
> +++ b/tools/perf/util/srcline.c
> @@ -1,8 +1,10 @@
> // SPDX-License-Identifier: GPL-2.0
> #include <inttypes.h>
> +#include <signal.h>
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> +#include <sys/types.h>
>
> #include <linux/kernel.h>
> #include <linux/string.h>
> @@ -15,6 +17,7 @@
> #include "srcline.h"
> #include "string2.h"
> #include "symbol.h"
> +#include "subcmd/run-command.h"
>
> bool srcline_full_filename;
>
> @@ -119,6 +122,8 @@ static struct symbol *new_inline_sym(struct dso *dso,
> return inline_sym;
> }
>
> +#define MAX_INLINE_NEST 1024
> +
> #ifdef HAVE_LIBBFD_SUPPORT
>
> /*
> @@ -273,8 +278,6 @@ static void addr2line_cleanup(struct a2l_data *a2l)
> free(a2l);
> }
>
> -#define MAX_INLINE_NEST 1024
> -
> static int inline_list__append_dso_a2l(struct dso *dso,
> struct inline_node *node,
> struct symbol *sym)
> @@ -361,26 +364,14 @@ void dso__free_a2l(struct dso *dso)
> dso->a2l = NULL;
> }
>
> -static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
> - struct dso *dso, struct symbol *sym)
> -{
> - struct inline_node *node;
> -
> - node = zalloc(sizeof(*node));
> - if (node == NULL) {
> - perror("not enough memory for the inline node");
> - return NULL;
> - }
> -
> - INIT_LIST_HEAD(&node->val);
> - node->addr = addr;
> -
> - addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
> - return node;
> -}
> -
> #else /* HAVE_LIBBFD_SUPPORT */
>
> +struct a2l_subprocess {
> + struct child_process addr2line;
> + FILE *to_child;
> + FILE *from_child;
> +};
> +
> static int filename_split(char *filename, unsigned int *line_nr)
> {
> char *sep;
> @@ -402,114 +393,299 @@ static int filename_split(char *filename, unsigned int *line_nr)
> return 0;
> }
>
> +static void addr2line_subprocess_cleanup(struct a2l_subprocess *a2l)
> +{
> + if (a2l->addr2line.pid != -1) {
> + kill(a2l->addr2line.pid, SIGKILL);
> + finish_command(&a2l->addr2line); /* ignore result, we don't care */
> + a2l->addr2line.pid = -1;
> + }
> +
> + if (a2l->to_child != NULL) {
> + fclose(a2l->to_child);
> + a2l->to_child = NULL;
> + }
> +
> + if (a2l->from_child != NULL) {
> + fclose(a2l->from_child);
> + a2l->from_child = NULL;
> + }
> +
> + free(a2l);
> +}
> +
> +static struct a2l_subprocess *addr2line_subprocess_init(const char *path)
> +{
> + const char *argv[] = { "addr2line", "-e", path, "-i", "-f", NULL };
> + struct a2l_subprocess *a2l = NULL;
> + int start_command_status = 0;
> +
> + a2l = zalloc(sizeof(*a2l));
> + if (a2l == NULL)
> + goto out;
> +
> + a2l->to_child = NULL;
> + a2l->from_child = NULL;
> +
> + a2l->addr2line.pid = -1;
> + a2l->addr2line.in = -1;
> + a2l->addr2line.out = -1;
> + a2l->addr2line.no_stderr = 1;
> +
> + a2l->addr2line.argv = argv;
> + start_command_status = start_command(&a2l->addr2line);
> + a2l->addr2line.argv = NULL; /* it's not used after start_command; avoid dangling pointers */
> +
> + if (start_command_status != 0) {
> + pr_warning("could not start addr2line for %s: start_command return code %d\n",
> + path,
> + start_command_status);
> + goto out;
> + }
> +
> + a2l->to_child = fdopen(a2l->addr2line.in, "w");
> + if (a2l->to_child == NULL) {
> + pr_warning("could not open write-stream to addr2line of %s\n", path);
> + goto out;
> + }
> +
> + a2l->from_child = fdopen(a2l->addr2line.out, "r");
> + if (a2l->from_child == NULL) {
> + pr_warning("could not open read-stream from addr2line of %s\n", path);
> + goto out;
> + }
> +
> + return a2l;
> +
> +out:
> + if (a2l)
> + addr2line_subprocess_cleanup(a2l);
> +
> + return NULL;
> +}
> +
> +static int read_addr2line_record(struct a2l_subprocess *a2l,
> + char **function,
> + char **filename,
> + unsigned int *line_nr)
> +{
> + /*
> + * Returns:
> + * -1 ==> error
> + * 0 ==> sentinel (or other ill-formed) record read
> + * 1 ==> a genuine record read
> + */
> + char *line = NULL;
> + size_t line_len = 0;
> + unsigned int dummy_line_nr = 0;
> + int ret = -1;
> +
> + if (function != NULL && *function != NULL) {
> + free(*function);
> + *function = NULL;
> + }
> +
> + if (filename != NULL && *filename != NULL) {
> + free(*filename);
> + *filename = NULL;
> + }
> +
> + if (line_nr != NULL)
> + *line_nr = 0;
> +
> + if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
> + goto error;
> +
> + if (function != NULL)
> + *function = strdup(strim(line));
> +
> + free(line);
> + line = NULL;
> + line_len = 0;
> +
> + if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
> + goto error;
> +
> + if (filename_split(line, line_nr == NULL ? &dummy_line_nr : line_nr) == 0) {
> + ret = 0;
> + goto error;
> + }
> +
> + if (filename != NULL)
> + *filename = strdup(line);
> +
> + free(line);
> + line = NULL;
> + line_len = 0;
> +
> + return 1;
> +
> +error:
> + if (line != NULL)
> + free(line);
> + if (function != NULL && *function != NULL) {
> + free(*function);
> + *function = NULL;
> + }
> + if (filename != NULL && *filename != NULL) {
> + free(*filename);
> + *filename = NULL;
> + }
> + return ret;
> +}
> +
> +static int inline_list__append_record(struct dso *dso,
> + struct inline_node *node,
> + struct symbol *sym,
> + const char *function,
> + const char *filename,
> + unsigned int line_nr)
> +{
> + struct symbol *inline_sym = new_inline_sym(dso, sym, function);
> +
> + return inline_list__append(inline_sym, srcline_from_fileline(filename, line_nr), node);
> +}
> +
> static int addr2line(const char *dso_name, u64 addr,
> char **file, unsigned int *line_nr,
> - struct dso *dso __maybe_unused,
> - bool unwind_inlines __maybe_unused,
> - struct inline_node *node __maybe_unused,
> + struct dso *dso,
> + bool unwind_inlines,
> + struct inline_node *node,
> struct symbol *sym __maybe_unused)
> {
> - FILE *fp;
> - char cmd[PATH_MAX];
> - char *filename = NULL;
> - size_t len;
> + struct a2l_subprocess *a2l = dso->a2l;
> + char *record_function = NULL;
> + char *record_filename = NULL;
> + unsigned int record_line_nr = 0;
> + int record_status = -1;
> int ret = 0;
> + size_t inline_count = 0;
>
> - scnprintf(cmd, sizeof(cmd), "addr2line -e %s %016"PRIx64,
> - dso_name, addr);
> + if (!a2l) {
> + dso->a2l = addr2line_subprocess_init(dso_name);
> + a2l = dso->a2l;
> + }
>
> - fp = popen(cmd, "r");
> - if (fp == NULL) {
> - pr_warning("popen failed for %s\n", dso_name);
> - return 0;
> + if (a2l == NULL) {
> + if (!symbol_conf.disable_add2line_warn)
> + pr_warning("%s %s: addr2line_subprocess_init failed\n", __func__, dso_name);
> + goto out;
> }
>
> - if (getline(&filename, &len, fp) < 0 || !len) {
> - pr_warning("addr2line has no output for %s\n", dso_name);
> + /*
> + * Send our request and then *deliberately* send something that can't be interpreted as
> + * a valid address to ask addr2line about (namely, ","). This causes addr2line to first
> + * write out the answer to our request, in an unbounded/unknown number of records, and
> + * then to write out the lines "??" and "??:0", so that we can detect when it has
> + * finished giving us anything useful. We have to be careful about the first record,
> + * though, because it may be genuinely unknown, in which case we'll get two sets of
> + * "??"/"??:0" lines.
> + */
> + if (fprintf(a2l->to_child, "%016"PRIx64"\n,\n", addr) < 0 || fflush(a2l->to_child) != 0) {
> + pr_warning("%s %s: could not send request\n", __func__, dso_name);
> goto out;
> }
>
> - ret = filename_split(filename, line_nr);
> - if (ret != 1) {
> - free(filename);
> + switch (read_addr2line_record(a2l, &record_function, &record_filename, &record_line_nr)) {
> + case -1:
> + pr_warning("%s %s: could not read first record\n", __func__, dso_name);
> goto out;
> + case 0:
> + /*
> + * The first record was invalid, so return failure, but first read another
> + * record, since we asked a junk question and have to clear the answer out.
> + */
> + switch (read_addr2line_record(a2l, NULL, NULL, NULL)) {
> + case -1:
> + pr_warning("%s %s: could not read delimiter record\n", __func__, dso_name);
> + break;
> + case 0:
> + /* As expected. */
> + break;
> + default:
> + pr_warning("%s %s: unexpected record instead of sentinel",
> + __func__, dso_name);
> + break;
> + }
> + goto out;
> + default:
> + break;
> + }
> +
> + if (file) {
> + *file = strdup(record_filename);
> + ret = 1;
> + }
> + if (line_nr)
> + *line_nr = record_line_nr;
> +
> + if (unwind_inlines) {
> + if (node && inline_list__append_record(dso, node, sym,
> + record_function,
> + record_filename,
> + record_line_nr)) {
> + ret = 0;
> + goto out;
> + }
> }
>
> - *file = filename;
> + /* We have to read the records even if we don't care about the inline info. */
> + while ((record_status = read_addr2line_record(a2l,
> + &record_function,
> + &record_filename,
> + &record_line_nr)) == 1) {
> + if (unwind_inlines && node && inline_count++ < MAX_INLINE_NEST) {
> + if (inline_list__append_record(dso, node, sym,
> + record_function,
> + record_filename,
> + record_line_nr)) {
> + ret = 0;
> + goto out;
> + }
> + ret = 1; /* found at least one inline frame */
> + }
> + }
>
> out:
> - pclose(fp);
> + if (record_function != NULL)
> + free(record_function);
> + if (record_filename != NULL)
> + free(record_filename);
> return ret;
> }
>
> -void dso__free_a2l(struct dso *dso __maybe_unused)
> +void dso__free_a2l(struct dso *dso)
> {
> -}
> + struct a2l_subprocess *a2l = dso->a2l;
>
> -static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
> - struct dso *dso __maybe_unused,
> - struct symbol *sym)
> -{
> - FILE *fp;
> - char cmd[PATH_MAX];
> - struct inline_node *node;
> - char *filename = NULL;
> - char *funcname = NULL;
> - size_t filelen, funclen;
> - unsigned int line_nr = 0;
> -
> - scnprintf(cmd, sizeof(cmd), "addr2line -e %s -i -f %016"PRIx64,
> - dso_name, addr);
> -
> - fp = popen(cmd, "r");
> - if (fp == NULL) {
> - pr_err("popen failed for %s\n", dso_name);
> - return NULL;
> - }
> -
> - node = zalloc(sizeof(*node));
> - if (node == NULL) {
> - perror("not enough memory for the inline node");
> - goto out;
> - }
> -
> - INIT_LIST_HEAD(&node->val);
> - node->addr = addr;
> -
> - /* addr2line -f generates two lines for each inlined functions */
> - while (getline(&funcname, &funclen, fp) != -1) {
> - char *srcline;
> - struct symbol *inline_sym;
> -
> - strim(funcname);
> -
> - if (getline(&filename, &filelen, fp) == -1)
> - goto out;
> -
> - if (filename_split(filename, &line_nr) != 1)
> - goto out;
> -
> - srcline = srcline_from_fileline(filename, line_nr);
> - inline_sym = new_inline_sym(dso, sym, funcname);
> -
> - if (inline_list__append(inline_sym, srcline, node) != 0) {
> - free(srcline);
> - if (inline_sym && inline_sym->inlined)
> - symbol__delete(inline_sym);
> - goto out;
> - }
> - }
> + if (!a2l)
> + return;
>
> -out:
> - pclose(fp);
> - free(filename);
> - free(funcname);
> + addr2line_subprocess_cleanup(a2l);
>
> - return node;
> + dso->a2l = NULL;
> }
>
> #endif /* HAVE_LIBBFD_SUPPORT */
>
> +static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
> + struct dso *dso, struct symbol *sym)
> +{
> + struct inline_node *node;
> +
> + node = zalloc(sizeof(*node));
> + if (node == NULL) {
> + perror("not enough memory for the inline node");
> + return NULL;
> + }
> +
> + INIT_LIST_HEAD(&node->val);
> + node->addr = addr;
> +
> + addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
> + return node;
> +}
> +
> /*
> * Number of addr2line failures (without success) before disabling it for that
> * dso.
> --
> 2.33.0
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3] tools/perf: Use long-running addr2line per dso
2021-09-10 22:55 ` [PATCH v3] " Tony Garnock-Jones
2021-09-11 0:25 ` Ian Rogers
@ 2021-09-13 20:05 ` Arnaldo Carvalho de Melo
2021-09-16 12:09 ` [PATCH v4] " Tony Garnock-Jones
1 sibling, 1 reply; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2021-09-13 20:05 UTC (permalink / raw)
To: Tony Garnock-Jones; +Cc: peterz, mingo, Ian Rogers, linux-perf-users
Em Sat, Sep 11, 2021 at 12:55:57AM +0200, Tony Garnock-Jones escreveu:
> Invoking addr2line in a separate subprocess, one for each required
> lookup, takes a terribly long time. This patch introduces a
> long-running addr2line process for each dso, *DRAMATICALLY* speeding
> up runs of perf. What used to take tens of minutes now takes tens of
> seconds.
>
> Debian bug report about this issue:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911815
Some minor issues, mostly to make the code more compact.
Thanks for working on this!
- Arnaldo
> Signed-off-by: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
>
> ---
> Changes since v2:
> - remove redundant initializations to 0 and NULL
> - use terminology "record" instead of "stanza" for input from addr2line
>
> Changes since v1:
> - use "subcmd/run-command.h" machinery instead of socketpair/fork/exec directly
>
>
> tools/perf/util/srcline.c | 376 ++++++++++++++++++++++++++++----------
> 1 file changed, 276 insertions(+), 100 deletions(-)
>
> diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
> index 5b7d6c16d33f..3e591bd0b7c4 100644
> --- a/tools/perf/util/srcline.c
> +++ b/tools/perf/util/srcline.c
> @@ -1,8 +1,10 @@
> // SPDX-License-Identifier: GPL-2.0
> #include <inttypes.h>
> +#include <signal.h>
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> +#include <sys/types.h>
>
> #include <linux/kernel.h>
> #include <linux/string.h>
> @@ -15,6 +17,7 @@
> #include "srcline.h"
> #include "string2.h"
> #include "symbol.h"
> +#include "subcmd/run-command.h"
>
> bool srcline_full_filename;
>
> @@ -119,6 +122,8 @@ static struct symbol *new_inline_sym(struct dso *dso,
> return inline_sym;
> }
>
> +#define MAX_INLINE_NEST 1024
> +
> #ifdef HAVE_LIBBFD_SUPPORT
>
> /*
> @@ -273,8 +278,6 @@ static void addr2line_cleanup(struct a2l_data *a2l)
> free(a2l);
> }
>
> -#define MAX_INLINE_NEST 1024
> -
> static int inline_list__append_dso_a2l(struct dso *dso,
> struct inline_node *node,
> struct symbol *sym)
> @@ -361,26 +364,14 @@ void dso__free_a2l(struct dso *dso)
> dso->a2l = NULL;
> }
>
> -static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
> - struct dso *dso, struct symbol *sym)
> -{
> - struct inline_node *node;
> -
> - node = zalloc(sizeof(*node));
> - if (node == NULL) {
> - perror("not enough memory for the inline node");
> - return NULL;
> - }
> -
> - INIT_LIST_HEAD(&node->val);
> - node->addr = addr;
> -
> - addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
> - return node;
> -}
> -
> #else /* HAVE_LIBBFD_SUPPORT */
>
> +struct a2l_subprocess {
> + struct child_process addr2line;
> + FILE *to_child;
> + FILE *from_child;
> +};
> +
> static int filename_split(char *filename, unsigned int *line_nr)
> {
> char *sep;
> @@ -402,114 +393,299 @@ static int filename_split(char *filename, unsigned int *line_nr)
> return 0;
> }
>
> +static void addr2line_subprocess_cleanup(struct a2l_subprocess *a2l)
> +{
> + if (a2l->addr2line.pid != -1) {
> + kill(a2l->addr2line.pid, SIGKILL);
> + finish_command(&a2l->addr2line); /* ignore result, we don't care */
> + a2l->addr2line.pid = -1;
> + }
> +
> + if (a2l->to_child != NULL) {
> + fclose(a2l->to_child);
> + a2l->to_child = NULL;
> + }
> +
> + if (a2l->from_child != NULL) {
> + fclose(a2l->from_child);
> + a2l->from_child = NULL;
> + }
> +
> + free(a2l);
> +}
> +
> +static struct a2l_subprocess *addr2line_subprocess_init(const char *path)
> +{
> + const char *argv[] = { "addr2line", "-e", path, "-i", "-f", NULL };
> + struct a2l_subprocess *a2l = NULL;
Why initialize it to NULL only to a few lines down initialize it to
zalloc()?
Please combine both lines, i.e.:
struct a2l_subprocess *a2l = zalloc(sizeof(*a2l));
> + int start_command_status = 0;
> +
> + a2l = zalloc(sizeof(*a2l));
> + if (a2l == NULL)
> + goto out;
> +
> + a2l->to_child = NULL;
> + a2l->from_child = NULL;
> +
> + a2l->addr2line.pid = -1;
> + a2l->addr2line.in = -1;
> + a2l->addr2line.out = -1;
> + a2l->addr2line.no_stderr = 1;
> +
> + a2l->addr2line.argv = argv;
> + start_command_status = start_command(&a2l->addr2line);
> + a2l->addr2line.argv = NULL; /* it's not used after start_command; avoid dangling pointers */
> +
> + if (start_command_status != 0) {
> + pr_warning("could not start addr2line for %s: start_command return code %d\n",
> + path,
> + start_command_status);
> + goto out;
> + }
> +
> + a2l->to_child = fdopen(a2l->addr2line.in, "w");
> + if (a2l->to_child == NULL) {
> + pr_warning("could not open write-stream to addr2line of %s\n", path);
> + goto out;
> + }
> +
> + a2l->from_child = fdopen(a2l->addr2line.out, "r");
> + if (a2l->from_child == NULL) {
> + pr_warning("could not open read-stream from addr2line of %s\n", path);
> + goto out;
> + }
> +
> + return a2l;
> +
> +out:
> + if (a2l)
> + addr2line_subprocess_cleanup(a2l);
> +
> + return NULL;
> +}
> +
> +static int read_addr2line_record(struct a2l_subprocess *a2l,
> + char **function,
> + char **filename,
> + unsigned int *line_nr)
> +{
> + /*
> + * Returns:
> + * -1 ==> error
> + * 0 ==> sentinel (or other ill-formed) record read
> + * 1 ==> a genuine record read
> + */
> + char *line = NULL;
> + size_t line_len = 0;
> + unsigned int dummy_line_nr = 0;
> + int ret = -1;
> +
> + if (function != NULL && *function != NULL) {
> + free(*function);
> + *function = NULL;
We have zfree() for that, i.e. just call: zfree(function);
> + }
> +
> + if (filename != NULL && *filename != NULL) {
> + free(*filename);
> + *filename = NULL;
Ditto
> + }
> +
> + if (line_nr != NULL)
> + *line_nr = 0;
> +
> + if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
> + goto error;
> +
> + if (function != NULL)
> + *function = strdup(strim(line));
> +
> + free(line);
> + line = NULL;
Ditto
> + line_len = 0;
> +
> + if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
> + goto error;
> +
> + if (filename_split(line, line_nr == NULL ? &dummy_line_nr : line_nr) == 0) {
> + ret = 0;
> + goto error;
> + }
> +
> + if (filename != NULL)
> + *filename = strdup(line);
> +
> + free(line);
> + line = NULL;
Ditto
> + line_len = 0;
> +
> + return 1;
> +
> +error:
> + if (line != NULL)
> + free(line);
free accepts NULL so just do:
free(line);
> + if (function != NULL && *function != NULL) {
> + free(*function);
> + *function = NULL;
zfree(function);
> + }
> + if (filename != NULL && *filename != NULL) {
> + free(*filename);
> + *filename = NULL;
zfree(filename);
And then in both cases you can remove the {} as its just one line
> + }
> + return ret;
> +}
> +
> +static int inline_list__append_record(struct dso *dso,
> + struct inline_node *node,
> + struct symbol *sym,
> + const char *function,
> + const char *filename,
> + unsigned int line_nr)
> +{
> + struct symbol *inline_sym = new_inline_sym(dso, sym, function);
> +
> + return inline_list__append(inline_sym, srcline_from_fileline(filename, line_nr), node);
> +}
> +
> static int addr2line(const char *dso_name, u64 addr,
> char **file, unsigned int *line_nr,
> - struct dso *dso __maybe_unused,
> - bool unwind_inlines __maybe_unused,
> - struct inline_node *node __maybe_unused,
> + struct dso *dso,
> + bool unwind_inlines,
> + struct inline_node *node,
> struct symbol *sym __maybe_unused)
> {
> - FILE *fp;
> - char cmd[PATH_MAX];
> - char *filename = NULL;
> - size_t len;
> + struct a2l_subprocess *a2l = dso->a2l;
> + char *record_function = NULL;
> + char *record_filename = NULL;
> + unsigned int record_line_nr = 0;
> + int record_status = -1;
> int ret = 0;
> + size_t inline_count = 0;
>
> - scnprintf(cmd, sizeof(cmd), "addr2line -e %s %016"PRIx64,
> - dso_name, addr);
> + if (!a2l) {
> + dso->a2l = addr2line_subprocess_init(dso_name);
> + a2l = dso->a2l;
> + }
>
> - fp = popen(cmd, "r");
> - if (fp == NULL) {
> - pr_warning("popen failed for %s\n", dso_name);
> - return 0;
> + if (a2l == NULL) {
> + if (!symbol_conf.disable_add2line_warn)
> + pr_warning("%s %s: addr2line_subprocess_init failed\n", __func__, dso_name);
> + goto out;
> }
>
> - if (getline(&filename, &len, fp) < 0 || !len) {
> - pr_warning("addr2line has no output for %s\n", dso_name);
> + /*
> + * Send our request and then *deliberately* send something that can't be interpreted as
> + * a valid address to ask addr2line about (namely, ","). This causes addr2line to first
> + * write out the answer to our request, in an unbounded/unknown number of records, and
> + * then to write out the lines "??" and "??:0", so that we can detect when it has
> + * finished giving us anything useful. We have to be careful about the first record,
> + * though, because it may be genuinely unknown, in which case we'll get two sets of
> + * "??"/"??:0" lines.
> + */
> + if (fprintf(a2l->to_child, "%016"PRIx64"\n,\n", addr) < 0 || fflush(a2l->to_child) != 0) {
> + pr_warning("%s %s: could not send request\n", __func__, dso_name);
> goto out;
> }
>
> - ret = filename_split(filename, line_nr);
> - if (ret != 1) {
> - free(filename);
> + switch (read_addr2line_record(a2l, &record_function, &record_filename, &record_line_nr)) {
> + case -1:
> + pr_warning("%s %s: could not read first record\n", __func__, dso_name);
> goto out;
> + case 0:
> + /*
> + * The first record was invalid, so return failure, but first read another
> + * record, since we asked a junk question and have to clear the answer out.
> + */
> + switch (read_addr2line_record(a2l, NULL, NULL, NULL)) {
> + case -1:
> + pr_warning("%s %s: could not read delimiter record\n", __func__, dso_name);
> + break;
> + case 0:
> + /* As expected. */
> + break;
> + default:
> + pr_warning("%s %s: unexpected record instead of sentinel",
> + __func__, dso_name);
> + break;
> + }
> + goto out;
> + default:
> + break;
> + }
> +
> + if (file) {
> + *file = strdup(record_filename);
> + ret = 1;
> + }
> + if (line_nr)
> + *line_nr = record_line_nr;
> +
> + if (unwind_inlines) {
> + if (node && inline_list__append_record(dso, node, sym,
> + record_function,
> + record_filename,
> + record_line_nr)) {
> + ret = 0;
> + goto out;
> + }
> }
>
> - *file = filename;
> + /* We have to read the records even if we don't care about the inline info. */
> + while ((record_status = read_addr2line_record(a2l,
> + &record_function,
> + &record_filename,
> + &record_line_nr)) == 1) {
> + if (unwind_inlines && node && inline_count++ < MAX_INLINE_NEST) {
> + if (inline_list__append_record(dso, node, sym,
> + record_function,
> + record_filename,
> + record_line_nr)) {
> + ret = 0;
> + goto out;
> + }
> + ret = 1; /* found at least one inline frame */
> + }
> + }
>
> out:
> - pclose(fp);
> + if (record_function != NULL)
> + free(record_function);
free accepts NULL, remove the if line
> + if (record_filename != NULL)
> + free(record_filename);
Ditto
> return ret;
> }
>
> -void dso__free_a2l(struct dso *dso __maybe_unused)
> +void dso__free_a2l(struct dso *dso)
> {
> -}
> + struct a2l_subprocess *a2l = dso->a2l;
>
> -static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
> - struct dso *dso __maybe_unused,
> - struct symbol *sym)
> -{
> - FILE *fp;
> - char cmd[PATH_MAX];
> - struct inline_node *node;
> - char *filename = NULL;
> - char *funcname = NULL;
> - size_t filelen, funclen;
> - unsigned int line_nr = 0;
> -
> - scnprintf(cmd, sizeof(cmd), "addr2line -e %s -i -f %016"PRIx64,
> - dso_name, addr);
> -
> - fp = popen(cmd, "r");
> - if (fp == NULL) {
> - pr_err("popen failed for %s\n", dso_name);
> - return NULL;
> - }
> -
> - node = zalloc(sizeof(*node));
> - if (node == NULL) {
> - perror("not enough memory for the inline node");
> - goto out;
> - }
> -
> - INIT_LIST_HEAD(&node->val);
> - node->addr = addr;
> -
> - /* addr2line -f generates two lines for each inlined functions */
> - while (getline(&funcname, &funclen, fp) != -1) {
> - char *srcline;
> - struct symbol *inline_sym;
> -
> - strim(funcname);
> -
> - if (getline(&filename, &filelen, fp) == -1)
> - goto out;
> -
> - if (filename_split(filename, &line_nr) != 1)
> - goto out;
> -
> - srcline = srcline_from_fileline(filename, line_nr);
> - inline_sym = new_inline_sym(dso, sym, funcname);
> -
> - if (inline_list__append(inline_sym, srcline, node) != 0) {
> - free(srcline);
> - if (inline_sym && inline_sym->inlined)
> - symbol__delete(inline_sym);
> - goto out;
> - }
> - }
> + if (!a2l)
> + return;
>
> -out:
> - pclose(fp);
> - free(filename);
> - free(funcname);
> + addr2line_subprocess_cleanup(a2l);
>
> - return node;
> + dso->a2l = NULL;
> }
>
> #endif /* HAVE_LIBBFD_SUPPORT */
>
> +static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
> + struct dso *dso, struct symbol *sym)
> +{
> + struct inline_node *node;
> +
> + node = zalloc(sizeof(*node));
> + if (node == NULL) {
> + perror("not enough memory for the inline node");
> + return NULL;
> + }
> +
> + INIT_LIST_HEAD(&node->val);
> + node->addr = addr;
> +
> + addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
> + return node;
> +}
> +
> /*
> * Number of addr2line failures (without success) before disabling it for that
> * dso.
> --
> 2.33.0
--
- Arnaldo
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v4] tools/perf: Use long-running addr2line per dso
2021-09-13 20:05 ` Arnaldo Carvalho de Melo
@ 2021-09-16 12:09 ` Tony Garnock-Jones
2021-10-01 0:29 ` Ian Rogers
2021-10-04 12:29 ` Arnaldo Carvalho de Melo
0 siblings, 2 replies; 17+ messages in thread
From: Tony Garnock-Jones @ 2021-09-16 12:09 UTC (permalink / raw)
To: peterz, mingo, acme; +Cc: linux-perf-users, Tony Garnock-Jones, Ian Rogers
Invoking addr2line in a separate subprocess, one for each required
lookup, takes a terribly long time. This patch introduces a
long-running addr2line process for each dso, *DRAMATICALLY* speeding
up runs of perf. What used to take tens of minutes now takes tens of
seconds.
Debian bug report about this issue:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911815
Signed-off-by: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Tested-by: Ian Rogers <irogers@google.com>
---
Changes since v3:
- use zfree(), plus some small code compaction edits
- rebase against upstream master ff1ffd71d5f0612cf194f5705c671d6b64bf5f91
Changes since v2:
- remove redundant initializations to 0 and NULL
- use terminology "record" instead of "stanza" for input from addr2line
Changes since v1:
- use "subcmd/run-command.h" machinery instead of socketpair/fork/exec directly
tools/perf/util/srcline.c | 362 +++++++++++++++++++++++++++-----------
1 file changed, 262 insertions(+), 100 deletions(-)
diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
index 5b7d6c16d33f..af468e3bb6fa 100644
--- a/tools/perf/util/srcline.c
+++ b/tools/perf/util/srcline.c
@@ -1,8 +1,10 @@
// SPDX-License-Identifier: GPL-2.0
#include <inttypes.h>
+#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/types.h>
#include <linux/kernel.h>
#include <linux/string.h>
@@ -15,6 +17,7 @@
#include "srcline.h"
#include "string2.h"
#include "symbol.h"
+#include "subcmd/run-command.h"
bool srcline_full_filename;
@@ -119,6 +122,8 @@ static struct symbol *new_inline_sym(struct dso *dso,
return inline_sym;
}
+#define MAX_INLINE_NEST 1024
+
#ifdef HAVE_LIBBFD_SUPPORT
/*
@@ -273,8 +278,6 @@ static void addr2line_cleanup(struct a2l_data *a2l)
free(a2l);
}
-#define MAX_INLINE_NEST 1024
-
static int inline_list__append_dso_a2l(struct dso *dso,
struct inline_node *node,
struct symbol *sym)
@@ -361,26 +364,14 @@ void dso__free_a2l(struct dso *dso)
dso->a2l = NULL;
}
-static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
- struct dso *dso, struct symbol *sym)
-{
- struct inline_node *node;
-
- node = zalloc(sizeof(*node));
- if (node == NULL) {
- perror("not enough memory for the inline node");
- return NULL;
- }
-
- INIT_LIST_HEAD(&node->val);
- node->addr = addr;
-
- addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
- return node;
-}
-
#else /* HAVE_LIBBFD_SUPPORT */
+struct a2l_subprocess {
+ struct child_process addr2line;
+ FILE *to_child;
+ FILE *from_child;
+};
+
static int filename_split(char *filename, unsigned int *line_nr)
{
char *sep;
@@ -402,114 +393,285 @@ static int filename_split(char *filename, unsigned int *line_nr)
return 0;
}
+static void addr2line_subprocess_cleanup(struct a2l_subprocess *a2l)
+{
+ if (a2l->addr2line.pid != -1) {
+ kill(a2l->addr2line.pid, SIGKILL);
+ finish_command(&a2l->addr2line); /* ignore result, we don't care */
+ a2l->addr2line.pid = -1;
+ }
+
+ if (a2l->to_child != NULL) {
+ fclose(a2l->to_child);
+ a2l->to_child = NULL;
+ }
+
+ if (a2l->from_child != NULL) {
+ fclose(a2l->from_child);
+ a2l->from_child = NULL;
+ }
+
+ free(a2l);
+}
+
+static struct a2l_subprocess *addr2line_subprocess_init(const char *path)
+{
+ const char *argv[] = { "addr2line", "-e", path, "-i", "-f", NULL };
+ struct a2l_subprocess *a2l = zalloc(sizeof(*a2l));
+ int start_command_status = 0;
+
+ if (a2l == NULL)
+ goto out;
+
+ a2l->to_child = NULL;
+ a2l->from_child = NULL;
+
+ a2l->addr2line.pid = -1;
+ a2l->addr2line.in = -1;
+ a2l->addr2line.out = -1;
+ a2l->addr2line.no_stderr = 1;
+
+ a2l->addr2line.argv = argv;
+ start_command_status = start_command(&a2l->addr2line);
+ a2l->addr2line.argv = NULL; /* it's not used after start_command; avoid dangling pointers */
+
+ if (start_command_status != 0) {
+ pr_warning("could not start addr2line for %s: start_command return code %d\n",
+ path,
+ start_command_status);
+ goto out;
+ }
+
+ a2l->to_child = fdopen(a2l->addr2line.in, "w");
+ if (a2l->to_child == NULL) {
+ pr_warning("could not open write-stream to addr2line of %s\n", path);
+ goto out;
+ }
+
+ a2l->from_child = fdopen(a2l->addr2line.out, "r");
+ if (a2l->from_child == NULL) {
+ pr_warning("could not open read-stream from addr2line of %s\n", path);
+ goto out;
+ }
+
+ return a2l;
+
+out:
+ if (a2l)
+ addr2line_subprocess_cleanup(a2l);
+
+ return NULL;
+}
+
+static int read_addr2line_record(struct a2l_subprocess *a2l,
+ char **function,
+ char **filename,
+ unsigned int *line_nr)
+{
+ /*
+ * Returns:
+ * -1 ==> error
+ * 0 ==> sentinel (or other ill-formed) record read
+ * 1 ==> a genuine record read
+ */
+ char *line = NULL;
+ size_t line_len = 0;
+ unsigned int dummy_line_nr = 0;
+ int ret = -1;
+
+ if (function != NULL)
+ zfree(function);
+
+ if (filename != NULL)
+ zfree(filename);
+
+ if (line_nr != NULL)
+ *line_nr = 0;
+
+ if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
+ goto error;
+
+ if (function != NULL)
+ *function = strdup(strim(line));
+
+ zfree(&line);
+ line_len = 0;
+
+ if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
+ goto error;
+
+ if (filename_split(line, line_nr == NULL ? &dummy_line_nr : line_nr) == 0) {
+ ret = 0;
+ goto error;
+ }
+
+ if (filename != NULL)
+ *filename = strdup(line);
+
+ zfree(&line);
+ line_len = 0;
+
+ return 1;
+
+error:
+ free(line);
+ if (function != NULL)
+ zfree(function);
+ if (filename != NULL)
+ zfree(filename);
+ return ret;
+}
+
+static int inline_list__append_record(struct dso *dso,
+ struct inline_node *node,
+ struct symbol *sym,
+ const char *function,
+ const char *filename,
+ unsigned int line_nr)
+{
+ struct symbol *inline_sym = new_inline_sym(dso, sym, function);
+
+ return inline_list__append(inline_sym, srcline_from_fileline(filename, line_nr), node);
+}
+
static int addr2line(const char *dso_name, u64 addr,
char **file, unsigned int *line_nr,
- struct dso *dso __maybe_unused,
- bool unwind_inlines __maybe_unused,
- struct inline_node *node __maybe_unused,
+ struct dso *dso,
+ bool unwind_inlines,
+ struct inline_node *node,
struct symbol *sym __maybe_unused)
{
- FILE *fp;
- char cmd[PATH_MAX];
- char *filename = NULL;
- size_t len;
+ struct a2l_subprocess *a2l = dso->a2l;
+ char *record_function = NULL;
+ char *record_filename = NULL;
+ unsigned int record_line_nr = 0;
+ int record_status = -1;
int ret = 0;
+ size_t inline_count = 0;
- scnprintf(cmd, sizeof(cmd), "addr2line -e %s %016"PRIx64,
- dso_name, addr);
+ if (!a2l) {
+ dso->a2l = addr2line_subprocess_init(dso_name);
+ a2l = dso->a2l;
+ }
- fp = popen(cmd, "r");
- if (fp == NULL) {
- pr_warning("popen failed for %s\n", dso_name);
- return 0;
+ if (a2l == NULL) {
+ if (!symbol_conf.disable_add2line_warn)
+ pr_warning("%s %s: addr2line_subprocess_init failed\n", __func__, dso_name);
+ goto out;
}
- if (getline(&filename, &len, fp) < 0 || !len) {
- pr_warning("addr2line has no output for %s\n", dso_name);
+ /*
+ * Send our request and then *deliberately* send something that can't be interpreted as
+ * a valid address to ask addr2line about (namely, ","). This causes addr2line to first
+ * write out the answer to our request, in an unbounded/unknown number of records, and
+ * then to write out the lines "??" and "??:0", so that we can detect when it has
+ * finished giving us anything useful. We have to be careful about the first record,
+ * though, because it may be genuinely unknown, in which case we'll get two sets of
+ * "??"/"??:0" lines.
+ */
+ if (fprintf(a2l->to_child, "%016"PRIx64"\n,\n", addr) < 0 || fflush(a2l->to_child) != 0) {
+ pr_warning("%s %s: could not send request\n", __func__, dso_name);
goto out;
}
- ret = filename_split(filename, line_nr);
- if (ret != 1) {
- free(filename);
+ switch (read_addr2line_record(a2l, &record_function, &record_filename, &record_line_nr)) {
+ case -1:
+ pr_warning("%s %s: could not read first record\n", __func__, dso_name);
goto out;
+ case 0:
+ /*
+ * The first record was invalid, so return failure, but first read another
+ * record, since we asked a junk question and have to clear the answer out.
+ */
+ switch (read_addr2line_record(a2l, NULL, NULL, NULL)) {
+ case -1:
+ pr_warning("%s %s: could not read delimiter record\n", __func__, dso_name);
+ break;
+ case 0:
+ /* As expected. */
+ break;
+ default:
+ pr_warning("%s %s: unexpected record instead of sentinel",
+ __func__, dso_name);
+ break;
+ }
+ goto out;
+ default:
+ break;
+ }
+
+ if (file) {
+ *file = strdup(record_filename);
+ ret = 1;
+ }
+ if (line_nr)
+ *line_nr = record_line_nr;
+
+ if (unwind_inlines) {
+ if (node && inline_list__append_record(dso, node, sym,
+ record_function,
+ record_filename,
+ record_line_nr)) {
+ ret = 0;
+ goto out;
+ }
}
- *file = filename;
+ /* We have to read the records even if we don't care about the inline info. */
+ while ((record_status = read_addr2line_record(a2l,
+ &record_function,
+ &record_filename,
+ &record_line_nr)) == 1) {
+ if (unwind_inlines && node && inline_count++ < MAX_INLINE_NEST) {
+ if (inline_list__append_record(dso, node, sym,
+ record_function,
+ record_filename,
+ record_line_nr)) {
+ ret = 0;
+ goto out;
+ }
+ ret = 1; /* found at least one inline frame */
+ }
+ }
out:
- pclose(fp);
+ free(record_function);
+ free(record_filename);
return ret;
}
-void dso__free_a2l(struct dso *dso __maybe_unused)
+void dso__free_a2l(struct dso *dso)
{
-}
+ struct a2l_subprocess *a2l = dso->a2l;
-static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
- struct dso *dso __maybe_unused,
- struct symbol *sym)
-{
- FILE *fp;
- char cmd[PATH_MAX];
- struct inline_node *node;
- char *filename = NULL;
- char *funcname = NULL;
- size_t filelen, funclen;
- unsigned int line_nr = 0;
-
- scnprintf(cmd, sizeof(cmd), "addr2line -e %s -i -f %016"PRIx64,
- dso_name, addr);
-
- fp = popen(cmd, "r");
- if (fp == NULL) {
- pr_err("popen failed for %s\n", dso_name);
- return NULL;
- }
-
- node = zalloc(sizeof(*node));
- if (node == NULL) {
- perror("not enough memory for the inline node");
- goto out;
- }
-
- INIT_LIST_HEAD(&node->val);
- node->addr = addr;
-
- /* addr2line -f generates two lines for each inlined functions */
- while (getline(&funcname, &funclen, fp) != -1) {
- char *srcline;
- struct symbol *inline_sym;
-
- strim(funcname);
-
- if (getline(&filename, &filelen, fp) == -1)
- goto out;
-
- if (filename_split(filename, &line_nr) != 1)
- goto out;
-
- srcline = srcline_from_fileline(filename, line_nr);
- inline_sym = new_inline_sym(dso, sym, funcname);
-
- if (inline_list__append(inline_sym, srcline, node) != 0) {
- free(srcline);
- if (inline_sym && inline_sym->inlined)
- symbol__delete(inline_sym);
- goto out;
- }
- }
+ if (!a2l)
+ return;
-out:
- pclose(fp);
- free(filename);
- free(funcname);
+ addr2line_subprocess_cleanup(a2l);
- return node;
+ dso->a2l = NULL;
}
#endif /* HAVE_LIBBFD_SUPPORT */
+static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
+ struct dso *dso, struct symbol *sym)
+{
+ struct inline_node *node;
+
+ node = zalloc(sizeof(*node));
+ if (node == NULL) {
+ perror("not enough memory for the inline node");
+ return NULL;
+ }
+
+ INIT_LIST_HEAD(&node->val);
+ node->addr = addr;
+
+ addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
+ return node;
+}
+
/*
* Number of addr2line failures (without success) before disabling it for that
* dso.
--
2.33.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v4] tools/perf: Use long-running addr2line per dso
2021-09-16 12:09 ` [PATCH v4] " Tony Garnock-Jones
@ 2021-10-01 0:29 ` Ian Rogers
2021-10-01 1:20 ` Arnaldo Carvalho de Melo
2021-10-04 12:29 ` Arnaldo Carvalho de Melo
1 sibling, 1 reply; 17+ messages in thread
From: Ian Rogers @ 2021-10-01 0:29 UTC (permalink / raw)
To: Tony Garnock-Jones, acme; +Cc: peterz, mingo, linux-perf-users
On Thu, Sep 16, 2021 at 5:09 AM Tony Garnock-Jones
<tonyg@leastfixedpoint.com> wrote:
>
> Invoking addr2line in a separate subprocess, one for each required
> lookup, takes a terribly long time. This patch introduces a
> long-running addr2line process for each dso, *DRAMATICALLY* speeding
> up runs of perf. What used to take tens of minutes now takes tens of
> seconds.
>
> Debian bug report about this issue:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911815
>
> Signed-off-by: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
> Tested-by: Ian Rogers <irogers@google.com>
Hi Arnaldo,
Is there anything further to do with this change?
Thanks,
Ian
> ---
> Changes since v3:
> - use zfree(), plus some small code compaction edits
> - rebase against upstream master ff1ffd71d5f0612cf194f5705c671d6b64bf5f91
>
> Changes since v2:
> - remove redundant initializations to 0 and NULL
> - use terminology "record" instead of "stanza" for input from addr2line
>
> Changes since v1:
> - use "subcmd/run-command.h" machinery instead of socketpair/fork/exec directly
>
>
> tools/perf/util/srcline.c | 362 +++++++++++++++++++++++++++-----------
> 1 file changed, 262 insertions(+), 100 deletions(-)
>
> diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
> index 5b7d6c16d33f..af468e3bb6fa 100644
> --- a/tools/perf/util/srcline.c
> +++ b/tools/perf/util/srcline.c
> @@ -1,8 +1,10 @@
> // SPDX-License-Identifier: GPL-2.0
> #include <inttypes.h>
> +#include <signal.h>
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> +#include <sys/types.h>
>
> #include <linux/kernel.h>
> #include <linux/string.h>
> @@ -15,6 +17,7 @@
> #include "srcline.h"
> #include "string2.h"
> #include "symbol.h"
> +#include "subcmd/run-command.h"
>
> bool srcline_full_filename;
>
> @@ -119,6 +122,8 @@ static struct symbol *new_inline_sym(struct dso *dso,
> return inline_sym;
> }
>
> +#define MAX_INLINE_NEST 1024
> +
> #ifdef HAVE_LIBBFD_SUPPORT
>
> /*
> @@ -273,8 +278,6 @@ static void addr2line_cleanup(struct a2l_data *a2l)
> free(a2l);
> }
>
> -#define MAX_INLINE_NEST 1024
> -
> static int inline_list__append_dso_a2l(struct dso *dso,
> struct inline_node *node,
> struct symbol *sym)
> @@ -361,26 +364,14 @@ void dso__free_a2l(struct dso *dso)
> dso->a2l = NULL;
> }
>
> -static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
> - struct dso *dso, struct symbol *sym)
> -{
> - struct inline_node *node;
> -
> - node = zalloc(sizeof(*node));
> - if (node == NULL) {
> - perror("not enough memory for the inline node");
> - return NULL;
> - }
> -
> - INIT_LIST_HEAD(&node->val);
> - node->addr = addr;
> -
> - addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
> - return node;
> -}
> -
> #else /* HAVE_LIBBFD_SUPPORT */
>
> +struct a2l_subprocess {
> + struct child_process addr2line;
> + FILE *to_child;
> + FILE *from_child;
> +};
> +
> static int filename_split(char *filename, unsigned int *line_nr)
> {
> char *sep;
> @@ -402,114 +393,285 @@ static int filename_split(char *filename, unsigned int *line_nr)
> return 0;
> }
>
> +static void addr2line_subprocess_cleanup(struct a2l_subprocess *a2l)
> +{
> + if (a2l->addr2line.pid != -1) {
> + kill(a2l->addr2line.pid, SIGKILL);
> + finish_command(&a2l->addr2line); /* ignore result, we don't care */
> + a2l->addr2line.pid = -1;
> + }
> +
> + if (a2l->to_child != NULL) {
> + fclose(a2l->to_child);
> + a2l->to_child = NULL;
> + }
> +
> + if (a2l->from_child != NULL) {
> + fclose(a2l->from_child);
> + a2l->from_child = NULL;
> + }
> +
> + free(a2l);
> +}
> +
> +static struct a2l_subprocess *addr2line_subprocess_init(const char *path)
> +{
> + const char *argv[] = { "addr2line", "-e", path, "-i", "-f", NULL };
> + struct a2l_subprocess *a2l = zalloc(sizeof(*a2l));
> + int start_command_status = 0;
> +
> + if (a2l == NULL)
> + goto out;
> +
> + a2l->to_child = NULL;
> + a2l->from_child = NULL;
> +
> + a2l->addr2line.pid = -1;
> + a2l->addr2line.in = -1;
> + a2l->addr2line.out = -1;
> + a2l->addr2line.no_stderr = 1;
> +
> + a2l->addr2line.argv = argv;
> + start_command_status = start_command(&a2l->addr2line);
> + a2l->addr2line.argv = NULL; /* it's not used after start_command; avoid dangling pointers */
> +
> + if (start_command_status != 0) {
> + pr_warning("could not start addr2line for %s: start_command return code %d\n",
> + path,
> + start_command_status);
> + goto out;
> + }
> +
> + a2l->to_child = fdopen(a2l->addr2line.in, "w");
> + if (a2l->to_child == NULL) {
> + pr_warning("could not open write-stream to addr2line of %s\n", path);
> + goto out;
> + }
> +
> + a2l->from_child = fdopen(a2l->addr2line.out, "r");
> + if (a2l->from_child == NULL) {
> + pr_warning("could not open read-stream from addr2line of %s\n", path);
> + goto out;
> + }
> +
> + return a2l;
> +
> +out:
> + if (a2l)
> + addr2line_subprocess_cleanup(a2l);
> +
> + return NULL;
> +}
> +
> +static int read_addr2line_record(struct a2l_subprocess *a2l,
> + char **function,
> + char **filename,
> + unsigned int *line_nr)
> +{
> + /*
> + * Returns:
> + * -1 ==> error
> + * 0 ==> sentinel (or other ill-formed) record read
> + * 1 ==> a genuine record read
> + */
> + char *line = NULL;
> + size_t line_len = 0;
> + unsigned int dummy_line_nr = 0;
> + int ret = -1;
> +
> + if (function != NULL)
> + zfree(function);
> +
> + if (filename != NULL)
> + zfree(filename);
> +
> + if (line_nr != NULL)
> + *line_nr = 0;
> +
> + if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
> + goto error;
> +
> + if (function != NULL)
> + *function = strdup(strim(line));
> +
> + zfree(&line);
> + line_len = 0;
> +
> + if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
> + goto error;
> +
> + if (filename_split(line, line_nr == NULL ? &dummy_line_nr : line_nr) == 0) {
> + ret = 0;
> + goto error;
> + }
> +
> + if (filename != NULL)
> + *filename = strdup(line);
> +
> + zfree(&line);
> + line_len = 0;
> +
> + return 1;
> +
> +error:
> + free(line);
> + if (function != NULL)
> + zfree(function);
> + if (filename != NULL)
> + zfree(filename);
> + return ret;
> +}
> +
> +static int inline_list__append_record(struct dso *dso,
> + struct inline_node *node,
> + struct symbol *sym,
> + const char *function,
> + const char *filename,
> + unsigned int line_nr)
> +{
> + struct symbol *inline_sym = new_inline_sym(dso, sym, function);
> +
> + return inline_list__append(inline_sym, srcline_from_fileline(filename, line_nr), node);
> +}
> +
> static int addr2line(const char *dso_name, u64 addr,
> char **file, unsigned int *line_nr,
> - struct dso *dso __maybe_unused,
> - bool unwind_inlines __maybe_unused,
> - struct inline_node *node __maybe_unused,
> + struct dso *dso,
> + bool unwind_inlines,
> + struct inline_node *node,
> struct symbol *sym __maybe_unused)
> {
> - FILE *fp;
> - char cmd[PATH_MAX];
> - char *filename = NULL;
> - size_t len;
> + struct a2l_subprocess *a2l = dso->a2l;
> + char *record_function = NULL;
> + char *record_filename = NULL;
> + unsigned int record_line_nr = 0;
> + int record_status = -1;
> int ret = 0;
> + size_t inline_count = 0;
>
> - scnprintf(cmd, sizeof(cmd), "addr2line -e %s %016"PRIx64,
> - dso_name, addr);
> + if (!a2l) {
> + dso->a2l = addr2line_subprocess_init(dso_name);
> + a2l = dso->a2l;
> + }
>
> - fp = popen(cmd, "r");
> - if (fp == NULL) {
> - pr_warning("popen failed for %s\n", dso_name);
> - return 0;
> + if (a2l == NULL) {
> + if (!symbol_conf.disable_add2line_warn)
> + pr_warning("%s %s: addr2line_subprocess_init failed\n", __func__, dso_name);
> + goto out;
> }
>
> - if (getline(&filename, &len, fp) < 0 || !len) {
> - pr_warning("addr2line has no output for %s\n", dso_name);
> + /*
> + * Send our request and then *deliberately* send something that can't be interpreted as
> + * a valid address to ask addr2line about (namely, ","). This causes addr2line to first
> + * write out the answer to our request, in an unbounded/unknown number of records, and
> + * then to write out the lines "??" and "??:0", so that we can detect when it has
> + * finished giving us anything useful. We have to be careful about the first record,
> + * though, because it may be genuinely unknown, in which case we'll get two sets of
> + * "??"/"??:0" lines.
> + */
> + if (fprintf(a2l->to_child, "%016"PRIx64"\n,\n", addr) < 0 || fflush(a2l->to_child) != 0) {
> + pr_warning("%s %s: could not send request\n", __func__, dso_name);
> goto out;
> }
>
> - ret = filename_split(filename, line_nr);
> - if (ret != 1) {
> - free(filename);
> + switch (read_addr2line_record(a2l, &record_function, &record_filename, &record_line_nr)) {
> + case -1:
> + pr_warning("%s %s: could not read first record\n", __func__, dso_name);
> goto out;
> + case 0:
> + /*
> + * The first record was invalid, so return failure, but first read another
> + * record, since we asked a junk question and have to clear the answer out.
> + */
> + switch (read_addr2line_record(a2l, NULL, NULL, NULL)) {
> + case -1:
> + pr_warning("%s %s: could not read delimiter record\n", __func__, dso_name);
> + break;
> + case 0:
> + /* As expected. */
> + break;
> + default:
> + pr_warning("%s %s: unexpected record instead of sentinel",
> + __func__, dso_name);
> + break;
> + }
> + goto out;
> + default:
> + break;
> + }
> +
> + if (file) {
> + *file = strdup(record_filename);
> + ret = 1;
> + }
> + if (line_nr)
> + *line_nr = record_line_nr;
> +
> + if (unwind_inlines) {
> + if (node && inline_list__append_record(dso, node, sym,
> + record_function,
> + record_filename,
> + record_line_nr)) {
> + ret = 0;
> + goto out;
> + }
> }
>
> - *file = filename;
> + /* We have to read the records even if we don't care about the inline info. */
> + while ((record_status = read_addr2line_record(a2l,
> + &record_function,
> + &record_filename,
> + &record_line_nr)) == 1) {
> + if (unwind_inlines && node && inline_count++ < MAX_INLINE_NEST) {
> + if (inline_list__append_record(dso, node, sym,
> + record_function,
> + record_filename,
> + record_line_nr)) {
> + ret = 0;
> + goto out;
> + }
> + ret = 1; /* found at least one inline frame */
> + }
> + }
>
> out:
> - pclose(fp);
> + free(record_function);
> + free(record_filename);
> return ret;
> }
>
> -void dso__free_a2l(struct dso *dso __maybe_unused)
> +void dso__free_a2l(struct dso *dso)
> {
> -}
> + struct a2l_subprocess *a2l = dso->a2l;
>
> -static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
> - struct dso *dso __maybe_unused,
> - struct symbol *sym)
> -{
> - FILE *fp;
> - char cmd[PATH_MAX];
> - struct inline_node *node;
> - char *filename = NULL;
> - char *funcname = NULL;
> - size_t filelen, funclen;
> - unsigned int line_nr = 0;
> -
> - scnprintf(cmd, sizeof(cmd), "addr2line -e %s -i -f %016"PRIx64,
> - dso_name, addr);
> -
> - fp = popen(cmd, "r");
> - if (fp == NULL) {
> - pr_err("popen failed for %s\n", dso_name);
> - return NULL;
> - }
> -
> - node = zalloc(sizeof(*node));
> - if (node == NULL) {
> - perror("not enough memory for the inline node");
> - goto out;
> - }
> -
> - INIT_LIST_HEAD(&node->val);
> - node->addr = addr;
> -
> - /* addr2line -f generates two lines for each inlined functions */
> - while (getline(&funcname, &funclen, fp) != -1) {
> - char *srcline;
> - struct symbol *inline_sym;
> -
> - strim(funcname);
> -
> - if (getline(&filename, &filelen, fp) == -1)
> - goto out;
> -
> - if (filename_split(filename, &line_nr) != 1)
> - goto out;
> -
> - srcline = srcline_from_fileline(filename, line_nr);
> - inline_sym = new_inline_sym(dso, sym, funcname);
> -
> - if (inline_list__append(inline_sym, srcline, node) != 0) {
> - free(srcline);
> - if (inline_sym && inline_sym->inlined)
> - symbol__delete(inline_sym);
> - goto out;
> - }
> - }
> + if (!a2l)
> + return;
>
> -out:
> - pclose(fp);
> - free(filename);
> - free(funcname);
> + addr2line_subprocess_cleanup(a2l);
>
> - return node;
> + dso->a2l = NULL;
> }
>
> #endif /* HAVE_LIBBFD_SUPPORT */
>
> +static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
> + struct dso *dso, struct symbol *sym)
> +{
> + struct inline_node *node;
> +
> + node = zalloc(sizeof(*node));
> + if (node == NULL) {
> + perror("not enough memory for the inline node");
> + return NULL;
> + }
> +
> + INIT_LIST_HEAD(&node->val);
> + node->addr = addr;
> +
> + addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
> + return node;
> +}
> +
> /*
> * Number of addr2line failures (without success) before disabling it for that
> * dso.
> --
> 2.33.0
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v4] tools/perf: Use long-running addr2line per dso
2021-10-01 0:29 ` Ian Rogers
@ 2021-10-01 1:20 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2021-10-01 1:20 UTC (permalink / raw)
To: Ian Rogers, Tony Garnock-Jones, acme; +Cc: peterz, mingo, linux-perf-users
On September 30, 2021 9:29:47 PM GMT-03:00, Ian Rogers <irogers@google.com> wrote:
>On Thu, Sep 16, 2021 at 5:09 AM Tony Garnock-Jones
><tonyg@leastfixedpoint.com> wrote:
>>
>> Invoking addr2line in a separate subprocess, one for each required
>> lookup, takes a terribly long time. This patch introduces a
>> long-running addr2line process for each dso, *DRAMATICALLY* speeding
>> up runs of perf. What used to take tens of minutes now takes tens of
>> seconds.
>>
>> Debian bug report about this issue:
>> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911815
>>
>> Signed-off-by: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
>> Tested-by: Ian Rogers <irogers@google.com>
>
>Hi Arnaldo,
>
>Is there anything further to do with this change?
>
I'll try and test/merge this tomorrow.
Thanks for the ping,
- Arnaldo
>Thanks,
>Ian
>
>> ---
>> Changes since v3:
>> - use zfree(), plus some small code compaction edits
>> - rebase against upstream master ff1ffd71d5f0612cf194f5705c671d6b64bf5f91
>>
>> Changes since v2:
>> - remove redundant initializations to 0 and NULL
>> - use terminology "record" instead of "stanza" for input from addr2line
>>
>> Changes since v1:
>> - use "subcmd/run-command.h" machinery instead of socketpair/fork/exec directly
>>
>>
>> tools/perf/util/srcline.c | 362 +++++++++++++++++++++++++++-----------
>> 1 file changed, 262 insertions(+), 100 deletions(-)
>>
>> diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
>> index 5b7d6c16d33f..af468e3bb6fa 100644
>> --- a/tools/perf/util/srcline.c
>> +++ b/tools/perf/util/srcline.c
>> @@ -1,8 +1,10 @@
>> // SPDX-License-Identifier: GPL-2.0
>> #include <inttypes.h>
>> +#include <signal.h>
>> #include <stdio.h>
>> #include <stdlib.h>
>> #include <string.h>
>> +#include <sys/types.h>
>>
>> #include <linux/kernel.h>
>> #include <linux/string.h>
>> @@ -15,6 +17,7 @@
>> #include "srcline.h"
>> #include "string2.h"
>> #include "symbol.h"
>> +#include "subcmd/run-command.h"
>>
>> bool srcline_full_filename;
>>
>> @@ -119,6 +122,8 @@ static struct symbol *new_inline_sym(struct dso *dso,
>> return inline_sym;
>> }
>>
>> +#define MAX_INLINE_NEST 1024
>> +
>> #ifdef HAVE_LIBBFD_SUPPORT
>>
>> /*
>> @@ -273,8 +278,6 @@ static void addr2line_cleanup(struct a2l_data *a2l)
>> free(a2l);
>> }
>>
>> -#define MAX_INLINE_NEST 1024
>> -
>> static int inline_list__append_dso_a2l(struct dso *dso,
>> struct inline_node *node,
>> struct symbol *sym)
>> @@ -361,26 +364,14 @@ void dso__free_a2l(struct dso *dso)
>> dso->a2l = NULL;
>> }
>>
>> -static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
>> - struct dso *dso, struct symbol *sym)
>> -{
>> - struct inline_node *node;
>> -
>> - node = zalloc(sizeof(*node));
>> - if (node == NULL) {
>> - perror("not enough memory for the inline node");
>> - return NULL;
>> - }
>> -
>> - INIT_LIST_HEAD(&node->val);
>> - node->addr = addr;
>> -
>> - addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
>> - return node;
>> -}
>> -
>> #else /* HAVE_LIBBFD_SUPPORT */
>>
>> +struct a2l_subprocess {
>> + struct child_process addr2line;
>> + FILE *to_child;
>> + FILE *from_child;
>> +};
>> +
>> static int filename_split(char *filename, unsigned int *line_nr)
>> {
>> char *sep;
>> @@ -402,114 +393,285 @@ static int filename_split(char *filename, unsigned int *line_nr)
>> return 0;
>> }
>>
>> +static void addr2line_subprocess_cleanup(struct a2l_subprocess *a2l)
>> +{
>> + if (a2l->addr2line.pid != -1) {
>> + kill(a2l->addr2line.pid, SIGKILL);
>> + finish_command(&a2l->addr2line); /* ignore result, we don't care */
>> + a2l->addr2line.pid = -1;
>> + }
>> +
>> + if (a2l->to_child != NULL) {
>> + fclose(a2l->to_child);
>> + a2l->to_child = NULL;
>> + }
>> +
>> + if (a2l->from_child != NULL) {
>> + fclose(a2l->from_child);
>> + a2l->from_child = NULL;
>> + }
>> +
>> + free(a2l);
>> +}
>> +
>> +static struct a2l_subprocess *addr2line_subprocess_init(const char *path)
>> +{
>> + const char *argv[] = { "addr2line", "-e", path, "-i", "-f", NULL };
>> + struct a2l_subprocess *a2l = zalloc(sizeof(*a2l));
>> + int start_command_status = 0;
>> +
>> + if (a2l == NULL)
>> + goto out;
>> +
>> + a2l->to_child = NULL;
>> + a2l->from_child = NULL;
>> +
>> + a2l->addr2line.pid = -1;
>> + a2l->addr2line.in = -1;
>> + a2l->addr2line.out = -1;
>> + a2l->addr2line.no_stderr = 1;
>> +
>> + a2l->addr2line.argv = argv;
>> + start_command_status = start_command(&a2l->addr2line);
>> + a2l->addr2line.argv = NULL; /* it's not used after start_command; avoid dangling pointers */
>> +
>> + if (start_command_status != 0) {
>> + pr_warning("could not start addr2line for %s: start_command return code %d\n",
>> + path,
>> + start_command_status);
>> + goto out;
>> + }
>> +
>> + a2l->to_child = fdopen(a2l->addr2line.in, "w");
>> + if (a2l->to_child == NULL) {
>> + pr_warning("could not open write-stream to addr2line of %s\n", path);
>> + goto out;
>> + }
>> +
>> + a2l->from_child = fdopen(a2l->addr2line.out, "r");
>> + if (a2l->from_child == NULL) {
>> + pr_warning("could not open read-stream from addr2line of %s\n", path);
>> + goto out;
>> + }
>> +
>> + return a2l;
>> +
>> +out:
>> + if (a2l)
>> + addr2line_subprocess_cleanup(a2l);
>> +
>> + return NULL;
>> +}
>> +
>> +static int read_addr2line_record(struct a2l_subprocess *a2l,
>> + char **function,
>> + char **filename,
>> + unsigned int *line_nr)
>> +{
>> + /*
>> + * Returns:
>> + * -1 ==> error
>> + * 0 ==> sentinel (or other ill-formed) record read
>> + * 1 ==> a genuine record read
>> + */
>> + char *line = NULL;
>> + size_t line_len = 0;
>> + unsigned int dummy_line_nr = 0;
>> + int ret = -1;
>> +
>> + if (function != NULL)
>> + zfree(function);
>> +
>> + if (filename != NULL)
>> + zfree(filename);
>> +
>> + if (line_nr != NULL)
>> + *line_nr = 0;
>> +
>> + if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
>> + goto error;
>> +
>> + if (function != NULL)
>> + *function = strdup(strim(line));
>> +
>> + zfree(&line);
>> + line_len = 0;
>> +
>> + if (getline(&line, &line_len, a2l->from_child) < 0 || !line_len)
>> + goto error;
>> +
>> + if (filename_split(line, line_nr == NULL ? &dummy_line_nr : line_nr) == 0) {
>> + ret = 0;
>> + goto error;
>> + }
>> +
>> + if (filename != NULL)
>> + *filename = strdup(line);
>> +
>> + zfree(&line);
>> + line_len = 0;
>> +
>> + return 1;
>> +
>> +error:
>> + free(line);
>> + if (function != NULL)
>> + zfree(function);
>> + if (filename != NULL)
>> + zfree(filename);
>> + return ret;
>> +}
>> +
>> +static int inline_list__append_record(struct dso *dso,
>> + struct inline_node *node,
>> + struct symbol *sym,
>> + const char *function,
>> + const char *filename,
>> + unsigned int line_nr)
>> +{
>> + struct symbol *inline_sym = new_inline_sym(dso, sym, function);
>> +
>> + return inline_list__append(inline_sym, srcline_from_fileline(filename, line_nr), node);
>> +}
>> +
>> static int addr2line(const char *dso_name, u64 addr,
>> char **file, unsigned int *line_nr,
>> - struct dso *dso __maybe_unused,
>> - bool unwind_inlines __maybe_unused,
>> - struct inline_node *node __maybe_unused,
>> + struct dso *dso,
>> + bool unwind_inlines,
>> + struct inline_node *node,
>> struct symbol *sym __maybe_unused)
>> {
>> - FILE *fp;
>> - char cmd[PATH_MAX];
>> - char *filename = NULL;
>> - size_t len;
>> + struct a2l_subprocess *a2l = dso->a2l;
>> + char *record_function = NULL;
>> + char *record_filename = NULL;
>> + unsigned int record_line_nr = 0;
>> + int record_status = -1;
>> int ret = 0;
>> + size_t inline_count = 0;
>>
>> - scnprintf(cmd, sizeof(cmd), "addr2line -e %s %016"PRIx64,
>> - dso_name, addr);
>> + if (!a2l) {
>> + dso->a2l = addr2line_subprocess_init(dso_name);
>> + a2l = dso->a2l;
>> + }
>>
>> - fp = popen(cmd, "r");
>> - if (fp == NULL) {
>> - pr_warning("popen failed for %s\n", dso_name);
>> - return 0;
>> + if (a2l == NULL) {
>> + if (!symbol_conf.disable_add2line_warn)
>> + pr_warning("%s %s: addr2line_subprocess_init failed\n", __func__, dso_name);
>> + goto out;
>> }
>>
>> - if (getline(&filename, &len, fp) < 0 || !len) {
>> - pr_warning("addr2line has no output for %s\n", dso_name);
>> + /*
>> + * Send our request and then *deliberately* send something that can't be interpreted as
>> + * a valid address to ask addr2line about (namely, ","). This causes addr2line to first
>> + * write out the answer to our request, in an unbounded/unknown number of records, and
>> + * then to write out the lines "??" and "??:0", so that we can detect when it has
>> + * finished giving us anything useful. We have to be careful about the first record,
>> + * though, because it may be genuinely unknown, in which case we'll get two sets of
>> + * "??"/"??:0" lines.
>> + */
>> + if (fprintf(a2l->to_child, "%016"PRIx64"\n,\n", addr) < 0 || fflush(a2l->to_child) != 0) {
>> + pr_warning("%s %s: could not send request\n", __func__, dso_name);
>> goto out;
>> }
>>
>> - ret = filename_split(filename, line_nr);
>> - if (ret != 1) {
>> - free(filename);
>> + switch (read_addr2line_record(a2l, &record_function, &record_filename, &record_line_nr)) {
>> + case -1:
>> + pr_warning("%s %s: could not read first record\n", __func__, dso_name);
>> goto out;
>> + case 0:
>> + /*
>> + * The first record was invalid, so return failure, but first read another
>> + * record, since we asked a junk question and have to clear the answer out.
>> + */
>> + switch (read_addr2line_record(a2l, NULL, NULL, NULL)) {
>> + case -1:
>> + pr_warning("%s %s: could not read delimiter record\n", __func__, dso_name);
>> + break;
>> + case 0:
>> + /* As expected. */
>> + break;
>> + default:
>> + pr_warning("%s %s: unexpected record instead of sentinel",
>> + __func__, dso_name);
>> + break;
>> + }
>> + goto out;
>> + default:
>> + break;
>> + }
>> +
>> + if (file) {
>> + *file = strdup(record_filename);
>> + ret = 1;
>> + }
>> + if (line_nr)
>> + *line_nr = record_line_nr;
>> +
>> + if (unwind_inlines) {
>> + if (node && inline_list__append_record(dso, node, sym,
>> + record_function,
>> + record_filename,
>> + record_line_nr)) {
>> + ret = 0;
>> + goto out;
>> + }
>> }
>>
>> - *file = filename;
>> + /* We have to read the records even if we don't care about the inline info. */
>> + while ((record_status = read_addr2line_record(a2l,
>> + &record_function,
>> + &record_filename,
>> + &record_line_nr)) == 1) {
>> + if (unwind_inlines && node && inline_count++ < MAX_INLINE_NEST) {
>> + if (inline_list__append_record(dso, node, sym,
>> + record_function,
>> + record_filename,
>> + record_line_nr)) {
>> + ret = 0;
>> + goto out;
>> + }
>> + ret = 1; /* found at least one inline frame */
>> + }
>> + }
>>
>> out:
>> - pclose(fp);
>> + free(record_function);
>> + free(record_filename);
>> return ret;
>> }
>>
>> -void dso__free_a2l(struct dso *dso __maybe_unused)
>> +void dso__free_a2l(struct dso *dso)
>> {
>> -}
>> + struct a2l_subprocess *a2l = dso->a2l;
>>
>> -static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
>> - struct dso *dso __maybe_unused,
>> - struct symbol *sym)
>> -{
>> - FILE *fp;
>> - char cmd[PATH_MAX];
>> - struct inline_node *node;
>> - char *filename = NULL;
>> - char *funcname = NULL;
>> - size_t filelen, funclen;
>> - unsigned int line_nr = 0;
>> -
>> - scnprintf(cmd, sizeof(cmd), "addr2line -e %s -i -f %016"PRIx64,
>> - dso_name, addr);
>> -
>> - fp = popen(cmd, "r");
>> - if (fp == NULL) {
>> - pr_err("popen failed for %s\n", dso_name);
>> - return NULL;
>> - }
>> -
>> - node = zalloc(sizeof(*node));
>> - if (node == NULL) {
>> - perror("not enough memory for the inline node");
>> - goto out;
>> - }
>> -
>> - INIT_LIST_HEAD(&node->val);
>> - node->addr = addr;
>> -
>> - /* addr2line -f generates two lines for each inlined functions */
>> - while (getline(&funcname, &funclen, fp) != -1) {
>> - char *srcline;
>> - struct symbol *inline_sym;
>> -
>> - strim(funcname);
>> -
>> - if (getline(&filename, &filelen, fp) == -1)
>> - goto out;
>> -
>> - if (filename_split(filename, &line_nr) != 1)
>> - goto out;
>> -
>> - srcline = srcline_from_fileline(filename, line_nr);
>> - inline_sym = new_inline_sym(dso, sym, funcname);
>> -
>> - if (inline_list__append(inline_sym, srcline, node) != 0) {
>> - free(srcline);
>> - if (inline_sym && inline_sym->inlined)
>> - symbol__delete(inline_sym);
>> - goto out;
>> - }
>> - }
>> + if (!a2l)
>> + return;
>>
>> -out:
>> - pclose(fp);
>> - free(filename);
>> - free(funcname);
>> + addr2line_subprocess_cleanup(a2l);
>>
>> - return node;
>> + dso->a2l = NULL;
>> }
>>
>> #endif /* HAVE_LIBBFD_SUPPORT */
>>
>> +static struct inline_node *addr2inlines(const char *dso_name, u64 addr,
>> + struct dso *dso, struct symbol *sym)
>> +{
>> + struct inline_node *node;
>> +
>> + node = zalloc(sizeof(*node));
>> + if (node == NULL) {
>> + perror("not enough memory for the inline node");
>> + return NULL;
>> + }
>> +
>> + INIT_LIST_HEAD(&node->val);
>> + node->addr = addr;
>> +
>> + addr2line(dso_name, addr, NULL, NULL, dso, true, node, sym);
>> + return node;
>> +}
>> +
>> /*
>> * Number of addr2line failures (without success) before disabling it for that
>> * dso.
>> --
>> 2.33.0
>>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v4] tools/perf: Use long-running addr2line per dso
2021-09-16 12:09 ` [PATCH v4] " Tony Garnock-Jones
2021-10-01 0:29 ` Ian Rogers
@ 2021-10-04 12:29 ` Arnaldo Carvalho de Melo
1 sibling, 0 replies; 17+ messages in thread
From: Arnaldo Carvalho de Melo @ 2021-10-04 12:29 UTC (permalink / raw)
To: Tony Garnock-Jones; +Cc: peterz, mingo, linux-perf-users, Ian Rogers
Em Thu, Sep 16, 2021 at 02:09:39PM +0200, Tony Garnock-Jones escreveu:
> Invoking addr2line in a separate subprocess, one for each required
> lookup, takes a terribly long time. This patch introduces a
> long-running addr2line process for each dso, *DRAMATICALLY* speeding
> up runs of perf. What used to take tens of minutes now takes tens of
> seconds.
>
> Debian bug report about this issue:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911815
>
> Signed-off-by: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
> Tested-by: Ian Rogers <irogers@google.com>
>
> ---
> Changes since v3:
> - use zfree(), plus some small code compaction edits
> - rebase against upstream master ff1ffd71d5f0612cf194f5705c671d6b64bf5f91
>
> Changes since v2:
> - remove redundant initializations to 0 and NULL
> - use terminology "record" instead of "stanza" for input from addr2line
>
> Changes since v1:
> - use "subcmd/run-command.h" machinery instead of socketpair/fork/exec directly
Thanks, applied.
- Arnaldo
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2021-10-04 12:29 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-09 11:22 [PATCH] tools/perf: Use long-running addr2line per dso Tony Garnock-Jones
2021-09-09 16:52 ` Alex Xu (Hello71)
2021-09-09 20:19 ` Arnaldo Carvalho de Melo
2021-09-10 8:58 ` Tony Garnock-Jones
2021-09-10 8:54 ` Tony Garnock-Jones
2021-09-09 19:05 ` Ian Rogers
2021-09-10 8:57 ` Tony Garnock-Jones
2021-09-10 10:23 ` [PATCH v2] " Tony Garnock-Jones
2021-09-10 22:45 ` Ian Rogers
2021-09-10 22:55 ` Tony Garnock-Jones
2021-09-10 22:55 ` [PATCH v3] " Tony Garnock-Jones
2021-09-11 0:25 ` Ian Rogers
2021-09-13 20:05 ` Arnaldo Carvalho de Melo
2021-09-16 12:09 ` [PATCH v4] " Tony Garnock-Jones
2021-10-01 0:29 ` Ian Rogers
2021-10-01 1:20 ` Arnaldo Carvalho de Melo
2021-10-04 12:29 ` Arnaldo Carvalho de Melo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.