[PATCH v1 5/9] perf arm-spe: Extend meta data header for version 2

[Leo Yan <leo.yan@arm.com>]

This commit extends the meta data header structure for version 2.

The first version's header structure doesn't include a field to indicate
the header's version, adds a new field for it. And extends to support
per CPU's meta data. Add macros for metadata header size and per CPU
data size, and update the code with these macros.

No functional change.

Signed-off-by: Leo Yan <leo.yan@arm.com>
---
 tools/perf/arch/arm64/util/arm-spe.c |  4 ++--
 tools/perf/util/arm-spe.c            |  2 +-
 tools/perf/util/arm-spe.h            | 34 +++++++++++++++++++++++++++-
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/util/arm-spe.c
index 7880190c3dd6..3e7f62bac2e0 100644
--- a/tools/perf/arch/arm64/util/arm-spe.c
+++ b/tools/perf/arch/arm64/util/arm-spe.c
@@ -42,7 +42,7 @@ static size_t
 arm_spe_info_priv_size(struct auxtrace_record *itr __maybe_unused,
 		       struct evlist *evlist __maybe_unused)
 {
-	return ARM_SPE_AUXTRACE_PRIV_SIZE;
+	return ARM_SPE_AUXTRACE_V1_PRIV_SIZE;
 }
 
 static int arm_spe_info_fill(struct auxtrace_record *itr,
@@ -54,7 +54,7 @@ static int arm_spe_info_fill(struct auxtrace_record *itr,
 			container_of(itr, struct arm_spe_recording, itr);
 	struct perf_pmu *arm_spe_pmu = sper->pmu[0];
 
-	if (priv_size != ARM_SPE_AUXTRACE_PRIV_SIZE)
+	if (priv_size != ARM_SPE_AUXTRACE_V1_PRIV_SIZE)
 		return -EINVAL;
 
 	if (!session->evlist->core.nr_mmaps)
diff --git a/tools/perf/util/arm-spe.c b/tools/perf/util/arm-spe.c
index 3f8695fe6a20..1e87342f4bd8 100644
--- a/tools/perf/util/arm-spe.c
+++ b/tools/perf/util/arm-spe.c
@@ -1260,7 +1260,7 @@ int arm_spe_process_auxtrace_info(union perf_event *event,
 				  struct perf_session *session)
 {
 	struct perf_record_auxtrace_info *auxtrace_info = &event->auxtrace_info;
-	size_t min_sz = sizeof(u64) * ARM_SPE_AUXTRACE_PRIV_MAX;
+	size_t min_sz = ARM_SPE_AUXTRACE_V1_PRIV_SIZE;
 	struct perf_record_time_conv *tc = &session->time_conv;
 	const char *cpuid = perf_env__cpuid(session->evlist->env);
 	u64 midr = strtol(cpuid, NULL, 16);
diff --git a/tools/perf/util/arm-spe.h b/tools/perf/util/arm-spe.h
index e1327e1b3fec..5d587a8e3cf8 100644
--- a/tools/perf/util/arm-spe.h
+++ b/tools/perf/util/arm-spe.h
@@ -12,10 +12,42 @@
 enum {
 	ARM_SPE_PMU_TYPE,
 	ARM_SPE_PER_CPU_MMAPS,
+	/*
+	 * The initial version doesn't have version number, so version 1 is
+	 * reserved and the header version starts from 2.
+	 */
+	ARM_SPE_HEADER_VERSION,
+	ARM_SPE_CPU_NUM,
 	ARM_SPE_AUXTRACE_PRIV_MAX,
 };
 
-#define ARM_SPE_AUXTRACE_PRIV_SIZE (ARM_SPE_AUXTRACE_PRIV_MAX * sizeof(u64))
+enum {
+	ARM_SPE_CPU,
+	ARM_SPE_CPU_MIDR,
+	ARM_SPE_CPU_PMU_TYPE,
+	ARM_SPE_CAP_MIN_IVAL,
+	ARM_SPE_CAP_LDS,
+	ARM_SPE_PER_CPU_PRIV_MAX,
+};
+
+#define ARM_SPE_HEADER_CURRENT_VERSION	2
+
+#define ARM_SPE_METADATA_SIZE(cnt)	((cnt) * sizeof(u64))
+
+#define ARM_SPE_AUXTRACE_V1_PRIV_MAX		\
+	(ARM_SPE_PER_CPU_MMAPS + 1)
+#define ARM_SPE_AUXTRACE_V1_PRIV_SIZE		\
+	ARM_SPE_METADATA_SIZE(ARM_SPE_AUXTRACE_V1_PRIV_MAX)
+
+#define ARM_SPE_AUXTRACE_V2_PRIV_MAX		\
+	(ARM_SPE_CPU_NUM + 1)
+#define ARM_SPE_AUXTRACE_V2_PRIV_SIZE		\
+	ARM_SPE_METADATA_SIZE(ARM_SPE_AUXTRACE_V2_PRIV_MAX)
+
+#define ARM_SPE_AUXTRACE_V2_PRIV_PER_CPU_MAX	\
+	(ARM_SPE_CAP_LDS + 1)
+#define ARM_SPE_AUXTRACE_V2_PER_CPU_SIZE	\
+	ARM_SPE_METADATA_SIZE(ARM_SPE_AUXTRACE_V2_PRIV_PER_CPU_MAX)
 
 union perf_event;
 struct perf_session;
-- 
2.34.1