103 lines
3.8 KiB
Diff
103 lines
3.8 KiB
Diff
From 07cc8f3f50f3a4f74abc1f1e9948a85a596f9539 Mon Sep 17 00:00:00 2001
|
|
From: Leo Yan <leo.yan@linaro.org>
|
|
Date: Fri, 31 Dec 2021 13:32:09 +0800
|
|
Subject: [PATCH 12/21] perf arm-spe: Refactor counter packet handling
|
|
|
|
mainline inclusion
|
|
from mainline-v5.11-rc1
|
|
commit d158aa408f221756f99edb128ef35bfd4d3361d5
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I4NGPV
|
|
CVE: NA
|
|
|
|
-------------------------------------------------
|
|
|
|
This patch defines macros for counter packet header, and uses macros to
|
|
replace hard code values in functions arm_spe_get_counter() and
|
|
arm_spe_pkt_desc().
|
|
|
|
In the function arm_spe_get_counter(), adds a new line for more
|
|
readable.
|
|
|
|
Signed-off-by: Leo Yan <leo.yan@linaro.org>
|
|
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
|
|
Acked-by: Will Deacon <will@kernel.org>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Al Grant <Al.Grant@arm.com>
|
|
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
|
|
Cc: Dave Martin <Dave.Martin@arm.com>
|
|
Cc: Ingo Molnar <mingo@redhat.com>
|
|
Cc: James Clark <james.clark@arm.com>
|
|
Cc: Jiri Olsa <jolsa@redhat.com>
|
|
Cc: John Garry <john.garry@huawei.com>
|
|
Cc: Mark Rutland <mark.rutland@arm.com>
|
|
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Cc: Wei Li <liwei391@huawei.com>
|
|
Link: https://lore.kernel.org/r/20201119152441.6972-9-leo.yan@linaro.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: Wei Li <liwei391@huawei.com>
|
|
Reviewed-by: Yang Jihong <yangjihong1@huawei.com>
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c | 11 ++++++-----
|
|
tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h | 5 +++++
|
|
2 files changed, 11 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
|
|
index 397ade5ffdeb..52f4339b1f0c 100644
|
|
--- a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
|
|
+++ b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
|
|
@@ -152,10 +152,11 @@ static int arm_spe_get_counter(const unsigned char *buf, size_t len,
|
|
const unsigned char ext_hdr, struct arm_spe_pkt *packet)
|
|
{
|
|
packet->type = ARM_SPE_COUNTER;
|
|
+
|
|
if (ext_hdr)
|
|
- packet->index = ((buf[0] & 0x3) << 3) | (buf[1] & 0x7);
|
|
+ packet->index = SPE_HDR_EXTENDED_INDEX(buf[0], buf[1]);
|
|
else
|
|
- packet->index = buf[0] & 0x7;
|
|
+ packet->index = SPE_HDR_SHORT_INDEX(buf[0]);
|
|
|
|
return arm_spe_get_payload(buf, len, ext_hdr, packet);
|
|
}
|
|
@@ -333,13 +334,13 @@ static int arm_spe_pkt_desc_counter(const struct arm_spe_pkt *packet,
|
|
(unsigned short)payload);
|
|
|
|
switch (packet->index) {
|
|
- case 0:
|
|
+ case SPE_CNT_PKT_HDR_INDEX_TOTAL_LAT:
|
|
arm_spe_pkt_out_string(&err, &buf, &buf_len, "TOT");
|
|
break;
|
|
- case 1:
|
|
+ case SPE_CNT_PKT_HDR_INDEX_ISSUE_LAT:
|
|
arm_spe_pkt_out_string(&err, &buf, &buf_len, "ISSUE");
|
|
break;
|
|
- case 2:
|
|
+ case SPE_CNT_PKT_HDR_INDEX_TRANS_LAT:
|
|
arm_spe_pkt_out_string(&err, &buf, &buf_len, "XLAT");
|
|
break;
|
|
default:
|
|
diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h
|
|
index 9bc876bffd35..7d8e34e35f05 100644
|
|
--- a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h
|
|
+++ b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h
|
|
@@ -82,6 +82,11 @@ struct arm_spe_pkt {
|
|
/* Context packet header */
|
|
#define SPE_CTX_PKT_HDR_INDEX(h) ((h) & GENMASK_ULL(1, 0))
|
|
|
|
+/* Counter packet header */
|
|
+#define SPE_CNT_PKT_HDR_INDEX_TOTAL_LAT 0x0
|
|
+#define SPE_CNT_PKT_HDR_INDEX_ISSUE_LAT 0x1
|
|
+#define SPE_CNT_PKT_HDR_INDEX_TRANS_LAT 0x2
|
|
+
|
|
const char *arm_spe_pkt_name(enum arm_spe_pkt_type);
|
|
|
|
int arm_spe_get_packet(const unsigned char *buf, size_t len,
|
|
--
|
|
2.27.0
|
|
|