From patchwork Thu Nov 28 08:54:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 11265623 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 AC298109A for ; Thu, 28 Nov 2019 08:54:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8C31121770 for ; Thu, 28 Nov 2019 08:54:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sljDVfX1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727573AbfK1Iya (ORCPT ); Thu, 28 Nov 2019 03:54:30 -0500 Received: from mail-lj1-f194.google.com ([209.85.208.194]:36398 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727192AbfK1Iy3 (ORCPT ); Thu, 28 Nov 2019 03:54:29 -0500 Received: by mail-lj1-f194.google.com with SMTP id k15so27611185lja.3 for ; Thu, 28 Nov 2019 00:54:25 -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=7rulsqHWqiPANINuxP9O9HND35R2Nw4MwCZU59/68X0=; b=sljDVfX1nUkV85AeZSzsYu+RwBJEKuA51jR6v0Y9ByUwmSfcf6QyDLu50kFgJtZpKH dfXq7xdpbK+P/nGmtEe6PZ0bTbruthB/A3qTV25Gqt8kOKDDS+zQgkx19g5/atWk1m8N dhV4DAZbedPiL1RHQStGYf7rXZkc2dMAvL/XD0ZOgIv6AiTD2lVn/+NwHF17+Z+aj7aa fF3tdKk8NAzAuu91j6d31gieqFtbE6mbvK8YgaW28V2gNDOg2nhgEuWxdnCBhghlB2b3 ZA8T4vkrv6V3XoN7zSBJE3miPEaVROMLSQxP4zs1nNegd/ty2P1G5bcu5JzGYbU4dpQ2 j9mA== 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=7rulsqHWqiPANINuxP9O9HND35R2Nw4MwCZU59/68X0=; b=cxvIokFJeqC59c6EBFZKU/0yyoUTZAE4gq7E6fOdonJtgUtcCrK4MNr7fsU3iB4mtX FwADG4WFliP1o0/b8OXHtIKrbVPFy9tn0Df/syAXrwVone/0XPdFNuli9eFHzkPZZn/P y/SPeDN3s/iAExwEiAFPCxntEb0lzH7PKOc8A6L6816w/qx9HrFP5q35MqjnHoViu0MS T6g/EUBhaO5VXQ1C6TmdM4u4w7zKFktBceLmdlpc4SGGLWXTybd9N5yj1dGrw6QFakLs LjCr20bOZMqecYp7CANSxZxdETfGzw3KNhFchUTUF5TmE/mN03F3W/JFgZuGaXjwLCBl FPCQ== X-Gm-Message-State: APjAAAUhONe4yOxar0poNlc5FzPiqMbr4lgId3XoPFf7Aoa1lvX/k7VG Vc8idpgZ26GIW2KszomHN/5xsEe6mm4= X-Google-Smtp-Source: APXvYqwhz7ZwbFjx9RVpNZ306NTT0y5uwx5AxFrFT7h79x/2r8OoIyTUnoefSQgRlRTOp1xLEHUbQQ== X-Received: by 2002:a2e:c42:: with SMTP id o2mr20006077ljd.222.1574931265178; Thu, 28 Nov 2019 00:54:25 -0800 (PST) Received: from oberon.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id z19sm8253735ljk.66.2019.11.28.00.54.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2019 00:54:24 -0800 (PST) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v15 11/18] trace-cmd: Exchange tracing IDs between host and guest Date: Thu, 28 Nov 2019 10:54:02 +0200 Message-Id: <20191128085409.289684-12-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191128085409.289684-1-tz.stoyanov@gmail.com> References: <20191128085409.289684-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 | 5 +++-- tracecmd/trace-agent.c | 12 +++++++----- tracecmd/trace-record.c | 12 +++++++++--- 5 files changed, 50 insertions(+), 22 deletions(-) diff --git a/include/trace-cmd/trace-cmd.h b/include/trace-cmd/trace-cmd.h index 82def44..90fa146 100644 --- a/include/trace-cmd/trace-cmd.h +++ b/include/trace-cmd/trace-cmd.h @@ -353,16 +353,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); /* --- ftrace instances --- */ struct tracecmd_instance { diff --git a/lib/trace-cmd/trace-msg.c b/lib/trace-cmd/trace-msg.c index 9c8a690..a34297f 100644 --- a/lib/trace-cmd/trace-msg.c +++ b/lib/trace-cmd/trace-msg.c @@ -63,12 +63,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 +813,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 +826,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 +839,15 @@ 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,6 +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 @@ -921,7 +929,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 +944,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,13 +968,15 @@ 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; ssize_t buf_len; int i, ret; + memset(&msg, 0, sizeof(msg)); ret = tracecmd_msg_recv(msg_handle->fd, &msg); if (ret < 0) return ret; @@ -981,6 +995,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 6203e0d..a6f79c5 100644 --- a/tracecmd/include/trace-local.h +++ b/tracecmd/include/trace-local.h @@ -98,8 +98,9 @@ void trace_usage(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; void trace_init_profile(struct tracecmd_input *handle, struct hook_list *hooks, diff --git a/tracecmd/trace-agent.c b/tracecmd/trace-agent.c index 1c6e0a3..cc330b7 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"); @@ -153,13 +155,13 @@ 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 01a74f1..e51134f 100644 --- a/tracecmd/trace-record.c +++ b/tracecmd/trace-record.c @@ -3507,12 +3507,16 @@ 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"); @@ -6117,7 +6121,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; @@ -6147,6 +6152,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);