From patchwork Wed Mar 4 09:12:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 11419625 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B874592A for ; Wed, 4 Mar 2020 09:12:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 914482073B for ; Wed, 4 Mar 2020 09:12:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rf/LbQBp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728894AbgCDJMf (ORCPT ); Wed, 4 Mar 2020 04:12:35 -0500 Received: from mail-lf1-f65.google.com ([209.85.167.65]:36072 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728767AbgCDJMf (ORCPT ); Wed, 4 Mar 2020 04:12:35 -0500 Received: by mail-lf1-f65.google.com with SMTP id s1so877292lfd.3 for ; Wed, 04 Mar 2020 01:12:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Up0etOMmxs6IA4hKZVQN1fpVhCNZS0bozrM4ZYCqN3w=; b=rf/LbQBp1uYxD8TcZRsaiFCoMDL8s+vi554elNyNAq+OdRgPwgEFdzarYz772dehfz ajFl09Esq+gtAlcBFDhp21rdcQTXYA2tRYWZ4kMVyBvec2QkuEUlAU+EEFVZqvRfCI5c 3eQmqpw/ewoSf0qaVhSceGoOaMPZYGQgVwNyqMRVU+GHxRuVUxVU/W9n5pJXDVKctWfj sZks+mlSpOmbkEwY68zgo3WljINmjTu0ijrD6sHK8/9wTy2sz3Oz2Uvma0dqc2zpk2Gp a4mP58Ibt5ZEQYL3BqT+1yzXw6KdPU5S5WKH/5+IrFdL+7gCm5kBkyBpSaM7tJsBmF8F 2j4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Up0etOMmxs6IA4hKZVQN1fpVhCNZS0bozrM4ZYCqN3w=; b=kEOkBkoC7x9HHLBcD5kmaWWweh+PV5RMTy+0PWMfc3mCC8FLWXHf/hL1bJIpTiEuIS Jhks5qXk+ETaYyPk5zkoXNeX+ysrw2wTL8nPG/AEATU1qI3NIzJFhj7m+j1AsaBySfWH xgiQfGyCuEWQbnedDw4Ka8olxU4I/OEiDXkmKm+13QYp+ndlZwDLuS0ZBFgtBs31M3nf q3cmjHk2H2ODvtpDXBDBKGECjeu60DWImI5zd9LvCo4+DgtOpt4QoT6BaL3JW98hcvnh h0jeA738AdN/ewHC3rsPvEWD8AS9ZZt85XTcleTjz76S7TPdsa1TPBgI77iJCUbblSku z1xQ== X-Gm-Message-State: ANhLgQ0RxeCR/bgzhEJyCg9tUtux//NzDH1OpQb9yOTF2QQVHj/ELJt8 h0SCata7NreoqZpP6I+3VP0= X-Google-Smtp-Source: ADFU+vuDM1aZWoMG/EIU6L7s4Sy11J+0wS4Mz7MNGRmDl5OzIZ4m6WnZakPjn6bnx2VGo70K1e7slQ== X-Received: by 2002:a19:7d04:: with SMTP id y4mr1429640lfc.111.1583313150343; Wed, 04 Mar 2020 01:12:30 -0800 (PST) Received: from oberon.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id v15sm13327462lfg.51.2020.03.04.01.12.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 01:12:29 -0800 (PST) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v22 06/13] trace-cmd: Exchange tracing IDs between host and guest Date: Wed, 4 Mar 2020 11:12:13 +0200 Message-Id: <20200304091220.30936-7-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200304091220.30936-1-tz.stoyanov@gmail.com> References: <20200304091220.30936-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org Extend the trace request and trace reply messages, to include also the IDs of host and guest tracing sessions. Those IDs are used to unambiguously match the tracing sessions, when reading trace.dat files. Signed-off-by: Tzvetomir Stoyanov (VMware) --- include/trace-cmd/trace-cmd.h | 12 ++++++++---- lib/trace-cmd/trace-msg.c | 31 ++++++++++++++++++++++--------- tracecmd/include/trace-local.h | 3 ++- tracecmd/trace-agent.c | 10 +++++++--- tracecmd/trace-record.c | 10 +++++++--- 5 files changed, 46 insertions(+), 20 deletions(-) diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h index 6075a37e..55abd489 100644 --- a/include/trace-cmd/trace-cmd.h +++ b/include/trace-cmd/trace-cmd.h @@ -370,16 +370,20 @@ bool tracecmd_msg_done(struct tracecmd_msg_handle *msg_handle); void tracecmd_msg_set_done(struct tracecmd_msg_handle *msg_handle); int tracecmd_msg_send_trace_req(struct tracecmd_msg_handle *msg_handle, - int argc, char **argv, bool use_fifos); + int argc, char **argv, bool use_fifos, + unsigned long long trace_id); int tracecmd_msg_recv_trace_req(struct tracecmd_msg_handle *msg_handle, - int *argc, char ***argv, bool *use_fifos); + int *argc, char ***argv, bool *use_fifos, + unsigned long long *trace_id); int tracecmd_msg_send_trace_resp(struct tracecmd_msg_handle *msg_handle, int nr_cpus, int page_size, - unsigned int *ports, bool use_fifos); + unsigned int *ports, bool use_fifos, + unsigned long long trace_id); int tracecmd_msg_recv_trace_resp(struct tracecmd_msg_handle *msg_handle, int *nr_cpus, int *page_size, - unsigned int **ports, bool *use_fifos); + unsigned int **ports, bool *use_fifos, + unsigned long long *trace_id); /* --- Plugin handling --- */ extern struct tep_plugin_option trace_ftrace_options[]; diff --git a/lib/trace-cmd/trace-msg.c b/lib/trace-cmd/trace-msg.c index 85a2bae6..d6a68ac3 100644 --- a/lib/trace-cmd/trace-msg.c +++ b/lib/trace-cmd/trace-msg.c @@ -23,6 +23,7 @@ #include #include "trace-write-local.h" +#include "trace-cmd-local.h" #include "trace-local.h" #include "trace-msg.h" @@ -63,12 +64,14 @@ struct tracecmd_msg_rinit { struct tracecmd_msg_trace_req { be32 flags; be32 argc; + u64 trace_id; } __attribute__((packed)); struct tracecmd_msg_trace_resp { be32 flags; be32 cpus; be32 page_size; + u64 trace_id; } __attribute__((packed)); struct tracecmd_msg_header { @@ -811,7 +814,8 @@ int tracecmd_msg_wait_close_resp(struct tracecmd_msg_handle *msg_handle) return tracecmd_msg_wait_for_cmd(msg_handle, MSG_CLOSE_RESP); } -static int make_trace_req(struct tracecmd_msg *msg, int argc, char **argv, bool use_fifos) +static int make_trace_req(struct tracecmd_msg *msg, int argc, char **argv, + bool use_fifos, unsigned long long trace_id) { size_t args_size = 0; char *p; @@ -823,6 +827,7 @@ static int make_trace_req(struct tracecmd_msg *msg, int argc, char **argv, bool msg->hdr.size = htonl(ntohl(msg->hdr.size) + args_size); msg->trace_req.flags = use_fifos ? htonl(MSG_TRACE_USE_FIFOS) : htonl(0); msg->trace_req.argc = htonl(argc); + msg->trace_req.trace_id = htonll(trace_id); msg->buf = calloc(args_size, 1); if (!msg->buf) return -ENOMEM; @@ -835,13 +840,14 @@ static int make_trace_req(struct tracecmd_msg *msg, int argc, char **argv, bool } int tracecmd_msg_send_trace_req(struct tracecmd_msg_handle *msg_handle, - int argc, char **argv, bool use_fifos) + int argc, char **argv, bool use_fifos, + unsigned long long trace_id) { struct tracecmd_msg msg; int ret; tracecmd_msg_init(MSG_TRACE_REQ, &msg); - ret = make_trace_req(&msg, argc, argv, use_fifos); + ret = make_trace_req(&msg, argc, argv, use_fifos, trace_id); if (ret < 0) return ret; @@ -854,7 +860,8 @@ int tracecmd_msg_send_trace_req(struct tracecmd_msg_handle *msg_handle, * free(argv); */ int tracecmd_msg_recv_trace_req(struct tracecmd_msg_handle *msg_handle, - int *argc, char ***argv, bool *use_fifos) + int *argc, char ***argv, bool *use_fifos, + unsigned long long *trace_id) { struct tracecmd_msg msg; char *p, *buf_end, **args; @@ -901,7 +908,7 @@ int tracecmd_msg_recv_trace_req(struct tracecmd_msg_handle *msg_handle, *argc = nr_args; *argv = args; *use_fifos = ntohl(msg.trace_req.flags) & MSG_TRACE_USE_FIFOS; - + *trace_id = ntohll(msg.trace_req.trace_id); /* * On success we're passing msg.buf to the caller through argv[0] so we * reset it here before calling msg_free(). @@ -921,7 +928,8 @@ out: } static int make_trace_resp(struct tracecmd_msg *msg, int page_size, int nr_cpus, - unsigned int *ports, bool use_fifos) + unsigned int *ports, bool use_fifos, + unsigned long long trace_id) { int data_size; @@ -935,19 +943,22 @@ static int make_trace_resp(struct tracecmd_msg *msg, int page_size, int nr_cpus, msg->trace_resp.flags = use_fifos ? htonl(MSG_TRACE_USE_FIFOS) : htonl(0); msg->trace_resp.cpus = htonl(nr_cpus); msg->trace_resp.page_size = htonl(page_size); + msg->trace_resp.trace_id = htonll(trace_id); return 0; } int tracecmd_msg_send_trace_resp(struct tracecmd_msg_handle *msg_handle, int nr_cpus, int page_size, - unsigned int *ports, bool use_fifos) + unsigned int *ports, bool use_fifos, + unsigned long long trace_id) { struct tracecmd_msg msg; int ret; tracecmd_msg_init(MSG_TRACE_RESP, &msg); - ret = make_trace_resp(&msg, page_size, nr_cpus, ports, use_fifos); + ret = make_trace_resp(&msg, page_size, nr_cpus, ports, + use_fifos, trace_id); if (ret < 0) return ret; @@ -956,7 +967,8 @@ int tracecmd_msg_send_trace_resp(struct tracecmd_msg_handle *msg_handle, int tracecmd_msg_recv_trace_resp(struct tracecmd_msg_handle *msg_handle, int *nr_cpus, int *page_size, - unsigned int **ports, bool *use_fifos) + unsigned int **ports, bool *use_fifos, + unsigned long long *trace_id) { struct tracecmd_msg msg; char *p, *buf_end; @@ -981,6 +993,7 @@ int tracecmd_msg_recv_trace_resp(struct tracecmd_msg_handle *msg_handle, *use_fifos = ntohl(msg.trace_resp.flags) & MSG_TRACE_USE_FIFOS; *nr_cpus = ntohl(msg.trace_resp.cpus); *page_size = ntohl(msg.trace_resp.page_size); + *trace_id = ntohll(msg.trace_resp.trace_id); *ports = calloc(*nr_cpus, sizeof(**ports)); if (!*ports) { ret = -ENOMEM; diff --git a/tracecmd/include/trace-local.h b/tracecmd/include/trace-local.h index 6fe22bb0..4f2b5541 100644 --- a/tracecmd/include/trace-local.h +++ b/tracecmd/include/trace-local.h @@ -101,7 +101,8 @@ void trace_dump(int argc, char **argv); int trace_record_agent(struct tracecmd_msg_handle *msg_handle, int cpus, int *fds, - int argc, char **argv, bool use_fifos); + int argc, char **argv, bool use_fifos, + unsigned long long trace_id); struct hook_list; diff --git a/tracecmd/trace-agent.c b/tracecmd/trace-agent.c index 1c6e0a3a..52d27195 100644 --- a/tracecmd/trace-agent.c +++ b/tracecmd/trace-agent.c @@ -128,6 +128,7 @@ cleanup: static void agent_handle(int sd, int nr_cpus, int page_size) { struct tracecmd_msg_handle *msg_handle; + unsigned long long trace_id; unsigned int *ports; char **argv = NULL; int argc = 0; @@ -144,7 +145,8 @@ static void agent_handle(int sd, int nr_cpus, int page_size) if (!msg_handle) die("Failed to allocate message handle"); - ret = tracecmd_msg_recv_trace_req(msg_handle, &argc, &argv, &use_fifos); + ret = tracecmd_msg_recv_trace_req(msg_handle, &argc, &argv, + &use_fifos, &trace_id); if (ret < 0) die("Failed to receive trace request"); @@ -154,12 +156,14 @@ static void agent_handle(int sd, int nr_cpus, int page_size) if (!use_fifos) make_vsocks(nr_cpus, fds, ports); + trace_id = tracecmd_generate_traceid(); ret = tracecmd_msg_send_trace_resp(msg_handle, nr_cpus, page_size, - ports, use_fifos); + ports, use_fifos, trace_id); if (ret < 0) die("Failed to send trace response"); - trace_record_agent(msg_handle, nr_cpus, fds, argc, argv, use_fifos); + trace_record_agent(msg_handle, nr_cpus, fds, argc, argv, + use_fifos, trace_id); free(argv[0]); free(argv); diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c index 4f8c4d46..ef9d7e3e 100644 --- a/tracecmd/trace-record.c +++ b/tracecmd/trace-record.c @@ -3694,12 +3694,14 @@ static void connect_to_agent(struct buffer_instance *instance) die("Failed to allocate message handle"); ret = tracecmd_msg_send_trace_req(msg_handle, instance->argc, - instance->argv, use_fifos); + instance->argv, use_fifos, + top_instance.trace_id); if (ret < 0) die("Failed to send trace request"); ret = tracecmd_msg_recv_trace_resp(msg_handle, &nr_cpus, &page_size, - &ports, &use_fifos); + &ports, &use_fifos, + &instance->trace_id); if (ret < 0) die("Failed to receive trace response"); @@ -6281,7 +6283,8 @@ void trace_record(int argc, char **argv) int trace_record_agent(struct tracecmd_msg_handle *msg_handle, int cpus, int *fds, int argc, char **argv, - bool use_fifos) + bool use_fifos, + unsigned long long trace_id) { struct common_record_context ctx; char **argv_plus; @@ -6311,6 +6314,7 @@ int trace_record_agent(struct tracecmd_msg_handle *msg_handle, ctx.instance->flags |= BUFFER_FL_AGENT; ctx.instance->msg_handle = msg_handle; msg_handle->version = V3_PROTOCOL; + top_instance.trace_id = trace_id; record_trace(argc, argv, &ctx); free(argv_plus);