From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v25 10/16] trace-cmd: Add time sync protocol flags
Date: Thu, 29 Oct 2020 13:18:10 +0200 [thread overview]
Message-ID: <20201029111816.247241-11-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20201029111816.247241-1-tz.stoyanov@gmail.com>
Added 32bit flags for the time synchronization protocols. The first added
flag is TRACECMD_TSYNC_FLAG_INTERPOLATE, used to specify how the
timestamps must be corrected.
- If the flag is set, an interpolation is performed:
Find the (min, max) interval from the offsets array and calculate
offset specific to the given timestamp using interpolation in that
interval.
- If the flag is not set, do not interpolate:
Find the (min, max) interval from the offsets array and use the
min offset for all timespamps within the interval.
These flags are set by the timestamp synchronization protocols at the
protocol initialization time.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
include/trace-cmd/trace-cmd.h | 5 +++
lib/trace-cmd/include/trace-tsync-local.h | 2 +-
lib/trace-cmd/trace-input.c | 48 +++++++++++++++--------
lib/trace-cmd/trace-timesync.c | 28 ++++++++++++-
tracecmd/trace-dump.c | 3 ++
tracecmd/trace-tsync.c | 20 ++++++----
6 files changed, 81 insertions(+), 25 deletions(-)
diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h
index 6a6e4061..0a6c3ad9 100644
--- a/include/trace-cmd/trace-cmd.h
+++ b/include/trace-cmd/trace-cmd.h
@@ -456,6 +456,9 @@ struct tracecmd_time_sync {
};
+/* Timestamp synchronization flags */
+#define TRACECMD_TSYNC_FLAG_INTERPOLATE 0x1
+
void tracecmd_tsync_init(void);
int tracecmd_tsync_proto_getall(char ***protos, const char *clock, int role);
char *tracecmd_tsync_proto_select(char **protos, char *clock,
@@ -466,6 +469,8 @@ void tracecmd_tsync_with_guest(struct tracecmd_time_sync *tsync);
int tracecmd_tsync_get_offsets(struct tracecmd_time_sync *tsync,
int *count, long long **ts,
long long **offsets, long long **scalings);
+int tracecmd_tsync_get_proto_flags(struct tracecmd_time_sync *tsync,
+ unsigned int *flags);
void tracecmd_tsync_free(struct tracecmd_time_sync *tsync);
/* --- Plugin handling --- */
diff --git a/lib/trace-cmd/include/trace-tsync-local.h b/lib/trace-cmd/include/trace-tsync-local.h
index 492a0a90..54a85ee7 100644
--- a/lib/trace-cmd/include/trace-tsync-local.h
+++ b/lib/trace-cmd/include/trace-tsync-local.h
@@ -33,7 +33,7 @@ struct clock_sync_context {
};
int tracecmd_tsync_proto_register(char *proto_name, int accuracy, int roles,
- int supported_clocks,
+ int supported_clocks, unsigned int flags,
int (*init)(struct tracecmd_time_sync *),
int (*free)(struct tracecmd_time_sync *),
int (*calc)(struct tracecmd_time_sync *,
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index 1ac50f48..c38b634b 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -93,6 +93,7 @@ struct guest_trace_info {
struct host_trace_info {
unsigned long long peer_trace_id;
+ unsigned int flags;
bool sync_enable;
struct tracecmd_input *peer_data;
int ts_samples_count;
@@ -1121,15 +1122,25 @@ static void free_next(struct tracecmd_input *handle, int cpu)
}
static inline unsigned long long
-timestamp_correction_calc(unsigned long long ts, struct ts_offset_sample *min,
+timestamp_correction_calc(unsigned long long ts, unsigned int flags,
+ struct ts_offset_sample *min,
struct ts_offset_sample *max)
{
- long long scaling = (min->scaling + max->scaling) / 2;
- long long offset = ((long long)ts - min->time) *
- (max->offset - min->offset);
- long long delta = max->time - min->time;
- long long tscor = min->offset +
- (offset + delta / 2) / delta;
+ long long scaling;
+ long long tscor;
+
+ if (flags & TRACECMD_TSYNC_FLAG_INTERPOLATE) {
+ long long delta = max->time - min->time;
+ long long offset = ((long long)ts - min->time) *
+ (max->offset - min->offset);
+
+ scaling = (min->scaling + max->scaling) / 2;
+ tscor = min->offset + (offset + delta / 2) / delta;
+
+ } else {
+ scaling = min->scaling;
+ tscor = min->offset;
+ }
ts *= scaling;
if (tscor < 0)
@@ -1156,16 +1167,17 @@ static unsigned long long timestamp_correct(unsigned long long ts,
/* We have two samples, nothing to search here */
if (host->ts_samples_count == 2)
- return timestamp_correction_calc(ts, &host->ts_samples[0],
+ return timestamp_correction_calc(ts, host->flags,
+ &host->ts_samples[0],
&host->ts_samples[1]);
/* We have more than two samples */
if (ts <= host->ts_samples[0].time)
- return timestamp_correction_calc(ts,
+ return timestamp_correction_calc(ts, host->flags,
&host->ts_samples[0],
&host->ts_samples[1]);
else if (ts >= host->ts_samples[host->ts_samples_count-1].time)
- return timestamp_correction_calc(ts,
+ return timestamp_correction_calc(ts, host->flags,
&host->ts_samples[host->ts_samples_count-2],
&host->ts_samples[host->ts_samples_count-1]);
min = 0;
@@ -1181,7 +1193,8 @@ static unsigned long long timestamp_correct(unsigned long long ts,
mid = (min + max)/2;
}
- return timestamp_correction_calc(ts, &host->ts_samples[mid],
+ return timestamp_correction_calc(ts, host->flags,
+ &host->ts_samples[mid],
&host->ts_samples[mid+1]);
}
@@ -2535,28 +2548,31 @@ static int handle_options(struct tracecmd_input *handle)
case TRACECMD_OPTION_TIME_SHIFT:
/*
* long long int (8 bytes) trace session ID
+ * int (4 bytes) protocol flags.
* int (4 bytes) count of timestamp offsets.
* long long array of size [count] of times,
* when the offsets were calculated.
* long long array of size [count] of timestamp offsets.
* long long array of size [count] of timestamp scaling ratios.*
*/
- if (size < 12 || handle->flags & TRACECMD_FL_IGNORE_DATE)
+ if (size < 16 || handle->flags & TRACECMD_FL_IGNORE_DATE)
break;
handle->host.peer_trace_id = tep_read_number(handle->pevent,
buf, 8);
+ handle->host.flags = tep_read_number(handle->pevent,
+ buf + 8, 4);
handle->host.ts_samples_count = tep_read_number(handle->pevent,
- buf + 8, 4);
+ buf + 12, 4);
samples_size = (8 * handle->host.ts_samples_count);
- if (size != (12 + (2 * samples_size))) {
+ if (size != (16 + (2 * samples_size))) {
warning("Failed to extract Time Shift information from the file: found size %d, expected is %d",
- size, 12 + (2 * samples_size));
+ size, 16 + (2 * samples_size));
break;
}
handle->host.ts_samples = malloc(2 * samples_size);
if (!handle->host.ts_samples)
return -ENOMEM;
- tsync_offset_load(handle, buf + 12);
+ tsync_offset_load(handle, buf + 16);
break;
case TRACECMD_OPTION_CPUSTAT:
buf[size-1] = '\n';
diff --git a/lib/trace-cmd/trace-timesync.c b/lib/trace-cmd/trace-timesync.c
index 1036917e..0f3246c6 100644
--- a/lib/trace-cmd/trace-timesync.c
+++ b/lib/trace-cmd/trace-timesync.c
@@ -28,6 +28,7 @@ struct tsync_proto {
enum tracecmd_time_sync_role roles;
int accuracy;
int supported_clocks;
+ unsigned int flags;
int (*clock_sync_init)(struct tracecmd_time_sync *clock_context);
int (*clock_sync_free)(struct tracecmd_time_sync *clock_context);
@@ -53,7 +54,7 @@ static struct tsync_proto *tsync_proto_find(char *proto_name)
}
int tracecmd_tsync_proto_register(char *proto_name, int accuracy, int roles,
- int supported_clocks,
+ int supported_clocks, unsigned int flags,
int (*init)(struct tracecmd_time_sync *),
int (*free)(struct tracecmd_time_sync *),
int (*calc)(struct tracecmd_time_sync *,
@@ -139,6 +140,31 @@ int tracecmd_tsync_get_offsets(struct tracecmd_time_sync *tsync,
return 0;
}
+/**
+ * tracecmd_tsync_get_proto_flags - Get protocol flags
+ *
+ * @tsync: Pointer to time sync context
+ * @flags: Returns the protocol flags, a combination of TRACECMD_TSYNC_FLAG_...
+ *
+ * Retuns -1 in case of an error, or 0 otherwise
+ */
+int tracecmd_tsync_get_proto_flags(struct tracecmd_time_sync *tsync,
+ unsigned int *flags)
+{
+ struct tsync_proto *protocol;
+
+ if (!tsync)
+ return -1;
+ protocol = tsync_proto_find(tsync->proto_name);
+ if (!protocol)
+ return -1;
+
+ if (flags)
+ *flags = protocol->flags;
+
+ return 0;
+}
+
#define PROTO_MASK_SIZE (sizeof(char))
#define PROTO_MASK_BITS (PROTO_MASK_SIZE * 8)
diff --git a/tracecmd/trace-dump.c b/tracecmd/trace-dump.c
index 0117f979..6172231e 100644
--- a/tracecmd/trace-dump.c
+++ b/tracecmd/trace-dump.c
@@ -374,6 +374,7 @@ static void dump_option_timeshift(int fd, int size)
long long *times = NULL;
long long trace_id;
unsigned int count;
+ unsigned int flags;
int i;
/*
@@ -390,6 +391,8 @@ static void dump_option_timeshift(int fd, int size)
do_print(OPTIONS, "\t\t[Option TimeShift, %d bytes]\n", size);
read_file_number(fd, &trace_id, 8);
do_print(OPTIONS, "0x%llX [peer's trace id]\n", trace_id);
+ read_file_number(fd, &flags, 4);
+ do_print(OPTIONS, "0x%llX [peer's protocol flags]\n", flags);
read_file_number(fd, &count, 4);
do_print(OPTIONS, "%lld [samples count]\n", count);
times = calloc(count, sizeof(long long));
diff --git a/tracecmd/trace-tsync.c b/tracecmd/trace-tsync.c
index 6d0a9e85..943a274a 100644
--- a/tracecmd/trace-tsync.c
+++ b/tracecmd/trace-tsync.c
@@ -132,7 +132,8 @@ out:
static void write_guest_time_shift(struct buffer_instance *instance)
{
struct tracecmd_output *handle;
- struct iovec vector[5];
+ struct iovec vector[6];
+ unsigned int flags;
long long *scalings = NULL;
long long *offsets = NULL;
long long *ts = NULL;
@@ -145,6 +146,9 @@ static void write_guest_time_shift(struct buffer_instance *instance)
&ts, &offsets, &scalings);
if (ret < 0 || !count || !ts || !offsets || !scalings)
return;
+ ret = tracecmd_tsync_get_proto_flags(&instance->tsync, &flags);
+ if (ret < 0)
+ return;
file = instance->output_file;
fd = open(file, O_RDWR);
@@ -154,14 +158,16 @@ static void write_guest_time_shift(struct buffer_instance *instance)
vector[0].iov_len = 8;
vector[0].iov_base = &top_instance.trace_id;
vector[1].iov_len = 4;
- vector[1].iov_base = &count;
- vector[2].iov_len = 8 * count;
- vector[2].iov_base = ts;
+ vector[1].iov_base = &flags;
+ vector[2].iov_len = 4;
+ vector[2].iov_base = &count;
vector[3].iov_len = 8 * count;
- vector[3].iov_base = offsets;
+ vector[3].iov_base = ts;
vector[4].iov_len = 8 * count;
- vector[4].iov_base = scalings;
- tracecmd_add_option_v(handle, TRACECMD_OPTION_TIME_SHIFT, vector, 5);
+ vector[4].iov_base = offsets;
+ vector[5].iov_len = 8 * count;
+ vector[5].iov_base = scalings;
+ tracecmd_add_option_v(handle, TRACECMD_OPTION_TIME_SHIFT, vector, 6);
tracecmd_append_options(handle);
tracecmd_output_close(handle);
#ifdef TSYNC_DEBUG
--
2.26.2
next prev parent reply other threads:[~2020-10-29 11:18 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 11:18 [PATCH v25 00/16] Timestamp synchronization of host - guest tracing session Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 01/16] trace-cmd: Replace time sync protocol ID with string Tzvetomir Stoyanov (VMware)
2020-11-05 14:52 ` Steven Rostedt
2020-12-02 22:43 ` Steven Rostedt
2020-10-29 11:18 ` [PATCH v25 02/16] trace-cmd: Add trace-cmd library APIs for ftrace clock name Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 03/16] trace-cmd: Move VM related logic in a separate file Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 04/16] trace-cmd: Add new libtrasefs API to get the current trace clock Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 05/16] trace-cmd: Add clock parameter to timestamp synchronization plugins Tzvetomir Stoyanov (VMware)
2020-12-02 22:48 ` Steven Rostedt
2020-12-03 13:09 ` Tzvetomir Stoyanov
2020-10-29 11:18 ` [PATCH v25 06/16] trace-cmd: Add role " Tzvetomir Stoyanov (VMware)
2020-12-02 23:04 ` Steven Rostedt
2020-10-29 11:18 ` [PATCH v25 07/16] trace-cmd: Add host / guest role in timestamp synchronization context Tzvetomir Stoyanov (VMware)
2020-12-02 23:07 ` Steven Rostedt
2020-10-29 11:18 ` [PATCH v25 08/16] trace-cmd: Add guest CPU count PID in tracecmd_time_sync struct Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 09/16] trace-cmd: Add scaling ratio for timestamp correction Tzvetomir Stoyanov (VMware)
2020-12-03 1:47 ` Steven Rostedt
2020-12-03 12:56 ` Tzvetomir Stoyanov
2020-10-29 11:18 ` Tzvetomir Stoyanov (VMware) [this message]
2020-12-03 2:09 ` [PATCH v25 10/16] trace-cmd: Add time sync protocol flags Steven Rostedt
2020-12-03 12:59 ` Tzvetomir Stoyanov
2020-10-29 11:18 ` [PATCH v25 11/16] trace-cmd: Add timestamp synchronization per vCPU Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 12/16] trace-cmd: Define a macro for packed structures Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 13/16] trace-cmd: Add dummy function to initialize timestamp sync logic Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 14/16] trace-cmd: [POC] PTP-like algorithm for host - guest timestamp synchronization Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 15/16] trace-cmd: Debug scripts for " Tzvetomir Stoyanov (VMware)
2020-10-29 11:18 ` [PATCH v25 16/16] trace-cmd [POC]: Add KVM timestamp synchronization plugin 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=20201029111816.247241-11-tz.stoyanov@gmail.com \
--to=tz.stoyanov@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is 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.