From: Steven Rostedt <rostedt@goodmis.org>
To: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
Cc: linux-trace-devel@vger.kernel.org
Subject: Re: [PATCH v3 06/23] trace-cmd: Add new trace-cmd clock tsc2nsec
Date: Wed, 24 Mar 2021 11:20:01 -0400 [thread overview]
Message-ID: <20210324112001.0d897bdb@gandalf.local.home> (raw)
In-Reply-To: <20210324130418.436206-7-tz.stoyanov@gmail.com>
On Wed, 24 Mar 2021 15:04:01 +0200
"Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> wrote:
> @@ -199,6 +200,12 @@ struct filter_pids {
> int exclude;
> };
>
> +struct tsc_nsec {
> + int mult;
> + int shift;
> + unsigned long long offset;
> +};
> +
> struct buffer_instance {
> struct buffer_instance *next;
> char *name;
> diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
> index 5f7f5b3d..2a594736 100644
> --- a/tracecmd/trace-record.c
> +++ b/tracecmd/trace-record.c
> @@ -57,6 +57,8 @@
> #define MAX_LATENCY "tracing_max_latency"
> #define STAMP "stamp"
> #define FUNC_STACK_TRACE "func_stack_trace"
> +#define TSC_CLOCK "x86-tsc"
> +#define TSCNSEC_CLOCK "tsc2nsec"
>
> enum trace_type {
> TRACE_TYPE_RECORD = 1,
> @@ -198,6 +200,7 @@ struct common_record_context {
> char *date2ts;
> char *user;
> int data_flags;
> + struct tsc_nsec tsc2nsec;
struct tsc_nsec is 16 bytes in size, ending with a 8 byte word. It should
be added before the "int data_flags" to prevent a hole in the middle of
this struct.
>
> int record_all;
> int total_disable;
> @@ -5904,7 +5965,15 @@ static void parse_record_options(int argc,
> break;
> case 'C':
> check_instance_die(ctx->instance, "-C");
> - ctx->instance->clock = optarg;
> + if (!strncmp(optarg, TSCNSEC_CLOCK, strlen(TSCNSEC_CLOCK))) {
Hmm, why the strncmp()? Shouldn't it be a full match, not a partial one?
> + ret = get_tsc_nsec(&ctx->tsc2nsec.shift,
> + &ctx->tsc2nsec.mult);
> + if (ret || !clock_is_supported(NULL, TSC_CLOCK))
> + die("Clock %s is not supported", optarg);
> + ctx->instance->flags |= BUFFER_FL_TSC2NSEC;
> + ctx->instance->clock = strdup(TSC_CLOCK);
Hmm, why the strdup? below we have clock = optarg, one of them is wrong. If
we free instance->clock, then we can't have it set to optarg. As that was
the way it was before, it looks to be a separate bug that probably needs
its own patch.
> + } else
> + ctx->instance->clock = optarg;
Actually, I think we should have the above be:
case 'C':
if (strcmp(optarg, TSCNSEC_CLOCK) == 0) {
ret = get_tsc_nsec(&ctx->tsc2nsec.shift,
&ctx->tsc2nsec.mult);
if (ret)
die("TSC to nanosecond is not supported");
ctx->instance->clock = TSC_CLOCK;
} else {
ctx->instance->clock = optarg;
}
if (!clock_is_supported(ctx->instance->clock))
die("Clock %s is not supported",
ctx->instance->clock);
ctx->instance->clock = strdup(ctx->instance->clock);
if (!ctx->instance->clock)
die("Failed allocation");
The above is more informative about the reason for the error, and also
removes duplicate code in the check of supported clocks.
-- Steve
> ctx->instance->flags |= BUFFER_FL_HAS_CLOCK;
> if (is_top_instance(ctx->instance))
> guest_sync_set = true;
> @@ -6159,6 +6228,13 @@ static void parse_record_options(int argc,
> die("--fork option used for 'start' command only");
> fork_process = true;
> break;
> + case OPT_tsc2nsec:
> + ret = get_tsc_nsec(&ctx->tsc2nsec.shift,
> + &ctx->tsc2nsec.mult);
> + if (ret)
> + die("TSC to nanosecond is not supported");
> + ctx->instance->flags |= BUFFER_FL_TSC2NSEC;
> + break;
> case OPT_quiet:
> case 'q':
> quiet = true;
next prev parent reply other threads:[~2021-03-24 15:20 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-24 13:03 [PATCH v3 00/23] TSC trace clock to nanosecond conversion Tzvetomir Stoyanov (VMware)
2021-03-24 13:03 ` [PATCH v3 01/23] trace-cmd: Add initial perf interface in trace-cmd library Tzvetomir Stoyanov (VMware)
2021-03-24 13:03 ` [PATCH v3 02/23] trace-cmd: Extend trace-cmd dump subcommand to display the clock Tzvetomir Stoyanov (VMware)
2021-03-24 17:57 ` Steven Rostedt
2021-03-24 18:02 ` Steven Rostedt
2021-03-24 13:03 ` [PATCH v3 03/23] trace-cmd: Save only the selected clock in the trace.dat file Tzvetomir Stoyanov (VMware)
2021-03-24 13:03 ` [PATCH v3 04/23] trace-cmd: Internal refactoring, move logic for local tep handler in its own function Tzvetomir Stoyanov (VMware)
2021-03-24 13:04 ` [PATCH v3 05/23] trace-cmd: Add new local function to check if a trace clock is supported Tzvetomir Stoyanov (VMware)
2021-03-24 17:49 ` Steven Rostedt
2021-03-24 13:04 ` [PATCH v3 06/23] trace-cmd: Add new trace-cmd clock tsc2nsec Tzvetomir Stoyanov (VMware)
2021-03-24 15:05 ` Steven Rostedt
2021-03-24 15:20 ` Steven Rostedt [this message]
2021-03-24 15:38 ` Tzvetomir Stoyanov
2021-03-24 16:22 ` Steven Rostedt
2021-03-24 16:56 ` Tzvetomir Stoyanov
2021-03-24 20:55 ` Steven Rostedt
2021-03-24 18:32 ` Steven Rostedt
2021-03-24 18:33 ` Steven Rostedt
2021-03-24 13:04 ` [PATCH v3 07/23] trace-cmd: Define a new option for tsc2nsec conversion Tzvetomir Stoyanov (VMware)
2021-03-24 13:04 ` [PATCH v3 08/23] trace-cmd: Save information for tsc to nanoseconds conversion in trace file Tzvetomir Stoyanov (VMware)
2021-03-24 13:04 ` [PATCH v3 09/23] trace-cmd: Read information for tsc to nanoseconds conversion from " Tzvetomir Stoyanov (VMware)
2021-03-24 13:04 ` [PATCH v3 10/23] trace-cmd: Save tsc2nsec clock in trace.dat file Tzvetomir Stoyanov (VMware)
2021-03-24 13:04 ` [PATCH v3 11/23] trace-cmd: Append new options into guest trace file at the end of the tracing session Tzvetomir Stoyanov (VMware)
2021-03-24 13:04 ` [PATCH v3 12/23] trace-cmd: Remove unneeded multiply in events timestamp reading Tzvetomir Stoyanov (VMware)
2021-03-24 13:04 ` [PATCH v3 13/23] trace-cmd: Perform all timestamp corrections in a single function Tzvetomir Stoyanov (VMware)
2021-03-24 13:04 ` [PATCH v3 14/23] trace-cmd: Convert tsc timestamps to nanosecods when reading trace data from a file Tzvetomir Stoyanov (VMware)
2021-03-24 13:04 ` [PATCH v3 15/23] trace-cmd: Set order and priorities when applying timestamp corrections Tzvetomir Stoyanov (VMware)
2021-03-24 18:51 ` Steven Rostedt
2021-03-25 6:29 ` Tzvetomir Stoyanov
2021-03-24 13:04 ` [PATCH v3 16/23] trace-cmd: Add a new flag to disable any " Tzvetomir Stoyanov (VMware)
2021-03-24 14:24 ` Steven Rostedt
2021-03-24 15:20 ` Steven Rostedt
2021-03-24 13:04 ` [PATCH v3 17/23] trace-cmd: Change "--nodate" option to affect "--date" option only Tzvetomir Stoyanov (VMware)
2021-03-24 13:04 ` [PATCH v3 18/23] trace-cmd: Add new parameter "--raw-ts" to "trace-cmd report" command Tzvetomir Stoyanov (VMware)
2021-03-24 13:04 ` [PATCH v3 19/23] trace-cmd: Print times in TimeShift options as unsigned in trace-cmd dump Tzvetomir Stoyanov (VMware)
2021-03-24 15:33 ` Steven Rostedt
2021-03-24 13:04 ` [PATCH v3 20/23] trace-cmd: Use tsc clock for host-guest tracing, if available Tzvetomir Stoyanov (VMware)
2021-03-24 13:04 ` [PATCH v3 21/23] trace-cmd: Get current clock for host-guest tracing session Tzvetomir Stoyanov (VMware)
2021-03-24 21:15 ` Steven Rostedt
2021-03-25 5:13 ` Tzvetomir Stoyanov
2021-03-25 13:41 ` Steven Rostedt
2021-03-24 13:04 ` [PATCH v3 22/23] trace-cmd: Save the trace clocks in TRACECLOCK option Tzvetomir Stoyanov (VMware)
2021-03-24 21:24 ` Steven Rostedt
2021-03-25 5:35 ` Tzvetomir Stoyanov
2021-03-24 13:04 ` [PATCH v3 23/23] trace-cmd: Read at least 8 bytes trace-id option Tzvetomir Stoyanov (VMware)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210324112001.0d897bdb@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=linux-trace-devel@vger.kernel.org \
--cc=tz.stoyanov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).