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.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@xxxxxxxxx>
---
.../include/private/trace-cmd-private.h | 10 ++++++++--
lib/trace-cmd/include/trace-tsync-local.h | 2 +-
lib/trace-cmd/trace-timesync.c | 18 +++++++++++++++---
tracecmd/trace-record.c | 3 ++-
tracecmd/trace-tsync.c | 3 ++-
5 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/lib/trace-cmd/include/private/trace-cmd-private.h b/lib/trace-cmd/include/private/trace-cmd-private.h
index ff700e44..685abf13 100644
--- a/lib/trace-cmd/include/private/trace-cmd-private.h
+++ b/lib/trace-cmd/include/private/trace-cmd-private.h
@@ -419,6 +419,11 @@ enum{
TRACECMD_TIME_SYNC_CMD_STOP = 2,
};
+enum tracecmd_time_sync_role {
+ TRACECMD_TIME_SYNC_ROLE_HOST = (1 << 0),
+ TRACECMD_TIME_SYNC_ROLE_GUEST = (1 << 1),
+};
+
struct tracecmd_time_sync {
const char *proto_name;
int loop_interval;
@@ -430,8 +435,9 @@ struct tracecmd_time_sync {
};
void tracecmd_tsync_init(void);
-int tracecmd_tsync_proto_getall(struct tracecmd_tsync_protos **protos, const char *clock);
-const char *tracecmd_tsync_proto_select(struct tracecmd_tsync_protos *protos, char *clock);
+int tracecmd_tsync_proto_getall(struct tracecmd_tsync_protos **protos, const char *clock, int role);
+const char *tracecmd_tsync_proto_select(struct tracecmd_tsync_protos *protos, char *clock,
+ enum tracecmd_time_sync_role role);
bool tsync_proto_is_supported(const 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 96ec89e9..a99725e2 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(const char *proto_name, int accuracy,
+int tracecmd_tsync_proto_register(const 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 0d46d294..def703f6 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(const char *proto_name)
return NULL;
}
-int tracecmd_tsync_proto_register(const char *proto_name, int accuracy,
+int tracecmd_tsync_proto_register(const 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(const 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: list of tsync 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
*/
-const char *tracecmd_tsync_proto_select(struct tracecmd_tsync_protos *protos, char *clock)
+const char *tracecmd_tsync_proto_select(struct tracecmd_tsync_protos *protos, char *clock,
+ enum tracecmd_time_sync_role role)
{
struct tsync_proto *selected = NULL;
struct tsync_proto *proto;
@@ -160,6 +164,8 @@ const char *tracecmd_tsync_proto_select(struct tracecmd_tsync_protos *protos, ch
pname = protos->names;
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;
@@ -186,12 +192,13 @@ const char *tracecmd_tsync_proto_select(struct tracecmd_tsync_protos *protos, ch
* @protos: return, allocated list 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 list of strings in @protos.
* The last list entry is NULL. In case of an error, -1 is returned.
* @protos must be freed with free()
*/
-int tracecmd_tsync_proto_getall(struct tracecmd_tsync_protos **protos, const char *clock)
+int tracecmd_tsync_proto_getall(struct tracecmd_tsync_protos **protos, const char *clock, int role)
{
struct tracecmd_tsync_protos *plist = NULL;
struct tsync_proto *proto;
@@ -202,6 +209,8 @@ int tracecmd_tsync_proto_getall(struct tracecmd_tsync_protos **protos, const cha
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;
@@ -215,11 +224,14 @@ int tracecmd_tsync_proto_getall(struct tracecmd_tsync_protos **protos, const cha
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;
plist->names[i++] = proto->proto_name;
}
+
*protos = plist;
return 0;
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index 51b8562b..3bcb2403 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 55e9857f..ef20651b 100644
--- a/tracecmd/trace-tsync.c
+++ b/tracecmd/trace-tsync.c
@@ -223,7 +223,8 @@ const char *tracecmd_guest_tsync(struct tracecmd_tsync_protos *tsync_protos,
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.29.2
|