[PATCH v5 20/21] perf arm_spe: Decode memory tagging properties

[Leo Yan]

From: Andre Przywara <andre.przyw...@arm.com>

When SPE records a physical address, it can additionally tag the event
with information from the Memory Tagging architecture extension.

Decode the two additional fields in the SPE event payload.

[leoy: Refined patch to use predefined macros]

Signed-off-by: Andre Przywara <andre.przyw...@arm.com>
Signed-off-by: Leo Yan <leo....@linaro.org>
---
 tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c | 6 +++++-
 tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

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 70593a4e0aa5..97a47ac3aa28 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
@@ -367,6 +367,7 @@ 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;
+       int ch, pat;
        u64 payload = packet->payload;
        int err = 0;
 
@@ -384,9 +385,12 @@ static int arm_spe_pkt_desc_addr(const struct arm_spe_pkt 
*packet,
                                            "VA 0x%llx", payload);
        case SPE_ADDR_PKT_HDR_INDEX_DATA_PHYS:
                ns = !!SPE_ADDR_PKT_GET_NS(payload);
+               ch = !!SPE_ADDR_PKT_GET_CH(payload);
+               pat = SPE_ADDR_PKT_GET_PAT(payload);
                payload = SPE_ADDR_PKT_ADDR_GET_BYTES_0_6(payload);
                return arm_spe_pkt_snprintf(&err, &buf, &buf_len,
-                                           "PA 0x%llx ns=%d", payload, ns);
+                                           "PA 0x%llx ns=%d ch=%d, pat=%x",
+                                           payload, ns, ch, pat);
        default:
                return 0;
        }
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 7032fc141ad4..1ad14885c2a1 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
@@ -73,6 +73,8 @@ struct arm_spe_pkt {
 
 #define SPE_ADDR_PKT_GET_NS(v)                 (((v) & BIT_ULL(63)) >> 63)
 #define SPE_ADDR_PKT_GET_EL(v)                 (((v) & GENMASK_ULL(62, 61)) >> 
61)
+#define SPE_ADDR_PKT_GET_CH(v)                 (((v) & BIT_ULL(62)) >> 62)
+#define SPE_ADDR_PKT_GET_PAT(v)                        (((v) & GENMASK_ULL(59, 
56)) >> 56)
 
 #define SPE_ADDR_PKT_EL0                       0
 #define SPE_ADDR_PKT_EL1                       1
-- 
2.17.1