From patchwork Thu Dec 2 12:29:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Tzvetomir Stoyanov (VMware)" X-Patchwork-Id: 12652511 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E1E8C433EF for ; Thu, 2 Dec 2021 12:29:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346810AbhLBMci (ORCPT ); Thu, 2 Dec 2021 07:32:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241394AbhLBMch (ORCPT ); Thu, 2 Dec 2021 07:32:37 -0500 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FE99C06174A for ; Thu, 2 Dec 2021 04:29:15 -0800 (PST) Received: by mail-ed1-x534.google.com with SMTP id g14so115310698edb.8 for ; Thu, 02 Dec 2021 04:29:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QPIUFJpkqiAuUFuCW3190ZdxIDY1q5QX69WLW69uC4o=; b=QozDMcuJJYoJ0j+tzPIjWHZlDTHFQR/UUimLtdE2JTyyVd5+w78U7VjFVZcdRYlfnD KETSIRVQRKYdMsGiFnQKaCCFxkxhOvyL47zUqJl3AHs0WdONdhdVPuYSKNlTptq6x7xI hfBWuPtPgB2E/VplmdmOPhJwV6mjx+umTbNMM0PWov5jhNCV1vfYNdgjYDrdoOen+xUj G/xPm4XrBmcvKY2ZDmt6A2P8zX3dUuk9a8ol+JECQ9QPYYSzrGD00t5RAtqTuYZ/yxt5 qzFJKDQ/vfc641lFEqZafpBnDY1Y1+5BqlQ4X0ZrKYZ1d1FzQYkLdjkPko5FvWyLquVU fwfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QPIUFJpkqiAuUFuCW3190ZdxIDY1q5QX69WLW69uC4o=; b=CtpPuLwZNeomeb2l9XRoAAEvhRrMKOE8su31ye251fY3sMK9e6yGYP5qw1LKkORrWg 6m8ri18MZjVRksaSBUkywCY9a/i2VGqE1004xw9Hm9nIe2BJPDy5XTR6P8FuE8JBNRX+ AaAuEXudn9rgUo8MO7OedjWCM2drsKu0TZEPmv6iDz9cZgH4j+VVtYlZhjjKC1BAQytF A22EF8W90Jvg6kV1p5lMxMbSudXGFwPvBQAAzUVdecFW3G++NhUPcHgCySa/GLwJdui0 3ahCfpO/YjoXkUokJReQhQRWrxPOKLfwjO1iG7nT4p2KHsOtcJtpbRh7b6kV5mGerK+N usDg== X-Gm-Message-State: AOAM530ph+a0T84HnfetIn0+SjtUJUE17SIiQ0WDrcN8JjYicsAWS+vJ TJ3/n5Y6XyCnYbPJNEIqTesD1ot+LvI5OA== X-Google-Smtp-Source: ABdhPJwy2nhHTh/fYnJuYAn825z/hmGq1IYqjwIots/nZKRey/2jyG2LN5l6+nSKYUgLgVF+9ShB4w== X-Received: by 2002:a05:6402:710:: with SMTP id w16mr17628462edx.218.1638448153757; Thu, 02 Dec 2021 04:29:13 -0800 (PST) Received: from oberon.zico.biz.zico.biz ([83.222.187.186]) by smtp.gmail.com with ESMTPSA id m16sm2182692edd.61.2021.12.02.04.29.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Dec 2021 04:29:13 -0800 (PST) From: "Tzvetomir Stoyanov (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v5 05/10] trace-cmd dump: Read extended BUFFER option Date: Thu, 2 Dec 2021 14:29:02 +0200 Message-Id: <20211202122907.44008-6-tz.stoyanov@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211202122907.44008-1-tz.stoyanov@gmail.com> References: <20211202122907.44008-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org In trace file version 7 the BUFFER option is extended to hold a trace metadata, related to the recorded instance. Also, a new BUFFER_TEXT option is added for latency trace data. Implemented logic for reading and printing these extended options. Signed-off-by: Tzvetomir Stoyanov (VMware) --- tracecmd/trace-dump.c | 64 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 5 deletions(-) diff --git a/tracecmd/trace-dump.c b/tracecmd/trace-dump.c index a808c7d7..f8909faa 100644 --- a/tracecmd/trace-dump.c +++ b/tracecmd/trace-dump.c @@ -446,19 +446,72 @@ static void dump_section_header(int fd, enum dump_items v, unsigned short *flags *flags = fl; } -static void dump_option_buffer(int fd, int size) +static void dump_option_buffer(int fd, unsigned short option, int size) { + unsigned long long total_size = 0; + unsigned long long data_size; + unsigned long long current; unsigned long long offset; + unsigned short flags; + char clock[DUMP_SIZE]; + char name[DUMP_SIZE]; + int cpus = 0; + int id; + int i; if (size < 8) die("broken buffer option with size %d", size); if (read_file_number(fd, &offset, 8)) die("cannot read the offset of the buffer option"); + if (read_file_string(fd, name, DUMP_SIZE)) + die("cannot read the name of the buffer option"); + if (file_version < FILE_VERSION_SECTIONS) { + do_print(OPTIONS|FLYRECORD, "\t\t[Option BUFFER, %d bytes]\n", size); + do_print(OPTIONS|FLYRECORD, "%lld [offset]\n", offset); + do_print(OPTIONS|FLYRECORD, "\"%s\" [name]\n", name); + return; + } + + current = lseek64(fd, 0, SEEK_CUR); + if (lseek64(fd, offset, SEEK_SET) == (off_t)-1) + die("cannot goto buffer offset %lld", offset); + + dump_section_header(fd, FLYRECORD, &flags); + + if (lseek64(fd, current, SEEK_SET) == (off_t)-1) + die("cannot go back to buffer option"); + + do_print(OPTIONS|FLYRECORD, "\t\t[Option BUFFER, %d bytes]\n", size); + do_print(OPTIONS|FLYRECORD, "%lld [offset]\n", offset); + do_print(OPTIONS|FLYRECORD, "\"%s\" [name]\n", name); + + if (read_file_string(fd, clock, DUMP_SIZE)) + die("cannot read clock of the buffer option"); + do_print(OPTIONS|FLYRECORD, "\"%s\" [clock]\n", clock); + if (option == TRACECMD_OPTION_BUFFER) { + if (read_file_number(fd, &cpus, 4)) + die("cannot read the cpu count of the buffer option"); + + do_print(OPTIONS|FLYRECORD, "%d [CPUs]:\n", cpus); + for (i = 0; i < cpus; i++) { + if (read_file_number(fd, &id, 4)) + die("cannot read the id of cpu %d from the buffer option", i); + if (read_file_number(fd, &offset, 8)) + die("cannot read the offset of cpu %d from the buffer option", i); + if (read_file_number(fd, &data_size, 8)) + die("cannot read the data size of cpu %d from the buffer option", i); + total_size += data_size; + do_print(OPTIONS|FLYRECORD, " %d %lld\t%lld\t[id, data offset and size]\n", + id, offset, data_size); + } + do_print(SUMMARY, "\t\[buffer \"%s\", \"%s\" clock, " + "%d cpus, %lld bytes flyrecord data]\n", + name, clock, cpus, total_size); + } else { + do_print(SUMMARY, "\t\[buffer \"%s\", \"%s\" clock, latency data]\n", name, clock); + } - do_print(OPTIONS, "\t\t[Option BUFFER, %d bytes]\n", size); - do_print(OPTIONS, "%lld [offset]\n", offset); - read_dump_string(fd, size - 8, OPTIONS); } static void dump_option_int(int fd, int size, char *desc) @@ -710,7 +763,8 @@ static int dump_options_read(int fd) dump_option_string(fd, size, "CPUSTAT"); break; case TRACECMD_OPTION_BUFFER: - dump_option_buffer(fd, size); + case TRACECMD_OPTION_BUFFER_TEXT: + dump_option_buffer(fd, option, size); break; case TRACECMD_OPTION_TRACECLOCK: do_print(OPTIONS, "\t\t[Option TRACECLOCK, %d bytes]\n", size);