Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-16 18:26:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

perf arm-spe: Use old behavior when opening old SPE files

Browse Source 
Since the linked commit, we stopped interpreting data source if the
perf.data file doesn't have the new metadata version. This means that
perf c2c will show no samples in this case.

Keep the old behavior so old files can be opened, but also still show
the new warning that updating might improve the decoding.

Also re-write the warning to be more concise and specific to a user.

Fixes: ba5e7169e548 ("perf arm-spe: Use metadata to decide the data source feature")
Signed-off-by: James Clark <james.clark@linaro.org>
Reviewed-by: Leo Yan <leo.yan@arm.com>
Cc: Julio.Suarez@arm.com
Cc: Kiel.Friedt@arm.com
Cc: Ryan.Roberts@arm.com
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/20241029143734.291638-1-james.clark@linaro.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
James Clark 2024-10-29 14:37:33 +00:00 committed by Namhyung Kim
parent 064d569e20
commit ba993e5ada
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -562,38 +562,36 @@ static bool arm_spe__is_common_ds_encoding(struct arm_spe_queue *speq)
u64 *metadata = NULL; u64 *metadata = NULL;
u64 midr = 0; u64 midr = 0;
/* /* Metadata version 1 assumes all CPUs are the same (old behavior) */
* Metadata version 1 doesn't contain any info for MIDR.
* Simply return false in this case.
*/
if (spe->metadata_ver == 1) { if (spe->metadata_ver == 1) {
pr_warning_once("The data file contains metadata version 1, " const char *cpuid;
"which is absent the info for data source. "
"Please upgrade the tool to record data.\n");
return false;
}
/* CPU ID is -1 for per-thread mode */ pr_warning_once("Old SPE metadata, re-record to improve decode accuracy\n");
if (speq->cpu < 0) { cpuid = perf_env__cpuid(spe->session->evlist->env);
/* midr = strtol(cpuid, NULL, 16);
* On the heterogeneous system, due to CPU ID is -1, } else {
* cannot confirm the data source packet is supported. /* CPU ID is -1 for per-thread mode */
*/ if (speq->cpu < 0) {
if (!spe->is_homogeneous) /*
* On the heterogeneous system, due to CPU ID is -1,
* cannot confirm the data source packet is supported.
*/
if (!spe->is_homogeneous)
return false;
/* In homogeneous system, simply use CPU0's metadata */
if (spe->metadata)
metadata = spe->metadata[0];
} else {
metadata = arm_spe__get_metadata_by_cpu(spe, speq->cpu);
}
if (!metadata)
return false; return false;
/* In homogeneous system, simply use CPU0's metadata */ midr = metadata[ARM_SPE_CPU_MIDR];
if (spe->metadata)
metadata = spe->metadata[0];
} else {
metadata = arm_spe__get_metadata_by_cpu(spe, speq->cpu);
} }
if (!metadata)
return false;
midr = metadata[ARM_SPE_CPU_MIDR];
is_in_cpu_list = is_midr_in_range_list(midr, common_ds_encoding_cpus); is_in_cpu_list = is_midr_in_range_list(midr, common_ds_encoding_cpus);
if (is_in_cpu_list) if (is_in_cpu_list)
return true; return true;