| 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
| ||
|
Date: Thu, 6 Aug 2020 09:46:00 -0300
From: Arnaldo Carvalho de Melo <acme@...nel.org>
To: Jiri Olsa <jolsa@...nel.org>
Cc: lkml <linux-kernel@...r.kernel.org>,
Ingo Molnar <mingo@...nel.org>,
Namhyung Kim <namhyung@...nel.org>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Michael Petlan <mpetlan@...hat.com>,
Ian Rogers <irogers@...gle.com>,
Andi Kleen <ak@...ux.intel.com>,
David Ahern <dsahern@...il.com>,
Geneviève Bastien <gbastien@...satic.net>,
Wang Nan <wangnan0@...wei.com>,
Jeremie Galarneau <jgalar@...icios.com>
Subject: Re: [PATCH v2 5/7] perf tools: Add support to store time of day in
CTF data conversion
Em Wed, Aug 05, 2020 at 11:34:42AM +0200, Jiri Olsa escreveu:
> Adding support to convert and store time of day in CTF
> data conversion for 'perf data convert' subcommand.
>
> The perf.data used for conversion needs to have clock data
> information - must be recorded with -k/--clockid option).
>
> New --tod option is added to 'perf data convert' subcommand
> to convert data with timestamps converted to wall clock time.
Thanks, applied.
- Arnaldo
> Record data with clockid set:
> # perf record -k CLOCK_MONOTONIC kill
> kill: not enough arguments
> [ perf record: Woken up 1 times to write data ]
> [ perf record: Captured and wrote 0.033 MB perf.data (8 samples) ]
>
> Convert data with TOD timestamps:
> # perf data convert --tod --to-ctf ./ctf
> [ perf data convert: Converted 'perf.data' into CTF data './ctf' ]
> [ perf data convert: Converted and wrote 0.000 MB (8 samples) ]
>
> Display data in perf script:
> # perf script -F+tod --ns
> perf 262150 2020-07-13 18:38:50.097678523 153633.958246159: 1 cycles: ...
> perf 262150 2020-07-13 18:38:50.097682941 153633.958250577: 1 cycles: ...
> perf 262150 2020-07-13 18:38:50.097684997 153633.958252633: 7 cycles: ...
> ...
>
> Display data in babeltrace:
> # babeltrace --clock-date ./ctf
> [2020-07-13 18:38:50.097678523] (+?.?????????) cycles: { cpu_id = 0 }, { perf_ip = 0xFFF ...
> [2020-07-13 18:38:50.097682941] (+0.000004418) cycles: { cpu_id = 0 }, { perf_ip = 0xFFF ...
> [2020-07-13 18:38:50.097684997] (+0.000002056) cycles: { cpu_id = 0 }, { perf_ip = 0xFFF ...
> ...
>
> It's available only for recording with clockid specified,
> because it's the only case where we can get reference time
> to wallclock time. It's can't do that with perf clock yet.
>
> Error is display if you want to use --tod on data without
> clockid specified:
>
> # perf data convert --tod --to-ctf ./ctf
> Can't provide --tod time, missing clock data. Please record with -k/--clockid option.
> Failed to setup CTF writer.
> Error during conversion setup.
>
> Signed-off-by: Jiri Olsa <jolsa@...nel.org>
> ---
> tools/perf/Documentation/perf-data.txt | 3 ++
> tools/perf/builtin-data.c | 1 +
> tools/perf/util/data-convert-bt.c | 57 +++++++++++++++++---------
> tools/perf/util/data-convert.h | 1 +
> 4 files changed, 42 insertions(+), 20 deletions(-)
>
> diff --git a/tools/perf/Documentation/perf-data.txt b/tools/perf/Documentation/perf-data.txt
> index c87180764829..726b9bc9e1a7 100644
> --- a/tools/perf/Documentation/perf-data.txt
> +++ b/tools/perf/Documentation/perf-data.txt
> @@ -27,6 +27,9 @@ OPTIONS for 'convert'
> --to-ctf::
> Triggers the CTF conversion, specify the path of CTF data directory.
>
> +--tod::
> + Convert time to wall clock time.
> +
> -i::
> Specify input perf data file path.
>
> diff --git a/tools/perf/builtin-data.c b/tools/perf/builtin-data.c
> index ca2fb44874e4..8d23b8d6ee8e 100644
> --- a/tools/perf/builtin-data.c
> +++ b/tools/perf/builtin-data.c
> @@ -65,6 +65,7 @@ static int cmd_data_convert(int argc, const char **argv)
> OPT_STRING('i', "input", &input_name, "file", "input file name"),
> #ifdef HAVE_LIBBABELTRACE_SUPPORT
> OPT_STRING(0, "to-ctf", &to_ctf, NULL, "Convert to CTF format"),
> + OPT_BOOLEAN(0, "tod", &opts.tod, "Convert time to wall clock time"),
> #endif
> OPT_BOOLEAN('f', "force", &opts.force, "don't complain, do it"),
> OPT_BOOLEAN(0, "all", &opts.all, "Convert all events"),
> diff --git a/tools/perf/util/data-convert-bt.c b/tools/perf/util/data-convert-bt.c
> index 5f36fc6a5578..27c5fef9ad54 100644
> --- a/tools/perf/util/data-convert-bt.c
> +++ b/tools/perf/util/data-convert-bt.c
> @@ -31,6 +31,9 @@
> #include "config.h"
> #include <linux/ctype.h>
> #include <linux/err.h>
> +#include <linux/time64.h>
> +#include "util.h"
> +#include "clockid.h"
>
> #define pr_N(n, fmt, ...) \
> eprintf(n, debug_data_convert, fmt, ##__VA_ARGS__)
> @@ -1381,11 +1384,26 @@ do { \
> return 0;
> }
>
> -static int ctf_writer__setup_clock(struct ctf_writer *cw)
> +static int ctf_writer__setup_clock(struct ctf_writer *cw,
> + struct perf_session *session,
> + bool tod)
> {
> struct bt_ctf_clock *clock = cw->clock;
> + const char *desc = "perf clock";
> + int64_t offset = 0;
>
> - bt_ctf_clock_set_description(clock, "perf clock");
> + if (tod) {
> + struct perf_env *env = &session->header.env;
> +
> + if (!env->clock.enabled) {
> + pr_err("Can't provide --tod time, missing clock data. "
> + "Please record with -k/--clockid option.\n");
> + return -1;
> + }
> +
> + desc = clockid_name(env->clock.clockid);
> + offset = env->clock.tod_ns - env->clock.clockid_ns;
> + }
>
> #define SET(__n, __v) \
> do { \
> @@ -1394,8 +1412,8 @@ do { \
> } while (0)
>
> SET(frequency, 1000000000);
> - SET(offset_s, 0);
> - SET(offset, 0);
> + SET(offset, offset);
> + SET(description, desc);
> SET(precision, 10);
> SET(is_absolute, 0);
>
> @@ -1481,7 +1499,8 @@ static void ctf_writer__cleanup(struct ctf_writer *cw)
> memset(cw, 0, sizeof(*cw));
> }
>
> -static int ctf_writer__init(struct ctf_writer *cw, const char *path)
> +static int ctf_writer__init(struct ctf_writer *cw, const char *path,
> + struct perf_session *session, bool tod)
> {
> struct bt_ctf_writer *writer;
> struct bt_ctf_stream_class *stream_class;
> @@ -1505,7 +1524,7 @@ static int ctf_writer__init(struct ctf_writer *cw, const char *path)
>
> cw->clock = clock;
>
> - if (ctf_writer__setup_clock(cw)) {
> + if (ctf_writer__setup_clock(cw, session, tod)) {
> pr("Failed to setup CTF clock.\n");
> goto err_cleanup;
> }
> @@ -1613,17 +1632,15 @@ int bt_convert__perf2ctf(const char *input, const char *path,
> if (err)
> return err;
>
> - /* CTF writer */
> - if (ctf_writer__init(cw, path))
> - return -1;
> -
> err = -1;
> /* perf.data session */
> session = perf_session__new(&data, 0, &c.tool);
> - if (IS_ERR(session)) {
> - err = PTR_ERR(session);
> - goto free_writer;
> - }
> + if (IS_ERR(session))
> + return PTR_ERR(session);
> +
> + /* CTF writer */
> + if (ctf_writer__init(cw, path, session, opts->tod))
> + goto free_session;
>
> if (c.queue_size) {
> ordered_events__set_alloc_size(&session->ordered_events,
> @@ -1632,17 +1649,17 @@ int bt_convert__perf2ctf(const char *input, const char *path,
>
> /* CTF writer env/clock setup */
> if (ctf_writer__setup_env(cw, session))
> - goto free_session;
> + goto free_writer;
>
> /* CTF events setup */
> if (setup_events(cw, session))
> - goto free_session;
> + goto free_writer;
>
> if (opts->all && setup_non_sample_events(cw, session))
> - goto free_session;
> + goto free_writer;
>
> if (setup_streams(cw, session))
> - goto free_session;
> + goto free_writer;
>
> err = perf_session__process_events(session);
> if (!err)
> @@ -1670,10 +1687,10 @@ int bt_convert__perf2ctf(const char *input, const char *path,
>
> return err;
>
> -free_session:
> - perf_session__delete(session);
> free_writer:
> ctf_writer__cleanup(cw);
> +free_session:
> + perf_session__delete(session);
> pr_err("Error during conversion setup.\n");
> return err;
> }
> diff --git a/tools/perf/util/data-convert.h b/tools/perf/util/data-convert.h
> index af90b6076c06..feab5f114e37 100644
> --- a/tools/perf/util/data-convert.h
> +++ b/tools/perf/util/data-convert.h
> @@ -5,6 +5,7 @@
> struct perf_data_convert_opts {
> bool force;
> bool all;
> + bool tod;
> };
>
> #endif /* __DATA_CONVERT_H */
> --
> 2.25.4
>
--
- Arnaldo
Powered by blists - more mailing lists