Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Thu, 15 Aug 2019 02:35:15 -0700
From:   tip-bot for Vince Weaver <tipbot@zytor.com>
Message-ID: <tip-3143906c2770778d89b730e0342b745d1b4a8303@git.kernel.org>
Cc:     ak@linux.intel.com, chongjiang@chromium.org,
        linux-kernel@vger.kernel.org, jolsa@kernel.org, sque@chromium.org,
        hpa@zytor.com, vincent.weaver@maine.edu, adrian.hunter@intel.com,
        namhyung@kernel.org, acme@redhat.com, mingo@kernel.org,
        peterz@infradead.org, tglx@linutronix.de,
        alexander.shishkin@linux.intel.com
Reply-To: vincent.weaver@maine.edu, adrian.hunter@intel.com, hpa@zytor.com,
          peterz@infradead.org, alexander.shishkin@linux.intel.com,
          tglx@linutronix.de, namhyung@kernel.org, mingo@kernel.org,
          acme@redhat.com, chongjiang@chromium.org, ak@linux.intel.com,
          sque@chromium.org, jolsa@kernel.org, linux-kernel@vger.kernel.org
In-Reply-To: <alpine.DEB.2.21.1908011425240.14303@macbook-air>
References: <alpine.DEB.2.21.1908011425240.14303@macbook-air>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:perf/core] perf.data documentation: Clarify
 HEADER_SAMPLE_TOPOLOGY format
Git-Commit-ID: 3143906c2770778d89b730e0342b745d1b4a8303
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  3143906c2770778d89b730e0342b745d1b4a8303
Gitweb:     https://git.kernel.org/tip/3143906c2770778d89b730e0342b745d1b4a8303
Author:     Vince Weaver <vincent.weaver@maine.edu>
AuthorDate: Thu, 1 Aug 2019 14:30:43 -0400
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 14 Aug 2019 10:59:59 -0300

perf.data documentation: Clarify HEADER_SAMPLE_TOPOLOGY format

The perf.data file format documentation for HEADER_SAMPLE_TOPOLOGY
specifies the layout in a confusing manner that doesn't match the rest
of the document.  This patch attempts to describe things consistent with
the rest of the file.

Signed-off-by: Vince Weaver <vincent.weaver@maine.edu>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Chong Jiang <chongjiang@chromium.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Simon Que <sque@chromium.org>
Link: http://lkml.kernel.org/r/alpine.DEB.2.21.1908011425240.14303@macbook-air
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/Documentation/perf.data-file-format.txt | 25 +++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/tools/perf/Documentation/perf.data-file-format.txt b/tools/perf/Documentation/perf.data-file-format.txt
index d030c87ed9f5..b0152e1095c5 100644
--- a/tools/perf/Documentation/perf.data-file-format.txt
+++ b/tools/perf/Documentation/perf.data-file-format.txt
@@ -298,16 +298,21 @@ Physical memory map and its node assignments.
 
 The format of data in MEM_TOPOLOGY is as follows:
 
-   0 - version          | for future changes
-   8 - block_size_bytes | /sys/devices/system/memory/block_size_bytes
-  16 - count            | number of nodes
-
-For each node we store map of physical indexes:
-
-  32 - node id          | node index
-  40 - size             | size of bitmap
-  48 - bitmap           | bitmap of memory indexes that belongs to node
-                        | /sys/devices/system/node/node<NODE>/memory<INDEX>
+	u64 version;            // Currently 1
+	u64 block_size_bytes;   // /sys/devices/system/memory/block_size_bytes
+	u64 count;              // number of nodes
+
+struct memory_node {
+        u64 node_id;            // node index
+        u64 size;               // size of bitmap
+        struct bitmap {
+		/* size of bitmap again */
+                u64 bitmapsize;
+		/* bitmap of memory indexes that belongs to node     */
+		/* /sys/devices/system/node/node<NODE>/memory<INDEX> */
+                u64 entries[(bitmapsize/64)+1];
+        }
+}[count];
 
 The MEM_TOPOLOGY can be displayed with following command: