| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20201117124913.GS614220@kernel.org>
Date: Tue, 17 Nov 2020 09:49:13 -0300
From: Arnaldo Carvalho de Melo <acme@...nel.org>
To: Jiri Olsa <jolsa@...nel.org>
Cc: lkml <linux-kernel@...r.kernel.org>,
Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Ingo Molnar <mingo@...nel.org>,
Mark Rutland <mark.rutland@....com>,
Namhyung Kim <namhyung@...nel.org>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Michael Petlan <mpetlan@...hat.com>,
Song Liu <songliubraving@...com>,
Ian Rogers <irogers@...gle.com>,
Stephane Eranian <eranian@...gle.com>,
Alexey Budankov <alexey.budankov@...ux.intel.com>,
Andi Kleen <ak@...ux.intel.com>,
Adrian Hunter <adrian.hunter@...el.com>
Subject: Re: [PATCH 22/24] perf buildid-cache: Add --debuginfod option
Em Tue, Nov 17, 2020 at 12:00:51PM +0100, Jiri Olsa escreveu:
> Adding --debuginfod option to specify debuginfod url and
> support to do that through config file as well.
>
> Use following in ~/.perfconfig file:
>
> [buildid-cache]
> debuginfod=http://192.168.122.174:8002
Ditto, its cool this is getting nicely integrated :-)
- Arnaldo
> Signed-off-by: Jiri Olsa <jolsa@...nel.org>
> ---
> .../perf/Documentation/perf-buildid-cache.txt | 6 ++++
> tools/perf/Documentation/perf-config.txt | 7 +++++
> tools/perf/builtin-buildid-cache.c | 28 +++++++++++++++++--
> 3 files changed, 38 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/Documentation/perf-buildid-cache.txt b/tools/perf/Documentation/perf-buildid-cache.txt
> index b77da5138bca..75385f4dc11f 100644
> --- a/tools/perf/Documentation/perf-buildid-cache.txt
> +++ b/tools/perf/Documentation/perf-buildid-cache.txt
> @@ -84,6 +84,12 @@ OPTIONS
> used when creating a uprobe for a process that resides in a
> different mount namespace from the perf(1) utility.
>
> +--debuginfod=URL::
> + Specify debuginfod URL to be used when retrieving perf.data binaries,
> + it follows the same syntax as the DEBUGINFOD_URLS variable, like:
> +
> + buildid-cache.debuginfod=http://192.168.122.174:8002
> +
> SEE ALSO
> --------
> linkperf:perf-record[1], linkperf:perf-report[1], linkperf:perf-buildid-list[1]
> diff --git a/tools/perf/Documentation/perf-config.txt b/tools/perf/Documentation/perf-config.txt
> index 31069d8a5304..15fad32b9885 100644
> --- a/tools/perf/Documentation/perf-config.txt
> +++ b/tools/perf/Documentation/perf-config.txt
> @@ -238,6 +238,13 @@ buildid.*::
> cache location, or to disable it altogether. If you want to disable it,
> set buildid.dir to /dev/null. The default is $HOME/.debug
>
> +buildid-cache.*::
> + buildid-cache.debuginfod=URL
> + Specify debuginfod URL to be used when retrieving perf.data binaries,
> + it follows the same syntax as the DEBUGINFOD_URLS variable, like:
> +
> + buildid-cache.debuginfod=http://192.168.122.174:8002
> +
> annotate.*::
> These are in control of addresses, jump function, source code
> in lines of assembly code from a specific program.
> diff --git a/tools/perf/builtin-buildid-cache.c b/tools/perf/builtin-buildid-cache.c
> index 0bfb54ee1e5e..fc03de7d2a28 100644
> --- a/tools/perf/builtin-buildid-cache.c
> +++ b/tools/perf/builtin-buildid-cache.c
> @@ -27,6 +27,7 @@
> #include "util/time-utils.h"
> #include "util/util.h"
> #include "util/probe-file.h"
> +#include "util/config.h"
> #include <linux/string.h>
> #include <linux/err.h>
> #include <linux/zalloc.h>
> @@ -552,12 +553,21 @@ build_id_cache__add_perf_data(const char *path, bool all)
> return err;
> }
>
> +static int perf_buildid_cache_config(const char *var, const char *value, void *cb)
> +{
> + const char **debuginfod = cb;
> +
> + if (!strcmp(var, "buildid-cache.debuginfod"))
> + *debuginfod = strdup(value);
> +
> + return 0;
> +}
> +
> int cmd_buildid_cache(int argc, const char **argv)
> {
> struct strlist *list;
> struct str_node *pos;
> - int ret = 0;
> - int ns_id = -1;
> + int ret, ns_id = -1;
> bool force = false;
> bool list_files = false;
> bool opts_flag = false;
> @@ -567,7 +577,8 @@ int cmd_buildid_cache(int argc, const char **argv)
> *purge_name_list_str = NULL,
> *missing_filename = NULL,
> *update_name_list_str = NULL,
> - *kcore_filename = NULL;
> + *kcore_filename = NULL,
> + *debuginfod = NULL;
> char sbuf[STRERR_BUFSIZE];
>
> struct perf_data data = {
> @@ -592,6 +603,8 @@ int cmd_buildid_cache(int argc, const char **argv)
> OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
> OPT_STRING('u', "update", &update_name_list_str, "file list",
> "file(s) to update"),
> + OPT_STRING(0, "debuginfod", &debuginfod, "debuginfod url",
> + "set debuginfod url"),
> OPT_INCR('v', "verbose", &verbose, "be more verbose"),
> OPT_INTEGER(0, "target-ns", &ns_id, "target pid for namespace context"),
> OPT_END()
> @@ -601,6 +614,10 @@ int cmd_buildid_cache(int argc, const char **argv)
> NULL
> };
>
> + ret = perf_config(perf_buildid_cache_config, &debuginfod);
> + if (ret)
> + return ret;
> +
> argc = parse_options(argc, argv, buildid_cache_options,
> buildid_cache_usage, 0);
>
> @@ -612,6 +629,11 @@ int cmd_buildid_cache(int argc, const char **argv)
> if (argc || !(list_files || opts_flag))
> usage_with_options(buildid_cache_usage, buildid_cache_options);
>
> + if (debuginfod) {
> + pr_debug("DEBUGINFOD_URLS=%s\n", debuginfod);
> + setenv("DEBUGINFOD_URLS", debuginfod, 1);
> + }
> +
> /* -l is exclusive. It can not be used with other options. */
> if (list_files && opts_flag) {
> usage_with_options_msg(buildid_cache_usage,
> --
> 2.26.2
>
--
- Arnaldo
Powered by blists - more mailing lists