perf arm-spe: Add new function arm_spe_pkt_desc_addr()

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>

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 a769fe5a4496e404e8a46c6455c0d1cdc53b87a6..b16d68b40bbdd160f44227f91963dcdce42afd40 100644 (file)
--- 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",