perf arm-spe: Define metadata header version 2

The first version's metadata header structure doesn't include a field to
indicate a header version, which is not friendly for extension.

Define the metadata version 2 format with a new header structure and
extend per CPU's metadata. In the meantime, the old metadata header will
still be supported for backward compatibility.

Signed-off-by: Leo Yan <leo.yan@arm.com>
Reviewed-by: James Clark <james.clark@linaro.org>
Cc: Will Deacon <will@kernel.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Besar Wicaksono <bwicaksono@nvidia.com>
Cc: John Garry <john.g.garry@oracle.com>
Link: https://lore.kernel.org/r/20241003184302.190806-2-leo.yan@arm.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/util/arm-spe.c
index 59a85e6f3aa34dfcd633179edaf56922fb2d9b53..93c25909207118a9a76978e7716d16bf90077abe 100644 (file)
--- a/tools/perf/arch/arm64/util/arm-spe.c
+++ b/tools/perf/arch/arm64/util/arm-spe.c
@@ -41,7 +41,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,
@@ -53,7 +53,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->arm_spe_pmu;
 
-       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 138ffc71b32dd746d8f1f1eacf25dbf8c2695a9c..70989b1bae478800cafc1192d42d46f7e5a47c9b 100644 (file)
--- a/tools/perf/util/arm-spe.c
+++ b/tools/perf/util/arm-spe.c
@@ -1262,7 +1262,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 4f4900c18f3e232bd02feb1341d321744cd19284..390679a4af2fb61419bc881b5dc43c01f1dd77d7 100644 (file)
--- a/tools/perf/util/arm-spe.h
+++ b/tools/perf/util/arm-spe.h
@@ -12,10 +12,46 @@
 enum {
        ARM_SPE_PMU_TYPE,
        ARM_SPE_PER_CPU_MMAPS,
+       ARM_SPE_AUXTRACE_V1_PRIV_MAX,
+};
+
+#define ARM_SPE_AUXTRACE_V1_PRIV_SIZE  \
+       (ARM_SPE_AUXTRACE_V1_PRIV_MAX * sizeof(u64))
+
+enum {
+       /*
+        * The old metadata format (defined above) does not include a
+        * field for version number. Version 1 is reserved and starts
+        * from version 2.
+        */
+       ARM_SPE_HEADER_VERSION,
+       /* Number of sizeof(u64) */
+       ARM_SPE_HEADER_SIZE,
+       /* PMU type shared by CPUs */
+       ARM_SPE_PMU_TYPE_V2,
+       /* Number of CPUs */
+       ARM_SPE_CPUS_NUM,
        ARM_SPE_AUXTRACE_PRIV_MAX,
 };
 
-#define ARM_SPE_AUXTRACE_PRIV_SIZE (ARM_SPE_AUXTRACE_PRIV_MAX * sizeof(u64))
+enum {
+       /* Magic number */
+       ARM_SPE_MAGIC,
+       /* CPU logical number in system */
+       ARM_SPE_CPU,
+       /* Number of parameters */
+       ARM_SPE_CPU_NR_PARAMS,
+       /* CPU MIDR */
+       ARM_SPE_CPU_MIDR,
+       /* Associated PMU type */
+       ARM_SPE_CPU_PMU_TYPE,
+       /* Minimal interval */
+       ARM_SPE_CAP_MIN_IVAL,
+       ARM_SPE_CPU_PRIV_MAX,
+};
+
+#define ARM_SPE_HEADER_CURRENT_VERSION 2
+
 
 union perf_event;
 struct perf_session;