Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

perf arm-spe: Define metadata header version 2

Browse Source 
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>
This commit is contained in:
Leo Yan 2024-10-03 19:42:58 +01:00 committed by Namhyung Kim
parent f7ef062fe1
commit 0ca2c45404
3 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/perf/arch/arm64/util/arm-spe.c
View File

@ -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)

2
tools/perf/util/arm-spe.c
View File

@ -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);

38
tools/perf/util/arm-spe.h
View File

@ -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;