perf arm-spe: Fix load-store operation checking

[ Upstream commit e1d47850bbf79a541c9b3bacdd562f5e0112274d ]

The ARM_SPE_OP_LD and ARM_SPE_OP_ST operations are secondary operation
type, they are overlapping with other second level's operation types
belonging to SVE and branch operations.  As a result, a non load-store
operation can be parsed for data source and memory sample.

To fix the issue, this commit introduces a is_ldst_op() macro for
checking LDST operation, and apply the checking when synthesize data
source and memory samples.

Fixes: a89dbc9b988f ("perf arm-spe: Set sample's data source field")
Signed-off-by: Leo Yan <leo.yan@arm.com>
Reviewed-by: James Clark <james.clark@linaro.org>
Link: https://lore.kernel.org/r/20250304111240.3378214-7-leo.yan@arm.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/tools/perf/util/arm-spe.c b/tools/perf/util/arm-spe.c
index afbd5869f6bff2a1f582fb088412d82adf2dc81c..9848310cee5f35408b68940f409152ebc1243ae5 100644 (file)
--- a/tools/perf/util/arm-spe.c
+++ b/tools/perf/util/arm-spe.c
@@ -37,6 +37,8 @@
 #include "../../arch/arm64/include/asm/cputype.h"
 #define MAX_TIMESTAMP (~0ULL)
 
+#define is_ldst_op(op)         (!!((op) & ARM_SPE_OP_LDST))
+
 struct arm_spe {
        struct auxtrace                 auxtrace;
        struct auxtrace_queues          queues;
@@ -520,6 +522,10 @@ static u64 arm_spe__synth_data_source(const struct arm_spe_record *record, u64 m
        union perf_mem_data_src data_src = { .mem_op = PERF_MEM_OP_NA };
        bool is_neoverse = is_midr_in_range_list(midr, neoverse_spe);
 
+       /* Only synthesize data source for LDST operations */
+       if (!is_ldst_op(record->op))
+               return 0;
+
        if (record->op & ARM_SPE_OP_LD)
                data_src.mem_op = PERF_MEM_OP_LOAD;
        else if (record->op & ARM_SPE_OP_ST)
@@ -619,7 +625,7 @@ static int arm_spe_sample(struct arm_spe_queue *speq)
         * When data_src is zero it means the record is not a memory operation,
         * skip to synthesize memory sample for this case.
         */
-       if (spe->sample_memory && data_src) {
+       if (spe->sample_memory && is_ldst_op(record->op)) {
                err = arm_spe__synth_mem_sample(speq, spe->memory_id, data_src);
                if (err)
                        return err;