133 lines
4.2 KiB
Diff
133 lines
4.2 KiB
Diff
From b73a4bf5e10be8bab893952e6c7d23f9dfd077cc Mon Sep 17 00:00:00 2001
|
|
From: Leo Yan <leo.yan@linaro.org>
|
|
Date: Fri, 31 Dec 2021 13:32:04 +0800
|
|
Subject: [PATCH 08/21] perf arm-spe: Add new function arm_spe_pkt_desc_addr()
|
|
|
|
mainline inclusion
|
|
from mainline-v5.11-rc1
|
|
commit ab2aa439e4aaa3ce0fdcfa0f847aed4bf13bf353
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I4NGPV
|
|
CVE: NA
|
|
|
|
-------------------------------------------------
|
|
|
|
This patch moves out the address parsing code from arm_spe_pkt_desc()
|
|
and uses the new introduced function arm_spe_pkt_desc_addr() to process
|
|
address packet.
|
|
|
|
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-4-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>
|
|
---
|
|
.../arm-spe-decoder/arm-spe-pkt-decoder.c | 64 +++++++++++--------
|
|
1 file changed, 38 insertions(+), 26 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 a769fe5a4496..b16d68b40bbd 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
|
|
@@ -288,10 +288,46 @@ static int arm_spe_pkt_out_string(int *err, char **buf_p, size_t *blen,
|
|
return ret;
|
|
}
|
|
|
|
+static int arm_spe_pkt_desc_addr(const struct arm_spe_pkt *packet,
|
|
+ char *buf, size_t buf_len)
|
|
+{
|
|
+ int ns, el, idx = packet->index;
|
|
+ u64 payload = packet->payload;
|
|
+ int err = 0;
|
|
+
|
|
+ switch (idx) {
|
|
+ case 0:
|
|
+ case 1:
|
|
+ ns = !!(packet->payload & NS_FLAG);
|
|
+ el = (packet->payload & EL_FLAG) >> 61;
|
|
+ payload &= ~(0xffULL << 56);
|
|
+ arm_spe_pkt_out_string(&err, &buf, &buf_len,
|
|
+ "%s 0x%llx el%d ns=%d",
|
|
+ (idx == 1) ? "TGT" : "PC", payload, el, ns);
|
|
+ break;
|
|
+ case 2:
|
|
+ arm_spe_pkt_out_string(&err, &buf, &buf_len,
|
|
+ "VA 0x%llx", payload);
|
|
+ break;
|
|
+ case 3:
|
|
+ ns = !!(packet->payload & NS_FLAG);
|
|
+ payload &= ~(0xffULL << 56);
|
|
+ arm_spe_pkt_out_string(&err, &buf, &buf_len,
|
|
+ "PA 0x%llx ns=%d", payload, ns);
|
|
+ break;
|
|
+ default:
|
|
+ /* Unknown index */
|
|
+ err = -1;
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ return err;
|
|
+}
|
|
+
|
|
int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, char *buf,
|
|
size_t buf_len)
|
|
{
|
|
- int ns, el, idx = packet->index;
|
|
+ int idx = packet->index;
|
|
unsigned long long payload = packet->payload;
|
|
const char *name = arm_spe_pkt_name(packet->type);
|
|
char *buf_orig = buf;
|
|
@@ -373,31 +409,7 @@ int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, char *buf,
|
|
arm_spe_pkt_out_string(&err, &buf, &blen, "%s %lld", name, payload);
|
|
break;
|
|
case ARM_SPE_ADDRESS:
|
|
- switch (idx) {
|
|
- case 0:
|
|
- case 1:
|
|
- ns = !!(packet->payload & NS_FLAG);
|
|
- el = (packet->payload & EL_FLAG) >> 61;
|
|
- payload &= ~(0xffULL << 56);
|
|
- arm_spe_pkt_out_string(&err, &buf, &blen,
|
|
- "%s 0x%llx el%d ns=%d",
|
|
- (idx == 1) ? "TGT" : "PC", payload, el, ns);
|
|
- break;
|
|
- case 2:
|
|
- arm_spe_pkt_out_string(&err, &buf, &blen,
|
|
- "VA 0x%llx", payload);
|
|
- break;
|
|
- case 3:
|
|
- ns = !!(packet->payload & NS_FLAG);
|
|
- payload &= ~(0xffULL << 56);
|
|
- arm_spe_pkt_out_string(&err, &buf, &blen,
|
|
- "PA 0x%llx ns=%d", payload, ns);
|
|
- break;
|
|
- default:
|
|
- /* Unknown index */
|
|
- err = -1;
|
|
- break;
|
|
- }
|
|
+ err = arm_spe_pkt_desc_addr(packet, buf, buf_len);
|
|
break;
|
|
case ARM_SPE_CONTEXT:
|
|
arm_spe_pkt_out_string(&err, &buf, &blen, "%s 0x%lx el%d",
|
|
--
|
|
2.27.0
|
|
|