@@ -442,6 +442,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
+};
+
#define TRACECMD_TIME_SYNC_PROTO_PTP_WEIGHT 10
struct tracecmd_time_sync {
@@ -455,8 +460,9 @@ struct tracecmd_time_sync {
};
void tracecmd_tsync_init(void);
-int tracecmd_tsync_proto_getall(char **proto_mask, int *words, const char *clock);
-unsigned int tracecmd_tsync_proto_select(char *proto_mask, int words, char *clock);
+int tracecmd_tsync_proto_getall(char **proto_mask, int *words, const char *clock, int role);
+unsigned int tracecmd_tsync_proto_select(char *proto_mask, int words, char *clock,
+ enum tracecmd_time_sync_role role);
bool tsync_proto_is_supported(unsigned int proto_id);
void tracecmd_tsync_with_host(struct tracecmd_time_sync *tsync);
void tracecmd_tsync_with_guest(struct tracecmd_time_sync *tsync);
@@ -26,12 +26,12 @@ struct clock_sync_context {
unsigned int remote_port;
};
-int tracecmd_tsync_proto_register(unsigned int proto_id, int weight,
+int tracecmd_tsync_proto_register(unsigned int proto_id, int weight, int roles,
int supported_clocks,
- int (*init)(struct tracecmd_time_sync *),
- int (*free)(struct tracecmd_time_sync *),
- int (*calc)(struct tracecmd_time_sync *,
- long long *, long long *));
+ int (*init)(struct tracecmd_time_sync *),
+ int (*free)(struct tracecmd_time_sync *),
+ int (*calc)(struct tracecmd_time_sync *,
+ long long *, long long *));
int tracecmd_tsync_proto_unregister(unsigned int proto_id);
int ptp_clock_sync_register(void);
@@ -678,6 +678,8 @@ int ptp_clock_sync_register(void)
{
return tracecmd_tsync_proto_register(TRACECMD_TIME_SYNC_PROTO_PTP,
TRACECMD_TIME_SYNC_PROTO_PTP_WEIGHT,
+ TRACECMD_TIME_SYNC_ROLE_GUEST |
+ TRACECMD_TIME_SYNC_ROLE_HOST,
0,
ptp_clock_sync_init,
ptp_clock_sync_free,
@@ -25,6 +25,7 @@
struct tsync_proto {
struct tsync_proto *next;
unsigned int proto_id;
+ enum tracecmd_time_sync_role roles;
int weight;
int supported_clocks;
@@ -55,7 +56,7 @@ void tracecmd_tsync_init(void)
ptp_clock_sync_register();
}
-int tracecmd_tsync_proto_register(unsigned int proto_id, int weight,
+int tracecmd_tsync_proto_register(unsigned int proto_id, int weight, int roles,
int supported_clocks,
int (*init)(struct tracecmd_time_sync *),
int (*free)(struct tracecmd_time_sync *),
@@ -71,6 +72,7 @@ int tracecmd_tsync_proto_register(unsigned int proto_id, int weight,
return -1;
proto->proto_id = proto_id;
proto->weight = weight;
+ proto->roles = roles;
proto->supported_clocks = supported_clocks;
proto->clock_sync_init = init;
proto->clock_sync_free = free;
@@ -142,12 +144,13 @@ int tracecmd_tsync_get_offsets(struct tracecmd_time_sync *tsync,
*
* @proto_mask: bitmask array of time sync protocols, supported by the peer
* @length: size of the @protos array
- * @clock: selected trace clock
+ * @role : local time sync role
*
* Retuns Id of a time sync protocol, that can be used with the peer, or 0
* in case there is no match with supported protocols
*/
-unsigned int tracecmd_tsync_proto_select(char *proto_mask, int length, char *clock)
+unsigned int tracecmd_tsync_proto_select(char *proto_mask, int length, char *clock,
+ enum tracecmd_time_sync_role role)
{
struct tsync_proto *selected = NULL;
struct tsync_proto *proto;
@@ -159,6 +162,8 @@ unsigned int tracecmd_tsync_proto_select(char *proto_mask, int length, char *clo
clock_id = tracecmd_clock_str2id(clock);
for (word = 0; word < length; word++) {
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;
@@ -192,12 +197,13 @@ unsigned int tracecmd_tsync_proto_select(char *proto_mask, int length, char *clo
* supported by the peer. Must be freed by free()
* @words: return, allocated size of the @protobits array
* @clock: selected trace clock
+ * @role: supported protocol role
*
* If completed successfully 0 is returned and allocated array in @proto_mask of
* size @words. In case of an error, -1 is returned.
* @proto_mask must be freed with free()
*/
-int tracecmd_tsync_proto_getall(char **proto_mask, int *words, const char *clock)
+int tracecmd_tsync_proto_getall(char **proto_mask, int *words, const char *clock, int role)
{
struct tsync_proto *proto;
int proto_max = 0;
@@ -219,6 +225,8 @@ int tracecmd_tsync_proto_getall(char **proto_mask, int *words, const char *clock
for (proto = tsync_proto_list; proto; proto = proto->next) {
if ((proto->proto_id / PROTO_MASK_SIZE) >= count)
continue;
+ if (!(proto->roles & role))
+ continue;
if (proto->supported_clocks && clock_id &&
!(proto->supported_clocks & clock_id))
continue;
@@ -3677,7 +3677,8 @@ static void connect_to_agent(struct buffer_instance *instance)
die("Failed to allocate message handle");
if (instance->tsync.loop_interval >= 0)
- tracecmd_tsync_proto_getall(&protos, &protos_count, instance->clock);
+ tracecmd_tsync_proto_getall(&protos, &protos_count, instance->clock,
+ TRACECMD_TIME_SYNC_ROLE_HOST);
ret = tracecmd_msg_send_trace_req(msg_handle, instance->argc,
instance->argv, use_fifos,
@@ -220,7 +220,8 @@ unsigned int tracecmd_guest_tsync(char *tsync_protos,
int fd;
fd = -1;
- proto = tracecmd_tsync_proto_select(tsync_protos, tsync_protos_size, clock);
+ proto = tracecmd_tsync_proto_select(tsync_protos, tsync_protos_size,
+ clock, TRACECMD_TIME_SYNC_ROLE_GUEST);
if (!proto)
return 0;
#ifdef VSOCK
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@gmail.com> --- include/trace-cmd/trace-cmd.h | 10 ++++++++-- lib/trace-cmd/include/trace-tsync-local.h | 10 +++++----- lib/trace-cmd/trace-timesync-ptp.c | 2 ++ lib/trace-cmd/trace-timesync.c | 16 ++++++++++++---- tracecmd/trace-record.c | 3 ++- tracecmd/trace-tsync.c | 3 ++- 6 files changed, 31 insertions(+), 13 deletions(-)