Defined HOST and GUEST roles in timestamp synchronization context.
Some timestamp synchronization plugins may not support running in both
host and guest roles. This could happen in nested virtualization use
case, where the same plugin can be used as a host and as a guest.
Added logic to timestamp synchronization plugins to declare what roles
they support. Added logic to select plugin depending on supported roles
and currently requested role.
clocks. Added logic to timestamp synchronization plugins to declare what
ftace clocks they support. Added logic to select plugin depending on the
ftrace clock used in the current trace session and supported clocks.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@xxxxxxxxx>
---
include/trace-cmd/trace-cmd.h | 10 ++++++++--
lib/trace-cmd/include/trace-tsync-local.h | 2 +-
lib/trace-cmd/trace-timesync.c | 17 ++++++++++++++---
tracecmd/trace-record.c | 3 ++-
tracecmd/trace-tsync.c | 3 ++-
5 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h
index 21028940..1ca2da10 100644
--- a/include/trace-cmd/trace-cmd.h
+++ b/include/trace-cmd/trace-cmd.h
@@ -437,6 +437,11 @@ enum{
TRACECMD_TIME_SYNC_CMD_STOP = 2,
};
+enum tracecmd_time_sync_role {
+ TRACECMD_TIME_SYNC_ROLE_HOST = 0x01,
+ TRACECMD_TIME_SYNC_ROLE_GUEST = 0x02
+};
+
struct tracecmd_time_sync {
char *proto_name;
int loop_interval;
@@ -448,8 +453,9 @@ struct tracecmd_time_sync {
};
void tracecmd_tsync_init(void);
-int tracecmd_tsync_proto_getall(char ***protos, const char *clock);
-char *tracecmd_tsync_proto_select(char **protos, char *clock);
+int tracecmd_tsync_proto_getall(char ***protos, const char *clock, int role);
+char *tracecmd_tsync_proto_select(char **protos, char *clock,
+ enum tracecmd_time_sync_role role);
bool tsync_proto_is_supported(char *proto_name);
void tracecmd_tsync_with_host(struct tracecmd_time_sync *tsync);
void tracecmd_tsync_with_guest(struct tracecmd_time_sync *tsync);
diff --git a/lib/trace-cmd/include/trace-tsync-local.h b/lib/trace-cmd/include/trace-tsync-local.h
index 25d5b4e8..33add609 100644
--- a/lib/trace-cmd/include/trace-tsync-local.h
+++ b/lib/trace-cmd/include/trace-tsync-local.h
@@ -26,7 +26,7 @@ struct clock_sync_context {
unsigned int remote_port;
};
-int tracecmd_tsync_proto_register(char *proto_name, int accuracy,
+int tracecmd_tsync_proto_register(char *proto_name, int accuracy, int roles,
int supported_clocks,
int (*init)(struct tracecmd_time_sync *),
int (*free)(struct tracecmd_time_sync *),
diff --git a/lib/trace-cmd/trace-timesync.c b/lib/trace-cmd/trace-timesync.c
index 8ca47bf6..d461392b 100644
--- a/lib/trace-cmd/trace-timesync.c
+++ b/lib/trace-cmd/trace-timesync.c
@@ -25,6 +25,7 @@
struct tsync_proto {
struct tsync_proto *next;
char proto_name[TRACECMD_TSYNC_PNAME_LENGTH];
+ enum tracecmd_time_sync_role roles;
int accuracy;
int supported_clocks;
@@ -50,7 +51,7 @@ static struct tsync_proto *tsync_proto_find(char *proto_name)
return NULL;
}
-int tracecmd_tsync_proto_register(char *proto_name, int accuracy,
+int tracecmd_tsync_proto_register(char *proto_name, int accuracy, int roles,
int supported_clocks,
int (*init)(struct tracecmd_time_sync *),
int (*free)(struct tracecmd_time_sync *),
@@ -66,6 +67,7 @@ int tracecmd_tsync_proto_register(char *proto_name, int accuracy,
return -1;
strncpy(proto->proto_name, proto_name, TRACECMD_TSYNC_PNAME_LENGTH);
proto->accuracy = accuracy;
+ proto->roles = roles;
proto->supported_clocks = supported_clocks;
proto->clock_sync_init = init;
proto->clock_sync_free = free;
@@ -141,12 +143,14 @@ int tracecmd_tsync_get_offsets(struct tracecmd_time_sync *tsync,
*
* @protos: array of pointers to protocol names
* @clock : trace clock
+ * @role : local time sync role
*
* Retuns pointer to a protocol name, that can be used with the peer, or NULL
* in case there is no match with supported protocols.
* The returned string MUST NOT be freed by the caller
*/
-char *tracecmd_tsync_proto_select(char **protos, char *clock)
+char *tracecmd_tsync_proto_select(char **protos, char *clock,
+ enum tracecmd_time_sync_role role)
{
struct tsync_proto *selected = NULL;
struct tsync_proto *proto;
@@ -157,6 +161,8 @@ char *tracecmd_tsync_proto_select(char **protos, char *clock)
pname = protos;
while (*pname) {
for (proto = tsync_proto_list; proto; proto = proto->next) {
+ if (!(proto->roles & role))
+ continue;
if (proto->supported_clocks && clock_id &&
!(proto->supported_clocks & clock_id))
continue;
@@ -183,12 +189,13 @@ char *tracecmd_tsync_proto_select(char **protos, char *clock)
* @protos: return, allocated array of time sync protocol names,
* supported by the peer. Must be freed by free()
* @clock: selected trace clock
+ * @role: supported protocol role
*
* If completed successfully 0 is returned and allocated array in @protos of
* strings. The last array entry is NULL. In case of an error, -1 is returned.
* @protos must be freed with free()
*/
-int tracecmd_tsync_proto_getall(char ***protos, const char *clock)
+int tracecmd_tsync_proto_getall(char ***protos, const char *clock, int role)
{
struct tsync_proto *proto;
int clock_id = 0;
@@ -198,6 +205,8 @@ int tracecmd_tsync_proto_getall(char ***protos, const char *clock)
if (clock)
clock_id = tracecmd_clock_str2id(clock);
for (proto = tsync_proto_list; proto; proto = proto->next) {
+ if (!(proto->roles & role))
+ continue;
if (proto->supported_clocks && clock_id &&
!(proto->supported_clocks & clock_id))
continue;
@@ -209,6 +218,8 @@ int tracecmd_tsync_proto_getall(char ***protos, const char *clock)
return -1;
for (i = 0, proto = tsync_proto_list; proto && i < (count - 1); proto = proto->next) {
+ if (!(proto->roles & role))
+ continue;
if (proto->supported_clocks && clock_id &&
!(proto->supported_clocks & clock_id))
continue;
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index 41e0dd3a..b4e68234 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -3679,7 +3679,8 @@ static void connect_to_agent(struct buffer_instance *instance)
instance->clock = tracefs_get_clock(NULL);
if (instance->tsync.loop_interval >= 0)
- tracecmd_tsync_proto_getall(&protos, instance->clock);
+ tracecmd_tsync_proto_getall(&protos, instance->clock,
+ TRACECMD_TIME_SYNC_ROLE_HOST);
ret = tracecmd_msg_send_trace_req(msg_handle, instance->argc,
instance->argv, use_fifos,
diff --git a/tracecmd/trace-tsync.c b/tracecmd/trace-tsync.c
index 2c8afe30..aede3754 100644
--- a/tracecmd/trace-tsync.c
+++ b/tracecmd/trace-tsync.c
@@ -219,7 +219,8 @@ char *tracecmd_guest_tsync(char **tsync_protos, char *clock,
int fd;
fd = -1;
- proto = tracecmd_tsync_proto_select(tsync_protos, clock);
+ proto = tracecmd_tsync_proto_select(tsync_protos, clock,
+ TRACECMD_TIME_SYNC_ROLE_GUEST);
if (!proto)
return NULL;
#ifdef VSOCK
--
2.26.2
|